X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=67db91abaf629765fcf2cd58e5f712c38f6bfea9;hb=e23df020f1fa71a2d4e1e76456c9ea9804d2c795;hp=b9d31283b122d57cba4c898cd1812ffbece4f6f1;hpb=58e14a2ef1340fe889acd05a95d0cf577372b157;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index b9d3128..67db91a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2
 DISTFILES+=		${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
-#DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
 DISTFILES+=		${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
 
 
-#SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
+SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2	= http://static.cielonegro.org/archive/
 
@@ -31,15 +31,14 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 #
 # If you want to build HC packages yourself, follow instructions in
 # the ./TODO file.
-#ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
-ONLY_FOR_PLATFORM= FreeBSD-*-i386 Darwin-*-powerpc
+ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
 
 # We must provide the real pass to gcc to the ./configure script,
 # because GHC has a runtime dependency on it. Aren't there any ways
 # better than this?
 .include "../../mk/compiler.mk"
 .if empty(CCPATH)
-WARNINGS+= "This package depends on pkgsrc's undocumented variable\
+WARNINGS+= "This package depends on pkgsrc's undocumented variable \
 CCPATH but it disappeared somehow."
 WARNINGS+= "Using hard-coded /usr/bin/gcc as the C compiler..."
 CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc
@@ -47,7 +46,7 @@ CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc
 CONFIGURE_ARGS+= --with-gcc=${CCPATH}
 .endif
 
-USE_TOOLS+=	gmake bsdtar perl:run
+USE_TOOLS+=	gmake gtar perl:run
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 
 # We don't want to extract all of the DISTFILEs.
@@ -101,11 +100,9 @@ ${WRKDIR}/stamp-prepare-bootstrap:
 	${RUN} cd ${WRKDIR} && \
 		${ECHO} "====> Preparing bootstrap compiler" && \
 		${RM} -rf bootstrap && \
-		${MKDIR} -p bootstrap && \
-		${CP} -r ${DISTNAME} bootstrap && \
-		cd bootstrap/${DISTNAME} && \
-		${MKDIR} -p utils/ghc-pwd/dist-boot && \
-		${LN} -sf ${PWD_CMD} utils/ghc-pwd/dist-boot/ghc-pwd && \
+		${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \
+		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xpvf - && \
+		${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \
 		${TOUCH} $@
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
@@ -117,7 +114,7 @@ ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
 ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
 		${ECHO} "====> Extracting bootstrap HC archive" && \
-		(cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
+		(cd .. && ${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
 		${TOUCH} $@
 
@@ -183,7 +180,7 @@ do-configure:
 # Substitutions for INSTALL and DEINSTALL.
 FILES_SUBST+=	DISTNAME=${DISTNAME}
 
-# Some unused scripts don't pass the portability test.
+# 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