---- gdb-6.1/gdb/config.in.orig 2004-01-20 10:29:13.000000000 +0100
-+++ gdb-6.1/gdb/config.in 2004-04-17 21:21:46.919318064 +0200
-@@ -293,6 +293,9 @@
- /* Define if you have the <ncurses.h> header file. */
- #undef HAVE_NCURSES_H
-
-+/* Define if you have the <ncurses/ncurses.h> header file. */
-+#undef HAVE_NCURSES_NCURSES_H
-+
- /* Define if you have the <ndir.h> header file. */
- #undef HAVE_NDIR_H
-
---- gdb-6.1/gdb/configure.in.orig 2004-02-26 01:41:46.000000000 +0100
-+++ gdb-6.1/gdb/configure.in 2004-04-17 21:21:46.922317608 +0200
-@@ -374,7 +374,7 @@
- Solaris 2.[78] when using GCC. ]])
- fi ;;
- esac
--AC_CHECK_HEADERS(curses.h ncurses.h term.h)
-+AC_CHECK_HEADERS(curses.h ncurses.h ncurses/ncurses.h term.h)
-
- # FIXME: kettenis/20030102: In most cases we include these
- # unconditionally, so what's the point in checking these?
---- gdb-6.1/gdb/gdb_curses.h.orig 2004-02-10 21:03:44.000000000 +0100
-+++ gdb-6.1/gdb/gdb_curses.h 2004-04-17 21:35:43.552130544 +0200
-@@ -24,6 +24,8 @@
-
- #if defined (HAVE_NCURSES_H)
- #include <ncurses.h>
-+#elif defined (HAVE_NCURSES_NCURSES_H)
-+#include <ncurses/ncurses.h>
- #elif defined (HAVE_CURSES_H)
- #include <curses.h>
- #endif
--- gdb-6.1/gdb/utils.c.orig 2004-02-28 19:04:37.000000000 +0100
+++ gdb-6.1/gdb/utils.c 2004-04-17 21:36:26.623582688 +0200
@@ -56,9 +56,7 @@