Index: Makefile =================================================================== --- Makefile (revision 326551) +++ Makefile (working copy) @@ -15,7 +15,6 @@ ONLY_FOR_ARCHS= i386 amd64 GHC_VERSION= ${PORTVERSION} -BOOT_GHC_VERSION= 7.4.1 HSCOLOUR_VERSION= 1.20.2 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} @@ -72,16 +71,22 @@ .if empty(PORT_OPTIONS:MBOOT) +.if ${OSVERSION} >= 1000043 +BOOT_GHC_VERSION= 7.6.3 +.else +BOOT_GHC_VERSION= 7.4.1 +.endif + EXTRA_PATCHES= ${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in .if ${ARCH} == "i386" -.if ${OSVERSION} >= 900000 +.if ${OSVERSION} >= 1000043 +DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 800000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd7-boot${EXTRACT_SUFX}:boot .else IGNORE= unsupported .endif @@ -88,12 +93,12 @@ .elif ${ARCH} == "amd64" -.if ${OSVERSION} >= 900000 +.if ${OSVERSION} >= 1000043 +DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 900000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 800000 DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd7-boot${EXTRACT_SUFX}:boot .else IGNORE= unsupported .endif @@ -114,9 +119,12 @@ CONFIGURE_ARGS= --with-gcc=${CC} \ --with-ld=${LD} \ --with-gmp-includes=${LOCALBASE}/include \ - --with-gmp-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${LOCALBASE}/include \ + --with-gmp-libraries=${LOCALBASE}/lib + +.if ${OSVERSION} < 1000043 +CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib +.endif .if ${PORT_OPTIONS:MDYNAMIC} CONFIGURE_ARGS+= --with-system-libffi \ Index: distinfo =================================================================== --- distinfo (revision 326551) +++ distinfo (working copy) @@ -10,3 +10,7 @@ SIZE (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 46254818 SHA256 (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 8dc43c1ed2f026837947d938736ee6084f151fa5617998fca55420418f4ea28f SIZE (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 46427727 +SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 0000000000000000000000000000000000000000000000000000000000000000 +SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 0 +SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = dcb4dc4c47ef42667707a7eb7fc58ce9400924d5c7a75cae6f0cd4290e7d77e6 +SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55409409 Index: files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in =================================================================== --- files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in (revision 0) +++ files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in (working copy) @@ -0,0 +1,11 @@ +--- ../ghc-7.6.3-boot/rts/package.conf.in.orig 2013-04-18 22:22:47.000000000 +0100 ++++ ../ghc-7.6.3-boot/rts/package.conf.in 2013-09-06 23:01:22.000000000 +0100 +@@ -141,6 +141,8 @@ + , "-u", "base_GHCziConcziSignal_runHandlers_closure" + #endif + ++ , "-L%%LOCALBASE%%/lib" ++ + /* Pick up static libraries in preference over dynamic if in earlier search + * path. This is important to use the static gmp in preference on Mac OS. + * The used option is specific to the Darwin linker.