Index: head/lang/ghc/Makefile =================================================================== --- head/lang/ghc/Makefile (revision 486823) +++ head/lang/ghc/Makefile (revision 486824) @@ -1,31 +1,29 @@ # Created by: Simon Marlow # $FreeBSD$ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ hscolour-${HSCOLOUR_VERSION}.tar.gz:docs MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 - GHC_VERSION= 8.4.4 HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 50 CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.3 .include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk" .include Index: head/lang/ghc/bsd.ghc.mk =================================================================== --- head/lang/ghc/bsd.ghc.mk (revision 486823) +++ head/lang/ghc/bsd.ghc.mk (revision 486824) @@ -1,281 +1,285 @@ # $FreeBSD$ # # bsd.ghc.mk -- Common code for various versions of GHC ports. # # Maintained by: haskell@FreeBSD.org # +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 + DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} -LIB_DEPENDS+= libgmp.so:math/gmp - USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz USE_LOCALE= en_US.UTF-8 USE_PERL5= build NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: Permission denied # The configure process accepts,filters and canonicalises # the CONFIGURE_TARGET variable. You can read the files # ${WRKSRC}/configure and ${WRKSRC}/config.sub. # This is better fixed in files/build.mk.in GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \ - --with-gmp-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib +# Turn off for a while, see PR 228727 +CONFIGURE_ARGS+= --enable-dtrace=0 -SUB_FILES= build.mk \ - build.boot.mk +SUB_FILES= build.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc OPTIONS_GROUP_BOOTSTRAP=BOOT -OPTIONS_DEFINE= DYNAMIC PROFILE DOCS +OPTIONS_DEFINE= DYNAMIC GMP PROFILE DOCS OPTIONS_SUB= yes -OPTIONS_DEFAULT= PROFILE DYNAMIC -# ghci segfaults on arm when dynamic linking is used -OPTIONS_EXCLUDE_armv6= DYNAMIC -OPTIONS_EXCLUDE_armv7= DYNAMIC -OPTIONS_EXCLUDE_aarch64= DYNAMIC +OPTIONS_DEFAULT= DYNAMIC PROFILE GMP BOOT_DESC= Use installed GHC for bootstrapping -PROFILE_DESC= Add support for performance profiling -DYNAMIC_DESC= Add support for dynamic linking DOCS_DESC= Install HTML documentation +DYNAMIC_DESC= Add support for dynamic linking +GMP_DESC= Use GNU Multi-precision Library for big integers support +PROFILE_DESC= Add support for performance profiling -DYNAMIC_CONFIGURE_ARGS= --with-system-libffi \ - --with-ffi-includes=${LOCALBASE}/include \ - --with-ffi-libraries=${LOCALBASE}/lib +DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx + +DYNAMIC_CONFIGURE_WITH= system-libffi \ + ffi-includes=${LOCALBASE}/include \ + ffi-libraries=${LOCALBASE}/lib # The version number is needed as lang/gcc installs a different version DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi +GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \ + gmp-libraries=${LOCALBASE}/lib +GMP_LIB_DEPENDS= libgmp.so:math/gmp + # Append substitutions for build.mk BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS} -DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx +DOCS_SUB_LIST= WITH_DOCS="YES" +DOCS_SUB_LIST_OFF= WITH_DOCS="NO" DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES" DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO" +GMP_SUB_LIST= INTEGER_LIBRARY="integer-gmp" +GMP_SUB_LIST_OFF= INTEGER_LIBRARY="integer-simple" + PROFILE_SUB_LIST= WITH_PROFILE="YES" PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" -DOCS_SUB_LIST= WITH_DOCS="YES" -DOCS_SUB_LIST_OFF= WITH_DOCS="NO" - LOCALBASE?= /usr/local +GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/} + .include .if empty(PORT_OPTIONS:MBOOT) +. if ${ARCH} == armv6 || ${ARCH} == armv7 BOOT_GHC_VERSION= 8.4.2 +. else +BOOT_GHC_VERSION= 8.4.3 +. endif DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aclocal.m4 BUILD_DEPENDS+= ld.gold:devel/binutils \ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS+= ld.gold:devel/binutils \ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} USE_GCC= yes . if ${OSVERSION} < 1200064 IGNORE= lang/ghc on ARM requires at least __FreeBSD_version 1200064 . endif . ifdef QEMU_EMULATING IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware . endif .endif -# Turn off for a while, see PR 228727 -CONFIGURE_ARGS+= --enable-dtrace=0 -.if ${OSVERSION} < 1200000 -USE_GCC= yes -.else -. if !exists(/usr/bin/ld.bfd) -USE_BINUTILS= yes -. endif -LD= ld.bfd -.endif CONFIGURE_ENV+= CC=${CC} LD=${LD} DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION} PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} HACKAGE_SITE?= http://hackage.haskell.org/package/ .if empty(PORT_OPTIONS:MBOOT) BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION} BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION} BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT SLAVE_CMD= # empty CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc .endif # MBOOT # override TMPDIR because /tmp often doesn't have enough space # to build some of the larger libraries. TMPDIR= ${WRKSRC}/tmp # Defining with documentation: # An in place installation and registration of hscolour will be # activated. In this way it's possible to use it directly into # the build tree, without needing to install it. At the end # you could view the output of: ${BOOT_GHC} describe hscolour SLAVES_PREFIX= ${WRKDIR}/slaves_prefix SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} post-extract: # don't use the "wrap" trick on arches that use post-ino64 bootstrap binaries (arm*) .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \ ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 @${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in .endif # %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html post-install-script: ${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \ >> ${TMPPLIST} ${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/s|^|@comment |g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/s|^|@comment|g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/s|^|@comment |g' \ >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} # Cleanup the indexen created by gen_contents_index ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST} .endif ${ECHO} '@postunexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST} ${ECHO} "@postexec %D/bin/ghc-pkg recache" >>${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} ${ECHO} '@postexec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST} .endif post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ s|%%AR%%|${AR}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs # we must use binutils:ld on arm .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 @${REINPLACE_CMD} -e 's|LD_NO_GOLD=ld|LD_NO_GOLD=${LOCALBASE}/bin/ld|' \ ${WRKSRC}/aclocal.m4 .endif @${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in @${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in .if empty(PORT_OPTIONS:MBOOT) @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk .endif pre-configure: apply-slist # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk @${MKDIR} ${TMPDIR} .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \ ${OSVERSION} >= 1200031 && \ ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \ ${AR} q $$x ${BOOT_DIR}/wrap.o; ${RANLIB} $$x; \ done rm ${BOOT_DIR}/wrap.o .endif # Do not merge, prev condition need to grow OSVER check. .if empty(PORT_OPTIONS:MBOOT) @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS_BOOT}) @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -e "\a" @${ECHO_MSG} "======================================================================" @${ECHO_MSG} " WARNING: Now HsColour will be built, the respective port will not " @${ECHO_MSG} " be installed, but an in-place installation and " @${ECHO_MSG} " registration of both takes place. " @${ECHO_MSG} "======================================================================" @${ECHO_MSG} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 3 . endif @${MKDIR} ${SLAVES_PREFIX} @${MKDIR} ${SLAVES_WRKDIRPREFIX} @(cd ${SLAVES_WRKDIRPREFIX} && \ ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \ cd hscolour-${HSCOLOUR_VERSION} && \ ${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \ ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \ ${SLAVE_CMD} ./Setup build && \ ${SLAVE_CMD} ./Setup install) .endif _EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \ ${GHC_LIBDIR}/bin/hpc \ ${GHC_LIBDIR}/bin/ghc-iserv \ ${GHC_LIBDIR}/bin/ghc-pkg \ ${GHC_LIBDIR}/bin/hsc2hs \ ${GHC_LIBDIR}/bin/runghc \ ${GHC_LIBDIR}/bin/ghc \ ${GHC_LIBDIR}/bin/hp2ps .if ${PORT_OPTIONS:MPROFILE} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof .endif .if ${PORT_OPTIONS:MDYNAMIC} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn .endif .if ${PORT_OPTIONS:MDOCS} _EXECUTABLES+= ${GHC_LIBDIR}/bin/haddock .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/haddock .if ${PORT_OPTIONS:MDOCS} ${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \ ${STRIP_CMD} $$f; done) # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail .PHONY: create-bootstrap create-bootstrap: cd ${WRKSRC} \ - && gmake binary-dist TAR_COMP=xz \ - && mv ${WRKSRC}/ghc-${GHC_VERSION}-${ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz - && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz - && stat -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + && ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \ + && ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \ + && gmake binary-dist TAR_COMP=xz \ + && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + + cd /tmp \ + && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ + && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ + && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz Index: head/lang/ghc/distinfo =================================================================== --- head/lang/ghc/distinfo (revision 486823) +++ head/lang/ghc/distinfo (revision 486824) @@ -1,15 +1,15 @@ -TIMESTAMP = 1541010521 +TIMESTAMP = 1541010522 SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2 SIZE (ghc-8.4.4-src.tar.xz) = 11319500 -SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f -SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016 -SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911 -SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728 +SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 +SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 +SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 +SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 -SHA256 (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 18412f10bb172dbaff7f31505845fbd43fdde14046463fdacc42e26683be311d -SIZE (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 100240140 +SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05 +SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576 SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936 SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548 Index: head/lang/ghc/files/build.boot.mk.in =================================================================== --- head/lang/ghc/files/build.boot.mk.in (revision 486823) +++ head/lang/ghc/files/build.boot.mk.in (nonexistent) @@ -1,9 +0,0 @@ -GhcLibWays = v -XMLDocWays = -HADDOCK_DOCS = NO -HSCOLOUR_SRCS = NO -INTEGER_LIBRARY = integer-simple -DYNAMIC_GHC_PROGRAMS = NO -BUILD_PROF_LIBS = NO -BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot -BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar Property changes on: head/lang/ghc/files/build.boot.mk.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/ghc/files/build.mk.in =================================================================== --- head/lang/ghc/files/build.mk.in (revision 486823) +++ head/lang/ghc/files/build.mk.in (revision 486824) @@ -1,19 +1,20 @@ docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% mandir = %%PREFIX%%/man infodir = %%PREFIX%%/info DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% BUILD_PROF_LIBS = %%WITH_PROFILE%% HADDOCK_DOCS = %%WITH_DOCS%% HSCOLOUR_SRCS = %%WITH_DOCS%% +INTEGER_LIBRARY = %%INTEGER_LIBRARY%% # disable xelatex: PR 231438 BUILD_SPHINX_PDF = NO BSD_PATH_TO_HSC2HS = %%HSC2HS%% SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib SRC_CC_OPTS += %%CFLAGS%% EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%% V = 0 Index: head/lang/ghc843/Makefile =================================================================== --- head/lang/ghc843/Makefile (revision 486823) +++ head/lang/ghc843/Makefile (revision 486824) @@ -1,35 +1,33 @@ # Created by: Simon Marlow # $FreeBSD$ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} PORTREVISION= 1 PKGNAMESUFFIX= 843 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ hscolour-${HSCOLOUR_VERSION}.tar.gz:docs MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 - GHC_VERSION= 8.4.3 HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 50 CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.4 PLIST= ${.CURDIR}/../../lang/ghc/pkg-plist .include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk" .include Index: head/lang/ghc843/distinfo =================================================================== --- head/lang/ghc843/distinfo (revision 486823) +++ head/lang/ghc843/distinfo (revision 486824) @@ -1,15 +1,15 @@ -TIMESTAMP = 1530033471 +TIMESTAMP = 1530033472 SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6 SIZE (ghc-8.4.3-src.tar.xz) = 11315068 -SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f -SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016 -SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911 -SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728 +SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 +SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 +SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 +SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 -SHA256 (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 18412f10bb172dbaff7f31505845fbd43fdde14046463fdacc42e26683be311d -SIZE (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 100240140 +SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05 +SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576 SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936 SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548 Index: head/lang/ghc843/files/build.boot.mk.in =================================================================== --- head/lang/ghc843/files/build.boot.mk.in (revision 486823) +++ head/lang/ghc843/files/build.boot.mk.in (nonexistent) @@ -1,9 +0,0 @@ -GhcLibWays = v -XMLDocWays = -HADDOCK_DOCS = NO -HSCOLOUR_SRCS = NO -INTEGER_LIBRARY = integer-simple -DYNAMIC_GHC_PROGRAMS = NO -BUILD_PROF_LIBS = NO -BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot -BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar Property changes on: head/lang/ghc843/files/build.boot.mk.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/ghc843/files/build.mk.in =================================================================== --- head/lang/ghc843/files/build.mk.in (revision 486823) +++ head/lang/ghc843/files/build.mk.in (revision 486824) @@ -1,19 +1,20 @@ docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% mandir = %%PREFIX%%/man infodir = %%PREFIX%%/info DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% BUILD_PROF_LIBS = %%WITH_PROFILE%% HADDOCK_DOCS = %%WITH_DOCS%% HSCOLOUR_SRCS = %%WITH_DOCS%% +INTEGER_LIBRARY = %%INTEGER_LIBRARY%% # disable xelatex: PR 231438 BUILD_SPHINX_PDF = NO BSD_PATH_TO_HSC2HS = %%HSC2HS%% SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib SRC_CC_OPTS += %%CFLAGS%% EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%% V = 0