X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=Makefile;h=a6a77b8294882aa0ecb21257ae123456914d7bba;hp=3fc3d82e8f879cc7792f161cfaeb63fd3a26264d;hb=ea579d5f0ee083910927b01c244780225fbba29f;hpb=cf2fafdc556ef6b0a9ebb93149beaf6cc1fdcb23

diff --git a/Makefile b/Makefile
index 3fc3d82..a6a77b8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,19 @@ COMMENT=		Compiler for the functional language Haskell
 LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2 \
-				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
+				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 \
+				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
 
 SITES.${DISTNAME}-src.tar.bz2						= http://www.haskell.org/ghc/dist/${VERSION}/
 SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
+SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# PLIST cannot be generated statically because of hashed package
+# config files. This requires USE_DESTDIR=yes.
+PLIST_TYPE = dynamic
+
 .include "../../mk/bsd.prefs.mk"
 
 # Unregisterised HC packages are architecture dependent. We have to
@@ -48,15 +54,19 @@ CONFIGURE_ARGS += \
 # running "ghc-pkg recache".
 
 .if ${MACHINE_ARCH} == "i386"
+.  if ${OPSYS} == "FreeBSD"
 BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
+.  else
+BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+.  endif
 #.elif ${MACHINE_ARCH} == "powerpc"
 #BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
 .endif
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
-BUILD_MK = ${PKGDIR}/files/bsd-build.mk
+BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
 .else
-BUILD_MK = ${PKGDIR}/files/fallback-build.mk
+BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 .endif
 
 pre-configure:
@@ -72,12 +82,14 @@ pre-configure:
 		(cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
 		${ECHO} "====> Building bootstrap compiler" && \
-		${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BUILD_MK} > mk/build.mk && \
+		${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \
 		for c in libraries/*/configure; do \
 			(cd `${DIRNAME} $$c` && ${ENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \
 		done && \
-		${SED} -i -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" \
-			inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk && \
+		for i in inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk; do \
+			${SED} -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \
+			${MV} -f $$i.tmp $$i; \
+		done && \
 		${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \
 		${GMAKE} bootstrapping-files && \
 		${GMAKE} all_ghc_stage2 && \
@@ -96,6 +108,9 @@ do-configure:
 	${RUN} ${ECHO} "libraries/integer-gmp_CONFIGURE_OPTS += \
 		--configure-option=--with-gmp-includes=${PREFIX}/include \
 		--configure-option=--with-gmp-libraries=${PREFIX}/lib" > ${WRKSRC}/mk/build.mk
+	${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
+		--configure-option=--with-curses-includes=${PREFIX}/include \
+		--configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk
 
 # The ghc compiler does normally split the generated C files into small
 # parts before sending them to gcc, to enable the linker to eliminate