Fix --with-curses-includes to point to the correct path to ncurses headers

diff --git a/Makefile b/Makefile
index 1639a3d042ed334b1b3f7bb65fce215b1ce00768..cba47056fe6e7b402e7804ccaae04d98944fe3fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ do-configure:
 # in a non-standard path. Without that, the resulting GHC tries to
 # link programs by executing ld(1) without passing it -L${PREFIX}/lib.
        ${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
-               --configure-option=--with-curses-includes=${PREFIX}/include \
+               --configure-option=--with-curses-includes=${PREFIX}/include/ncurses \
                --configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk
 # The ghc compiler does normally split the generated asm files into small
 # parts before sending them to gcc, to enable the linker to eliminate

diff --git a/patches/patch-ah b/patches/patch-ah
deleted file mode 100644 (file)
index d5ddfe4..0000000
--- a/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- libraries/terminfo/configure.orig  2011-03-26 18:11:01.000000000 +0000
-+++ libraries/terminfo/configure
-@@ -3254,7 +3254,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
- as_fn_error "curses headers could not be found, so this package cannot be built
- See \`config.log' for more details." "$LINENO" 5; }
- else
--    TERMINFO_INCLUDES="$CursesIncludes term.h"
-+    TERMINFO_INCLUDES="$CursesIncludes"
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncursesw" >&5