X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=3e50ccd2c09bef1160749b3b946869ac1ba9ccdd;hb=f4afb39c623b1c077a5ffeddbad2b4f451f0d975;hp=127868ece18266f6563d5aab8adb39f1e40c5ff3;hpb=31fece01cf583b2d893b2849cefd75e5dd05d6d1;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index 127868e..3e50ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		7.0.1
+VERSION=		7.0.3
 CATEGORIES=		lang
-MASTER_SITES=	http://new-www.haskell.org/ghc/dist/${VERSION}/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://www.haskell.org/ghc/
 COMMENT=		Compiler for the functional language Haskell
@@ -38,7 +38,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
 # 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
@@ -46,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.
@@ -83,9 +83,9 @@ PLATFORM           = i386-unknown-freebsd
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 PLATFORM           = powerpc-apple-darwin
-
 # Existence of libelf makes LeadingUnderscore being "NO", which is
-# incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE)
+# incorrect for this platform. See ghc-6.12.1/aclocal.m4
+# (FP_LEADING_UNDERSCORE)
 CONFLICTS=	libelf-[0-9]*
 
 .else
@@ -98,30 +98,30 @@ pre-configure: ${WRKDIR}/stamp-bootstrap-ghc
 
 ${WRKDIR}/stamp-prepare-bootstrap:
 	${RUN} cd ${WRKDIR} && \
-		${ECHO} "====> Preparing bootstrap compiler" && \
+		${PHASE_MSG} "Preparing bootstrap compiler for ${PKGNAME}" && \
 		${RM} -rf bootstrap && \
-		${MKDIR} bootstrap && \
-		${CP} -r ${DISTNAME} bootstrap && \
-		cd bootstrap/${DISTNAME} && \
-		${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \
-		${TOUCH} $@
+		${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \
+		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xf - && \
+		${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Configuring for bootstrap compiler" && \
+		${PHASE_MSG} "Configuring bootstrap compiler for ${PKGNAME}" && \
 		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
-		${TOUCH} $@
+		${TOUCH} ${.TARGET}
 
 ${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}) && \
-		${SH} mkfiles && \
-		${TOUCH} $@
+	${RUN} cd ${WRKDIR}/bootstrap && \
+		${PHASE_MSG} "Extracting bootstrap HC archive for ${PKGNAME}" && \
+		${FIND} ${DISTNAME} -type d -o -type f | ${XARGS} ${TOUCH} -t 200001010000 && \
+		${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL} && \
+		(cd ${DISTNAME} && ${SH} mkfiles) && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Rewriting GHC source paths" && \
+		${PHASE_MSG} "Rewriting source paths in bootstrap compiler for ${PKGNAME}" && \
 		${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \
 		for c in libraries/*/configure; do \
 			(cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \
@@ -131,12 +131,15 @@ ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 				   -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 && \
-		${TOUCH} $@
+		${TOUCH} -r inplace/lib/package.conf.d \
+					*/*/package-data.mk \
+					*/*/*/package-data.mk \
+					compiler/stage?/build/Config.hs && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Building bootstrap compiler" && \
+		${PHASE_MSG} "Building bootstrap compiler for ${PKGNAME}" && \
 		${GMAKE} bootstrapping-files && \
 		${GMAKE} all_ghc_stage2 && \
 		${GMAKE} inplace/bin/ghc-pkg && \
@@ -144,9 +147,13 @@ ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 		inplace/bin/ghc-pkg recache && \
 		${CP} -f inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \
 		${CP} -f inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg && \
-		${TOUCH} $@
+		${TOUCH} ${.TARGET}
 
 do-configure:
+# Seemingly by mistake, ghc-7.0.3 has a prebuilt
+# utils/ghc-pwd/dist-boot/ghc-pwd for amd64 GNU/Linux.
+	${RUN} cd ${WRKSRC} && \
+		rm -rf utils/ghc-pwd/dist-boot
 	${RUN} cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 # We need to tell the libraries/terminfo/configure that our ncurses is
@@ -177,7 +184,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