works with builtin curses (with NetBSD-6).

Bump PKGREVISION.

4 files changed, 11 insertions, 13 deletions

diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile
index a42edda573b..a426d219e07 100644
--- a/lang/ghc7/Makefile
+++ b/lang/ghc7/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2013/12/17 01:08:30 obache Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/30 07:57:35 obache Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=	ghc-${VERSION}
 VERSION=	7.6.3
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=	pho@cielonegro.org
@@ -104,8 +105,8 @@ 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:Q}/lib.
 	${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
-		--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.ncurses:Q}/include \
-		--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.ncurses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
+		--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/include \
+		--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/lib" >> ${WRKSRC:Q}/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
@@ -178,14 +179,11 @@ CHECK_SHLIBS_SUPPORTED=	no
 # Dependencies
 #
 
-# I guess pdcurses works well but not tested.
-USE_NCURSES=	yes
-
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk
index 2fd53f4b696..7c5c4ab3bc6 100644
--- a/lang/ghc7/bootstrap.mk
+++ b/lang/ghc7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.2 2013/12/16 06:23:09 obache Exp $
+# $NetBSD: bootstrap.mk,v 1.3 2014/01/30 07:57:35 obache Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler based on a per-platform
 # basis.
@@ -123,7 +123,7 @@ ${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot
 		CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
 		${SH} ./configure && \
-		${SED} -e "s,@NCURSES_PREFIX@,${BUILDLINK_PREFIX.ncurses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
+		${SED} -e "s,@CURSES_PREFIX@,${BUILDLINK_PREFIX.curses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
 	${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot
diff --git a/lang/ghc7/buildlink3.mk b/lang/ghc7/buildlink3.mk
index a66022b9e76..b469430c825 100644
--- a/lang/ghc7/buildlink3.mk
+++ b/lang/ghc7/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/12/12 12:47:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/01/30 07:57:35 obache Exp $
 
 BUILDLINK_TREE+=	ghc
 
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc7
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses/buildlink3.mk"
 .endif	# GHC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ghc
diff --git a/lang/ghc7/files/bootstrap.build.mk b/lang/ghc7/files/bootstrap.build.mk
index c1cbdb73f21..70c23b3ae8d 100644
--- a/lang/ghc7/files/bootstrap.build.mk
+++ b/lang/ghc7/files/bootstrap.build.mk
@@ -31,5 +31,5 @@ INTEGER_LIBRARY    = integer-simple
 BIN_DIST_NAME      = ghc-$(ProjectVersion)-boot
 
 libraries/terminfo_CONFIGURE_OPTS += \
-	  --configure-option=--with-curses-includes=@NCURSES_PREFIX@/include \
-	  --configure-option=--with-curses-libraries=@NCURSES_PREFIX@/lib
+	  --configure-option=--with-curses-includes=@CURSES_PREFIX@/include \
+	  --configure-option=--with-curses-libraries=@CURSES_PREFIX@/lib