Drop bootstrap binary from distfiles.

You can use your trusted bootstrap file as your basis.

3 files changed, 20 insertions, 17 deletions

diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile
index 91c40d079c1..d681e0201e4 100644
--- a/lang/ghc7/Makefile
+++ b/lang/ghc7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/16 02:22:45 obache Exp $
+# $NetBSD: Makefile,v 1.3 2013/12/16 06:23:09 obache Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -18,25 +18,29 @@ LICENSE=	modified-bsd
 # 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}-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-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-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
+#.else
+#DISTFILES+=	${BOOT_ARCHIVE}
+#.endif
 
 
 # We don't want to extract all of the DISTFILEs.
diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk
index a7b7cc1ea38..2fd53f4b696 100644
--- a/lang/ghc7/bootstrap.mk
+++ b/lang/ghc7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2013/12/12 12:47:17 obache Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2013/12/16 06:23:09 obache Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler based on a per-platform
 # basis.
@@ -40,7 +40,8 @@ BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-solaris2.tar.xz
 PKG_FAIL_REASON+=	"internal error: unsupported platform"
 .endif
 
-BOOT_TARBALL=	${BOOT_ARCHIVE:C/\.xz$//}
+BOOT_TARBALL=	${BOOT_ARCHIVE:C/\.xz$//:C/\.gz$//}
+
 
 
 # -----------------------------------------------------------------------------
@@ -52,6 +53,9 @@ BOOT_TARBALL=	${BOOT_ARCHIVE:C/\.xz$//}
 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 && \
@@ -62,6 +66,7 @@ pre-configure:
 		${SH} ./configure \
 			--prefix=${TOOLS_DIR:Q} && \
 		${MAKE_PROGRAM} install
+.endif
 
 
 # -----------------------------------------------------------------------------
diff --git a/lang/ghc7/distinfo b/lang/ghc7/distinfo
index a41059d378e..c628e3cea36 100644
--- a/lang/ghc7/distinfo
+++ b/lang/ghc7/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.1 2013/12/12 12:47:17 obache Exp $
+$NetBSD: distinfo,v 1.2 2013/12/16 06:23:09 obache Exp $
 
-SHA1 (ghc-7.6.3-boot-i386-unknown-netbsd.tar.xz) = 9fc2f538da69ede96f0754e0cf5d376280c5f2ee
-RMD160 (ghc-7.6.3-boot-i386-unknown-netbsd.tar.xz) = 4f188f1b7ba992cc1a1436aac68d11ef78f7714c
-Size (ghc-7.6.3-boot-i386-unknown-netbsd.tar.xz) = 28258276 bytes
-SHA1 (ghc-7.6.3-boot-x86_64-unknown-netbsd.tar.xz) = 0d6da7f192a25d154f46554777909f19002a48a3
-RMD160 (ghc-7.6.3-boot-x86_64-unknown-netbsd.tar.xz) = 9995bf052e5737074692a107d5210663759d796c
-Size (ghc-7.6.3-boot-x86_64-unknown-netbsd.tar.xz) = 28766012 bytes
 SHA1 (ghc-7.6.3-src.tar.bz2) = 8938e1ef08b37a4caa071fa169e79a3001d065ff
 RMD160 (ghc-7.6.3-src.tar.bz2) = 82a673ed38b7cf9a59afeb01057625fc761a822b
 Size (ghc-7.6.3-src.tar.bz2) = 110763823 bytes