 @@ -1,19 +1,20 @@
-# $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
 HOMEPAGE=	http://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell
 LICENSE=	modified-bsd
 # GHC requires GHC to build itself. Formerly we could work around this
 # bootstrapping problem by creating a special archive containing C
 # sources compiled from Haskell sources, but that's no longer
 # possible. So we have to prepare stripped-down binaries sufficient to
 # bootstrap compilers for each platforms. If you want to build them
 # yourself, follow an instruction in the ./TODO file.
 @@ -94,28 +95,28 @@ SITES.${i}?=	${MASTER_SITE_LOCAL}
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 do-configure:
 	${RUN} cd ${WRKSRC:Q} && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 # Here we generate mk/build.mk dynamically.
 	${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
 # We need to tell the libraries/terminfo/configure that our ncurses is
 # 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-includes=${BUILDLINK_PREFIX.curses:Q}/include \
-		--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.ncurses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
+		--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
 # unused parts.  This does however not play nice with the pkgsrc
 # framework, and the result is that the build takes more than 5 times
 # as long than when the files are not split.  See
 #    http://mail-index.netbsd.org/tech-pkg/2006/07/30/0005.html
 # for a description of the problem.
 # Disable file splitting until pkgsrc gets improved.
 	${RUN} ${ECHO} "SplitObjs         = NO" >> ${WRKSRC:Q}/mk/build.mk
 # If there is HsColour is in the PATH, GHC's build system tries to use
 # it without even checking if it really works. That's not what we
 @@ -168,24 +169,21 @@ GENERATE_PLIST+= \
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # GHC currently *requires* ${PREFIX}/lib to be in
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 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"

 @@ -1,14 +1,14 @@
-# $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.
+#
 # BOOT_ARCHIVE
 #   This variable is set to the name of compressed archive file of a
 #   bootstrapping compiler for the current platform.
+#
 # BOOT_TARBALL
 #   Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz".
+#
 .include "../../mk/bsd.prefs.mk"
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
 @@ -113,27 +113,27 @@ ${WRKDIR}/stamp-configure-boot: ${WRKDIR
 	${MKDIR} ${WRKDIR:Q}/build-boot
 	cd ${WRKDIR:Q}/build-boot && \
 		${PKGSRC_SETENV} PATH=${PATH} \
 		CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \
 		CONF_GCC_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_LD_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \
 		CONF_GCC_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_LD_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \
 		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
 	@${PHASE_MSG} "Building bootstrapping compiler ${DISTNAME}"
 	${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD}
 	${TOUCH} ${.TARGET}
 ${WRKDIR}/${BOOT_TARBALL}: ${WRKDIR}/stamp-build-boot
 	@${PHASE_MSG} "Creating binary distribution of bootstrapping ${DISTNAME}"
 	${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD} binary-dist
 	${MV} -f ${WRKDIR:Q}/build-boot/${BOOT_TARBALL} ${.TARGET}
 # This can take up half an hour. Memory usage is also very high, about 680 MiB.

 @@ -1,16 +1,16 @@
-# $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
 .if !defined(GHC_BUILDLINK3_MK)
 GHC_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.ghc+=	ghc>=7.6.3
 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

 @@ -21,15 +21,15 @@ GhcRTSWays         =
 # I'm not sure disabling GHCi significantly reduces the bindist size,
 # but we don't need it anyway.
 GhcWithInterpreter = NO
 # We don't want in-place GMP to be statically linked as it increases
 # the bindist size. Dynamic linkage is even worse.
 INTEGER_LIBRARY    = integer-simple
 # We'd like to distinguish bootstrapping bindists from normal ones.
 BIN_DIST_NAME      = ghc-$(ProjectVersion)-boot
 libraries/terminfo_CONFIGURE_OPTS += \
-	  --configure-option=--with-curses-includes=@NCURSES_PREFIX@/include \
+	  --configure-option=--with-curses-includes=@CURSES_PREFIX@/include \
-	  --configure-option=--with-curses-libraries=@NCURSES_PREFIX@/lib
+	  --configure-option=--with-curses-libraries=@CURSES_PREFIX@/lib