 @@ -1,191 +1,189 @@
-# $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.
 ONLY_FOR_PLATFORM= \
 	Darwin-*-powerpc \
 	FreeBSD-*-i386 \
 	Linux-*-x86_64 \
 	NetBSD-*-i386 \
 	NetBSD-*-x86_64 \
 	SunOS-5.11.*
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DISTNAME}-src.tar.bz2
 #.if make(distinfo)
 #DISTFILES+=	${DISTNAME}-boot-i386-unknown-freebsd.tar.xz
 #DISTFILES+=	${DISTNAME}-boot-i386-unknown-netbsd.tar.xz
 #DISTFILES+=	${DISTNAME}-boot-powerpc-apple-darwin.tar.xz
 #DISTFILES+=	${DISTNAME}-boot-x86_64-unknown-linux.tar.xz
 #DISTFILES+=	${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz
 #DISTFILES+=	${DISTNAME}-boot-i386-unknown-solaris2.tar.gz
 #DISTFILES+=	${DISTNAME}-boot-x86_64-unknown-solaris2.tar.xz
 #.else
 #DISTFILES+=	${BOOT_ARCHIVE}
 #.endif
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DISTNAME}-src.tar.bz2
 # -----------------------------------------------------------------------------
 # Tools
+#
 USE_TOOLS+=			autoconf gmake perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=	no
 CONFIGURE_ARGS+= \
 	--with-gcc=${CC:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/include \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/lib \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/include \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/lib
 CONFIGURE_ENV+= \
 	CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE0=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE0=${LDFLAGS:Q} \
 	CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE1=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE1=${LDFLAGS:Q} \
 	CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE2=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE2=${LDFLAGS:Q} \
 	PerlCmd=${PERL5:Q}
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC:Q}/libraries/integer-gmp && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc7/bootstrap.mk"
 .for i in ${DISTFILES:M*-boot-*}
 SITES.${i}?=	${MASTER_SITE_LOCAL}
 .endfor
 # 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
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC:Q}/mk/build.mk
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PS  = NO" >> ${WRKSRC:Q}/mk/build.mk
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PDF = NO" >> ${WRKSRC:Q}/mk/build.mk
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	DISTNAME=${DISTNAME}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/lib/${DISTNAME}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs some files
 # whose names are randomly generated, namely
 # lib/${PKGNAME}/package.conf.d/*.conf
+#
 PRINT_PLIST_AWK+=	/lib\/${PKGNAME_NOREV}\/package\.conf\.d/ { next; }
 # If we were lucky we could just use "PLIST_TYPE = dynamic", but the
 # feature has seemingly bitrotted.
 .include "../../mk/bsd.prefs.mk"
 .if empty(USE_DESTDIR:M[Yy][Ee][Ss])
 PKG_FAIL_REASON+="This package can not be built without using DESTDIR.\
 You need to set USE_DESTDIR to \"yes\"."
 .else
 GENERATE_PLIST+= \
 	cd ${DESTDIR:Q}${PREFIX:Q} && \
 		${FIND} lib/${PKGNAME_NOREV}/package.conf.d \( -type f -o -type l \) | ${SORT} -d;
 .endif
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # 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,143 +1,143 @@
-# $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"
 BOOT_ARCHIVE=	${DISTNAME}-boot-i386-unknown-freebsd.tar.xz
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
 BOOT_ARCHIVE=	${DISTNAME}-boot-i386-unknown-netbsd.tar.xz
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOT_ARCHIVE=	${DISTNAME}-boot-powerpc-apple-darwin.tar.xz
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ${WRKSRC}/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
 CONFLICTS+=	libelf-[0-9]*
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
 BOOT_ARCHIVE=	${DISTNAME}-boot-x86_64-unknown-linux.tar.xz
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "NetBSD"
 BOOT_ARCHIVE=	${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz
 .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
 BOOT_ARCHIVE=  ${DISTNAME}-boot-i386-unknown-solaris2.tar.gz
 .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
 BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-solaris2.tar.xz
 .else
 PKG_FAIL_REASON+=	"internal error: unsupported platform"
 .endif
 BOOT_TARBALL=	${BOOT_ARCHIVE:C/\.xz$//:C/\.gz$//}
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
+#
 # Install a bootstrapping compiler directly into TOOLS_DIR so that
 # ./configure can find it.
+#
 USE_TOOLS+=	gmake xzcat xz
 pre-configure:
 .if !exists(${DISTDIR:Q}/${DIST_SUBDIR:Q}/${BOOT_ARCHIVE})
 	@${FAIL_MSG}  "Put your trusted bootstrap archive as ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE}"
 .else
 	@${PHASE_MSG} "Extracting bootstrapping compiler for ${PKGNAME}"
 	${RUN} ${MKDIR} ${WRKDIR:Q}/build-extract
 	${RUN} cd ${WRKDIR:Q}/build-extract && \
 		${EXTRACT_CMD_DEFAULT} ${DISTDIR:Q}/${DIST_SUBDIR:Q}/${BOOT_ARCHIVE}
 	@${PHASE_MSG} "Preparing bootstrapping compiler for ${PKGNAME}"
 	${RUN} cd ${WRKDIR:Q}/build-extract/${DISTNAME}-boot && \
 		${SH} ./configure \
 			--prefix=${TOOLS_DIR:Q} && \
 		${MAKE_PROGRAM} install
 .endif
 # -----------------------------------------------------------------------------
 # An unusual target "bootstrap"
+#
 # Build a bootstrapping compiler using an already installed GHC. This
 # can certainly impossible if you don't have one. It's absolutely
 # important to build it with the fewest possible run-time
 # dependencies, otherwise the resulting binary can easily get
 # unusable.
+#
 .PHONY: bootstrap
 #BUILDLINK_PASSTHRU_DIRS=	${PREFIX}/lib/${DISTNAME}
 .if exists(${WRKDIR}/${DISTNAME}/mk/config.mk)
 bootstrap:
 	@${ERROR_MSG} "You have already configured the package in a way\
 	that building bootstrapping compiler is impossible."
 	@${FAIL_MSG}  "Please run \"${MAKE} clean patch\" first."
 .elif !exists(${WRKDIR}/${DISTNAME}/rts/ghc.mk.orig)
 bootstrap:
 	@${FAIL_MSG} "Please run \"${MAKE} patch\" first."
 .else
 bootstrap: ${WRKDIR}/${BOOT_ARCHIVE}
 	@${PHASE_MSG} "Done creating" ${WRKDIR}/${BOOT_ARCHIVE}
 ${WRKDIR}/lndir:
 	@${PHASE_MSG} "Building lndir(1) to duplicate the source tree."
 	cd ${WRKSRC:Q}/utils/lndir && \
 		${CC:Q} lndir.c -o ${.TARGET}
 ${WRKDIR}/stamp-lndir-boot: ${WRKDIR}/lndir
 	@${PHASE_MSG} "Duplicating the source tree for bootstrapping ${DISTNAME}"
 	${MKDIR} ${WRKDIR:Q}/build-boot
 	cd ${WRKDIR:Q}/build-boot && \
 		${WRKDIR}/lndir -silent ../${DISTNAME:Q}
 	${TOUCH} ${.TARGET}
 ${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot
 	@${PHASE_MSG} "Configuring bootstrapping compiler ${DISTNAME}"
 	${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.
 ${WRKDIR}/${BOOT_ARCHIVE}: ${WRKDIR}/${BOOT_TARBALL}
 	@${PHASE_MSG} "Compressing binary distribution of bootstrapping ${DISTNAME}"
 	${XZ} --verbose -9 --extreme ${WRKDIR:Q}/${BOOT_TARBALL}
 .endif

 @@ -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

 @@ -1,35 +1,35 @@
 # -*- makefile-gmake -*-
+#
 # This is a build conf for bootstrapping compilers.
+#
 # We don't want any docs.
 HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
 BUILD_MAN          = NO
 # Enabling evil-splitter reduces bindist size, which is good. However
 # it introduces a run-time dependency on perl, which is unacceptable.
 SplitObjs          = NO
 # We only want vanilla libraries and rts. No profiling, no shared
 # libraries, no debugging, no event logging.
 GhcLibWays         = v
 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