X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=19c0a9cbfca3ebd4a8d51f5237729956c053aa68;hb=0e82c0c70fa70e6485afc40d48a5fa7e29e84982;hp=59ec94d6ba87e6ff7e5fc69631f6fa03b277b94f;hpb=9795cf147d263fd5fad5d40948bc965e9219dd64;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index 59ec94d..19c0a9c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,16 @@ COMMENT=		Compiler for the functional language Haskell
 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-powerpc-apple-darwin.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
+#DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-powerpc-apple-darwin9.8.0.tar.bz2
 
-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/
+.for i in ${DISTFILES:M*-boot-*}
+SITES.${i}=		http://static.cielonegro.org/archive/
+.endfor
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/bsd.prefs.mk"
-
 # Unregisterised HC packages are architecture dependent. We have to
 # create more HC packages to support more architectures. Note that
 # these packages are built with integer-simple, not integer-gmp, to
@@ -35,6 +33,7 @@ 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/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 .if empty(CCPATH)
 WARNINGS+= "This package depends on pkgsrc's undocumented variable \
@@ -68,23 +67,23 @@ CONFIGURE_ARGS += \
 #
 # To install it, we just copy ghc and ghc-pkg from
 # "work/bootstrap/ghc-${VERSION}/inplace/bin" to
-# "${BUILDLINK_DIR}/bin". Note that in-place ghc isn't usable before
-# running "ghc-pkg recache".
+# "${BUILDLINK_DIR}/bin". Note that in-place ghc isn't usable until we
+# run "ghc-pkg recache".
 
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
 BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-netbsd-i386.c
-PLATFORM           = i386-unknown-netbsd
+PLATFORM           = i386-unknown-netbsdelf6.99.1
 
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
 BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-freebsd-i386.c
-PLATFORM           = i386-unknown-freebsd
+PLATFORM           = i386-unknown-freebsd8.0
 
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-darwin-powerpc.c
-PLATFORM           = powerpc-apple-darwin
+PLATFORM           = powerpc-apple-darwin9.8.0
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ghc-6.12.1/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
@@ -160,12 +159,12 @@ ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
 		${PHASE_MSG} "Creating bootstrapping files for ${PKGNAME}" && \
-		${GMAKE} bootstrapping-files && \
+		${BUILD_MAKE_CMD} bootstrapping-files && \
 		${PHASE_MSG} "Building bootstrapping compiler for ${PKGNAME}" && \
-		${GMAKE} all_ghc_stage2 && \
+		${BUILD_MAKE_CMD} all_ghc_stage2 && \
 		${PHASE_MSG} "Building bootstrapping toolkit for ${PKGNAME}" && \
-		${GMAKE} inplace/bin/ghc-pkg && \
-		${GMAKE} inplace/lib/unlit && \
+		${BUILD_MAKE_CMD} inplace/bin/ghc-pkg && \
+		${BUILD_MAKE_CMD} inplace/lib/unlit && \
 		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 && \