Use 8.4.4 bootkit for FreeBSD/i386

4 files changed, 14 insertions, 26 deletions

diff --git a/lang/ghc88/Makefile b/lang/ghc88/Makefile
index 47a9a78aaa5..bcd2b403017 100644
--- a/lang/ghc88/Makefile
+++ b/lang/ghc88/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/12 08:13:40 pho Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/13 15:42:47 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -22,7 +22,7 @@ CONFLICTS+=	ghc-[0-9]*
 # BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
-#BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386   # Not available yet
+BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-i386     # Not available yet
 #BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64   # Not available yet
diff --git a/lang/ghc88/bootstrap.mk b/lang/ghc88/bootstrap.mk
index 2d6aba38533..6fc73852834 100644
--- a/lang/ghc88/bootstrap.mk
+++ b/lang/ghc88/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.2 2020/01/12 08:13:40 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.3 2020/01/13 15:42:47 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -39,9 +39,9 @@ DISTFILES:=	${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 .endif
 
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-#BOOT_VERSION:=	8.4.4
-#BOOT_ARCHIVE:=	ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
-#DISTFILES:=	${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+BOOT_VERSION:=	8.4.4
+BOOT_ARCHIVE:=	ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
+DISTFILES:=	${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
@@ -81,16 +81,6 @@ SITES.${i}?=	${MASTER_SITE_LOCAL}
 CONFLICTS+=	libelf-[0-9]*
 .endif
 
-# FreeBSD < 10 surprisingly doesn't have a native iconv so we need to
-# use pkgsrc libiconv for this OPSYS. And if a bootkit depends on
-# pkgsrc libiconv, the "normal" build must do the same because GHC
-# always needs to link executables with libiconv, just like libgmp
-# when integer-gmp is used. For this reason it might be desirable to
-# create two separate bootkits, one for < 10 and another for >= 10.
-.if ${OPSYS} == "FreeBSD"
-USE_BUILTIN.iconv=	no
-.endif
-
 # current bootstrap binary kit for SmartOS is built with ncurses5
 .if !empty(MACHINE_PLATFORM:MSunOS-*) && ${OS_VARIANT:U} == "SmartOS"
 BUILD_DEPENDS+=	ncurses>=5.0:../../devel/ncurses
diff --git a/lang/ghc88/buildlink3.mk b/lang/ghc88/buildlink3.mk
index 6ced00227a1..83ef6f9525a 100644
--- a/lang/ghc88/buildlink3.mk
+++ b/lang/ghc88/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/01/09 12:32:24 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/01/13 15:42:47 pho Exp $
 
 BUILDLINK_TREE+=	ghc
 
@@ -9,12 +9,6 @@ BUILDLINK_API_DEPENDS.ghc+=	ghc>=8.8.1
 BUILDLINK_ABI_DEPENDS.ghc+=	ghc>=8.8.1
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc88
 
-# On FreeBSD we need pkgsrc libiconv. See bootstrap.mk for details.
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} == "FreeBSD"
-USE_BUILTIN.iconv=	no
-.endif
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/lang/ghc88/distinfo b/lang/ghc88/distinfo
index 3af50cd0599..a54c540f6c6 100644
--- a/lang/ghc88/distinfo
+++ b/lang/ghc88/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/01/12 08:13:40 pho Exp $
+$NetBSD: distinfo,v 1.3 2020/01/13 15:42:47 pho Exp $
 
+SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
+RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
+SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f
+Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes
 SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60
 RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3
 SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6
@@ -21,8 +25,8 @@ SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d1207328
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5
-SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
+SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
 SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
+SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
 SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
-SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00