Merge branch 'ghc-7.6.2'

[pkgsrc-ghc.git] / bootstrap.mk

diff --git a/bootstrap.mk b/bootstrap.mk
index a3fe3bc9742c15f504d3d45c833a783680b109d8..008582c140d395aead9c923c47cbff4a7a401675 100644 (file)
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -12,20 +12,20 @@
 #
 .include "../../mk/bsd.prefs.mk"
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
-BOOT_ARCHIVE=  ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
+BOOT_ARCHIVE=  ${DISTNAME}-boot-i386-unknown-freebsd.tar.xz
 
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
-BOOT_ARCHIVE=  ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
+BOOT_ARCHIVE=  ${DISTNAME}-boot-i386-unknown-netbsd.tar.xz
 
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOT_ARCHIVE=  ${DISTNAME}-boot-powerpc-apple-darwin.tar.xz
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ${WRKSRC}/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
-CONFLICTS+=            libelf-[0-9]*
+CONFLICTS+=    libelf-[0-9]*
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
-BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
+BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-linux.tar.xz
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "NetBSD"
 BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz