Page MenuHomeFreeBSD
Files F158792174

D15005.id41242.diff
No OneTemporary
Actions

D15005.id41242.diff
View Options

Index: devel/hs-ansi-wl-pprint/Makefile
===================================================================
--- devel/hs-ansi-wl-pprint/Makefile
+++ devel/hs-ansi-wl-pprint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.7.3
-PORTREVISION= 2
+PORTVERSION= 0.6.8.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@
LICENSE= BSD3CLAUSE
-USE_CABAL= ansi-terminal>=0.4.0
+USE_CABAL= ansi-terminal>=0.4.0 semigroups>=0.1
FLAGS_DISABLE= Example
Index: devel/hs-ansi-wl-pprint/distinfo
===================================================================
--- devel/hs-ansi-wl-pprint/distinfo
+++ devel/hs-ansi-wl-pprint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627819
-SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
-SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
+TIMESTAMP = 1523129349
+SHA256 (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = a630721bd57678c3bfeb6c703f8249e434cbf85f40daceec4660fb8c6725cb3e
+SIZE (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = 16491
Index: devel/hs-basement/Makefile
===================================================================
--- devel/hs-basement/Makefile
+++ devel/hs-basement/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
-PORTNAME= cereal
-PORTVERSION= 0.5.4.0
-PORTREVISION= 1
+PORTNAME= basement
+PORTVERSION= 0.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binary serialization library
+COMMENT= Foundation most basic primitives without any dependencies
LICENSE= BSD3CLAUSE
Index: devel/hs-basement/distinfo
===================================================================
--- /dev/null
+++ devel/hs-basement/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523131438
+SHA256 (cabal/basement-0.0.7.tar.gz) = b501b9b378f35b80c60321031dbbf9ed7af46c66353f072e00f00abdd2244f70
+SIZE (cabal/basement-0.0.7.tar.gz) = 133178
Index: devel/hs-basement/pkg-descr
===================================================================
--- /dev/null
+++ devel/hs-basement/pkg-descr
@@ -0,0 +1,12 @@
+This package has the following goals:
+ * provide a base like sets of modules that provide a consistent set of
+ features and bugfixes across multiple versions of GHC (unlike base).
+ * provide a better and more efficient prelude than base's prelude.
+ * be self-sufficient: no external dependencies apart from base.
+ * provide better data-types: packed unicode string by default, arrays.
+ * Better numerical classes that better represent mathematical thing
+ (No more all-in-one Num).
+ * Better I/O system with less Lazy IO
+ * Usual partial functions distinguished through type system
+
+WWW: https://hackage.haskell.org/package/foundation
Index: devel/hs-cereal/Makefile
===================================================================
--- devel/hs-cereal/Makefile
+++ devel/hs-cereal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.5.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
Index: devel/hs-cereal/distinfo
===================================================================
--- devel/hs-cereal/distinfo
+++ devel/hs-cereal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627824
-SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7
-SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504
+TIMESTAMP = 1523129318
+SHA256 (cabal/cereal-0.5.5.0.tar.gz) = 0b97320ffbfa6df2e5679022215dbd0fe6e3b5ae8428c2ff4310d9e1acf16822
+SIZE (cabal/cereal-0.5.5.0.tar.gz) = 19832
Index: devel/hs-cmdargs/Makefile
===================================================================
--- devel/hs-cmdargs/Makefile
+++ devel/hs-cmdargs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.17
-PORTREVISION= 1
+PORTVERSION= 0.10.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
Index: devel/hs-cmdargs/distinfo
===================================================================
--- devel/hs-cmdargs/distinfo
+++ devel/hs-cmdargs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499596679
-SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da
-SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440
+TIMESTAMP = 1523129483
+SHA256 (cabal/cmdargs-0.10.20.tar.gz) = 0e269dc48c3d4c0447c96ffd772a6fe69dfa1260c323f4cd7bf171cbf2ab7331
+SIZE (cabal/cmdargs-0.10.20.tar.gz) = 64550
Index: devel/hs-colour/Makefile
===================================================================
--- devel/hs-colour/Makefile
+++ devel/hs-colour/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= colour
-PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTVERSION= 2.3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
Index: devel/hs-colour/distinfo
===================================================================
--- devel/hs-colour/distinfo
+++ devel/hs-colour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499547650
-SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2
-SIZE (cabal/colour-2.3.3.tar.gz) = 20392
+TIMESTAMP = 1523129642
+SHA256 (cabal/colour-2.3.4.tar.gz) = 0f439f00b322ce3d551f28a4dd1520aa2c91d699de4cdc6d485b9b04be0dc5eb
+SIZE (cabal/colour-2.3.4.tar.gz) = 20418
Index: devel/hs-deepseq-generics/Makefile
===================================================================
--- devel/hs-deepseq-generics/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= deepseq-generics
-PORTVERSION= 0.2.0.0
-PORTREVISION= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation
-
-LICENSE= BSD3CLAUSE
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
Index: devel/hs-deepseq-generics/distinfo
===================================================================
--- devel/hs-deepseq-generics/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499444756
-SHA256 (cabal/deepseq-generics-0.2.0.0.tar.gz) = b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d
-SIZE (cabal/deepseq-generics-0.2.0.0.tar.gz) = 5192
Index: devel/hs-deepseq-generics/pkg-descr
===================================================================
--- devel/hs-deepseq-generics/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package provides a "GHC.Generics"-based
-'Control.DeepSeq.Generics.genericRnf' function which can be used for
-providing a 'rnf' implementation.
-
-WWW: https://github.com/hvr/deepseq-generics
Index: devel/hs-fmlist/Makefile
===================================================================
--- devel/hs-fmlist/Makefile
+++ devel/hs-fmlist/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fmlist
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.9.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
Index: devel/hs-fmlist/distinfo
===================================================================
--- devel/hs-fmlist/distinfo
+++ devel/hs-fmlist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499719989
-SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf
-SIZE (cabal/fmlist-0.9.tar.gz) = 4256
+TIMESTAMP = 1523130549
+SHA256 (cabal/fmlist-0.9.2.tar.gz) = 8fc4b55d04e7f216740a01acd2f38293e3bd9409a9495e6042a162580c420609
+SIZE (cabal/fmlist-0.9.2.tar.gz) = 4387
Index: devel/hs-foundation/Makefile
===================================================================
--- devel/hs-foundation/Makefile
+++ devel/hs-foundation/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= foundation
-PORTVERSION= 0.0.13
-PORTREVISION= 1
+PORTVERSION= 0.0.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@
LICENSE= BSD3CLAUSE
+USE_CABAL= basement==0.0.7
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
Index: devel/hs-foundation/distinfo
===================================================================
--- devel/hs-foundation/distinfo
+++ devel/hs-foundation/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627835
-SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f
-SIZE (cabal/foundation-0.0.13.tar.gz) = 221540
+TIMESTAMP = 1523130712
+SHA256 (cabal/foundation-0.0.20.tar.gz) = ba6ae63a9ce0846bf942af2c3ace56600f051c61e83a0b55dd625de23a78e42d
+SIZE (cabal/foundation-0.0.20.tar.gz) = 122940
Index: graphics/hs-dia-base/Makefile
===================================================================
--- graphics/hs-dia-base/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= dia-base
-PORTVERSION= 0.1.1.4
-PORTREVISION= 1
-CATEGORIES= graphics haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= EDSL for teaching Haskell with diagrams - data types
-
-LICENSE= BSD3CLAUSE
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
Index: graphics/hs-dia-base/distinfo
===================================================================
--- graphics/hs-dia-base/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499448265
-SHA256 (cabal/dia-base-0.1.1.4.tar.gz) = 1fc6bbf2f60bdefbd516a84063100f63f9ea9a41188ea5eb8f67be7b01fd9e26
-SIZE (cabal/dia-base-0.1.1.4.tar.gz) = 3786
Index: graphics/hs-dia-base/pkg-descr
===================================================================
--- graphics/hs-dia-base/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package contains the Diagram data type and the user API to construct
-diagrams.
-
-WWW: http://hackage.haskell.org/package/dia-base
Index: lang/ghc/Makefile
===================================================================
--- lang/ghc/Makefile
+++ lang/ghc/Makefile
@@ -3,10 +3,9 @@
PORTNAME= ghc
PORTVERSION= ${GHC_VERSION}
-PORTREVISION= 3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
- LOCAL/pgj/:boot
+ http://arrowd.name/:boot
DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
MAINTAINER= haskell@FreeBSD.org
@@ -17,13 +16,13 @@
ONLY_FOR_ARCHS= i386 amd64
-GHC_VERSION= 8.0.2
-HSCOLOUR_VERSION= 1.24.1
+GHC_VERSION= 8.4.1
+HSCOLOUR_VERSION= 1.24.4
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.*
+CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.*
LIB_DEPENDS+= libgmp.so:math/gmp
@@ -38,8 +37,7 @@
# This is better fixed in files/build.mk.in
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-ld=${LD} \
- --with-gmp-includes=${LOCALBASE}/include \
+CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib \
--with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
@@ -90,14 +88,16 @@
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MBOOT)
-BOOT_GHC_VERSION= 7.10.2
+BOOT_GHC_VERSION= 8.4.1
DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
.endif # MBOOT
-CONFIGURE_ARGS+= -with-gcc=${CC}
-.if empty(PORT_OPTIONS:MBOOT)
-CONFIGURE_ARGS_BOOT+= --with-gcc=${CC}
+.if ${OSVERSION} < 1200000
+USE_GCC= yes
+.else
+LD= ld.bfd
.endif
+CONFIGURE_ENV+= CC=${CC} LD=${LD}
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
@@ -115,7 +115,7 @@
SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
-CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD}
+CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR}
CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
.else # MBOOT
SLAVE_CMD= # empty
@@ -189,13 +189,19 @@
s|%%AR%%|${AR}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+.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:MBOOTH) && ${OPSYS} == FreeBSD && \
+.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \
${OSVERSION} >= 1200031
${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c
for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \
@@ -230,14 +236,14 @@
${SLAVE_CMD} ./Setup install)
.endif
-_EXECUTABLES= ${STAGEDIR}${PREFIX}/bin/hp2ps \
- ${GHC_LIBDIR}/bin/unlit \
+_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/ghc \
+ ${GHC_LIBDIR}/bin/hp2ps
.if ${PORT_OPTIONS:MPROFILE}
_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof
@@ -254,7 +260,7 @@
.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 \
+ (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \
${STRIP_CMD} $$f; done)
.include <bsd.port.mk>
@@ -262,12 +268,6 @@
# Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
.PHONY: create-bootstrap
create-bootstrap:
- @${ECHO} "TODO: https://github.com/freebsd-haskell/ports/wiki/Updating-the-Bootstrap-Compiler"
- cd ${WRKSCR} \
- && ${CP} ${WRKDIR}/build.boot.mk mk \
- && setenv ${CONFIGURE_ENV} ./configure --with-iconv-includes=${LOCALBASE}/include \
- --with-iconv-libraries=${LOCALBASE}/lib \
- --with-gcc=${CC} \
- --with-ld=${LD} \
- && make binary-dist TAR_COMP=xz \\
- && mv ghc-${GHC_VERSION}-boot-${GHC_ARCH}-unknown-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-${ARCH}-freebsd${FREEBSD_MAJOR_VERSION}-boot.tar.xz
+ 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
Index: lang/ghc/bsd.hackage.mk
===================================================================
--- lang/ghc/bsd.hackage.mk
+++ lang/ghc/bsd.hackage.mk
@@ -90,6 +90,7 @@
base-unicode-symbols_port?= devel/hs-base-unicode-symbols
base16-bytestring_port?= devel/hs-base16-bytestring
base64-bytestring_port?= devel/hs-base64-bytestring
+basement_port?= devel/hs-basement
basic-prelude_port?= devel/hs-basic-prelude
bencode_port?= textproc/hs-bencode
bifunctors_port?= devel/hs-bifunctors
Index: lang/ghc/distinfo
===================================================================
--- lang/ghc/distinfo
+++ lang/ghc/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1499672924
-SHA256 (ghc-8.0.2-src.tar.xz) = 11625453e1d0686b3fa6739988f70ecac836cadc30b9f0c8b49ef9091d6118b1
-SIZE (ghc-8.0.2-src.tar.xz) = 10687760
-SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a
-SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716
-SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8
-SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224
-SHA256 (hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8
-SIZE (hscolour-1.24.1.tar.gz) = 28717
+TIMESTAMP = 1521746766
+SHA256 (ghc-8.4.1-src.tar.xz) = 39ae2f25192408f355693e5a3c8b6ff613ddb7c4da998fdf26210143a61839d2
+SIZE (ghc-8.4.1-src.tar.xz) = 11301528
+SHA256 (ghc-8.4.1-boot-amd64-freebsd.tar.xz) = 886e1eac8bc5d9dab62cb1dd7f579314cf0c1c40ee719ec1a497639ec6e61e19
+SIZE (ghc-8.4.1-boot-amd64-freebsd.tar.xz) = 72473540
+SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
+SIZE (hscolour-1.24.4.tar.gz) = 28729
Index: lang/ghc/files/patch-compiler_main_SysTools.hs
===================================================================
--- lang/ghc/files/patch-compiler_main_SysTools.hs
+++ /dev/null
@@ -1,12 +0,0 @@
---- compiler/main/SysTools.hs.orig 2017-08-12 09:25:57 UTC
-+++ compiler/main/SysTools.hs
-@@ -907,6 +907,9 @@ getCompilerInfo' dflags = do
- -- Regular clang
- | any ("clang version" `isInfixOf`) stde =
- return Clang
-+ -- FreeBSD clang
-+ | any ("FreeBSD clang version" `isInfixOf`) stde =
-+ return Clang
- -- XCode 5.1 clang
- | any ("Apple LLVM version 5.1" `isPrefixOf`) stde =
- return AppleClang51
Index: lang/ghc/files/patch-configure.ac
===================================================================
--- lang/ghc/files/patch-configure.ac
+++ lang/ghc/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2017-01-04 14:17:17 UTC
+--- configure.ac.orig 2018-03-06 16:48:53 UTC
+++ configure.ac
-@@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken])
+@@ -447,6 +447,9 @@ XCODE_VERSION()
dnl ** Building a cross compiler?
dnl --------------------------------------------------------------
CrossCompiling=NO
@@ -10,15 +10,30 @@
# If 'host' and 'target' differ, then this means we are building a cross-compiler.
if test "$TargetPlatform" != "$HostPlatform" ; then
CrossCompiling=YES
-@@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
- use_large_address_space=yes
- elif test "$ghc_host_os" = "openbsd" ; then
- # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE.
-+ # The flag MAP_NORESERVE is supported for source compatibility reasons,
-+ # but is completely ignored by OS mmap
-+ use_large_address_space=no
-+ elif test "$ghc_host_os" = "freebsd" ; then
-+ # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250.
+@@ -798,14 +801,6 @@ AC_PATH_PROGS(PatchCmd,gpatch patch, pat
+
+ dnl ** check for dtrace (currently only implemented for Mac OS X)
+ HaveDtrace=NO
+-AC_PATH_PROG(DtraceCmd,dtrace)
+-if test -n "$DtraceCmd"; then
+- if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" \
+- -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xfreebsd-portbld" \
+- -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then
+- HaveDtrace=YES
+- fi
+-fi
+ AC_SUBST(HaveDtrace)
+
+ AC_PATH_PROG(HSCOLOUR,HsColour)
+@@ -1163,6 +1158,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t
# The flag MAP_NORESERVE is supported for source compatibility reasons,
# but is completely ignored by OS mmap
use_large_address_space=no
++ elif test "$ghc_host_os" = "freebsd" ; then
++ # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250.
++ # The flag MAP_NORESERVE is supported for source compatibility reasons,
++ # but is completely ignored by OS mmap
++ use_large_address_space=no
+ else
+ AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[],
+ [
Index: lang/ghc/files/patch-ghc.mk
===================================================================
--- lang/ghc/files/patch-ghc.mk
+++ lang/ghc/files/patch-ghc.mk
@@ -8,14 +8,14 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
endif
-@@ -465,10 +466,7 @@ PACKAGES_STAGE1 += ghc-boot
+@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th
+ PACKAGES_STAGE1 += ghc-boot
PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += hoopl
- PACKAGES_STAGE1 += transformers
+ PACKAGES_STAGE1 += ghc-compact
-
-ifeq "$(HADDOCK_DOCS)" "YES"
PACKAGES_STAGE1 += xhtml
-endif
- ifeq "$(Windows_Target)" "NO"
- ifneq "$(TargetOS_CPP)" "ios"
+ ifeq "$(WITH_TERMINFO)" "YES"
+ PACKAGES_STAGE1 += terminfo
Index: lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h
===================================================================
--- lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- includes/rts/storage/ClosureMacros.h.orig 2018-01-03 13:27:55 UTC
-+++ includes/rts/storage/ClosureMacros.h
-@@ -499,8 +499,17 @@ INLINE_HEADER StgWord8 *mutArrPtrsCard (
-
- -------------------------------------------------------------------------- */
-
--#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING))
--#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
-+#if defined(PROFILING)
-+#define ZERO_SLOP_FOR_LDV_PROF 1
-+#else
-+#define ZERO_SLOP_FOR_LDV_PROF 0
-+#endif
-+
-+#if defined(DEBUG) && !defined(THREADED_RTS)
-+#define ZERO_SLOP_FOR_SANITY_CHECK 1
-+#else
-+#define ZERO_SLOP_FOR_SANITY_CHECK 0
-+#endif
-
- #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
- #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
Index: lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
===================================================================
--- lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2017-01-03 15:59:20 UTC
-+++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -996,7 +996,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do
- supportRPaths Linux   = True
- supportRPaths Windows = False
- supportRPaths OSX   = True
-- supportRPaths FreeBSD   = False
-+ supportRPaths FreeBSD   = True
- supportRPaths OpenBSD   = False
- supportRPaths NetBSD   = False
- supportRPaths DragonFly = False
Index: lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
===================================================================
--- lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -1,15 +1,15 @@
---- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-01-03 15:59:20 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-@@ -54,6 +54,8 @@ import Distribution.Compat.Exception
+@@ -59,6 +59,8 @@ import Distribution.Compat.Exception
import Distribution.Verbosity
import Distribution.Version
+import System.FilePath (takeDirectory)
+
- import Data.Char
- ( isDigit )
import qualified Data.Map as Map
-@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") {
+
+ -- ------------------------------------------------------------
+@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") {
gccProgram :: Program
gccProgram = (simpleProgram "gcc") {
@@ -26,7 +26,7 @@
stripProgram :: Program
stripProgram = (simpleProgram "strip") {
-@@ -311,7 +315,9 @@ greencardProgram :: Program
+@@ -337,7 +341,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
Index: lang/ghc/files/patch-rts_Linker.c
===================================================================
--- lang/ghc/files/patch-rts_Linker.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- rts/Linker.c.orig 2017-08-12 09:22:13 UTC
-+++ rts/Linker.c
-@@ -797,7 +797,7 @@ initLinker_ (int retain_cafs)
- # endif /* RTLD_DEFAULT */
-
- compileResult = regcomp(&re_invalid,
-- "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)",
-+ "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)",
- REG_EXTENDED);
- if (compileResult != 0) {
- barf("Compiling re_invalid failed");
Index: security/hs-cryptohash-md5/Makefile
===================================================================
--- security/hs-cryptohash-md5/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= cryptohash-md5
-PORTVERSION= 0.11.100.1
-PORTREVISION= 1
-CATEGORIES= security haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A practical incremental and one-pass, pure API to the MD5 hash algorithm
-
-LICENSE= BSD3CLAUSE
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
Index: security/hs-cryptohash-md5/distinfo
===================================================================
--- security/hs-cryptohash-md5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499702500
-SHA256 (cabal/cryptohash-md5-0.11.100.1.tar.gz) = 710bd48770fa3e9a3b05428c6dc77fb72c91956d334a1eb89ded11bb843e18f9
-SIZE (cabal/cryptohash-md5-0.11.100.1.tar.gz) = 10472
Index: security/hs-cryptohash-md5/pkg-descr
===================================================================
--- security/hs-cryptohash-md5/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-A practical incremental and one-pass, pure API to the MD5 hash algorithm
-(including HMAC support) with performance close to the fastest implementations
-available in other languages.
-
-The implementation is made in C with a haskell FFI wrapper that hides the C
-implementation.
-
-NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
-package has been deprecated and so this package continues to satisfy the need
-for a lightweight package providing the MD5 hash algorithm without any
-dependencies on packages other than base and bytestring.
-
-Consequently, this package can be used as a drop-in replacement for cryptohash's
-Crypto.Hash.MD5 module, though with a clearly smaller footprint.
-
-WWW: http://hackage.haskell.org/package/cryptohash-md5
Index: security/hs-cryptohash-sha1/Makefile
===================================================================
--- security/hs-cryptohash-sha1/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= cryptohash-sha1
-PORTVERSION= 0.11.100.1
-PORTREVISION= 1
-CATEGORIES= security haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
-
-LICENSE= BSD3CLAUSE
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
Index: security/hs-cryptohash-sha1/distinfo
===================================================================
--- security/hs-cryptohash-sha1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499702505
-SHA256 (cabal/cryptohash-sha1-0.11.100.1.tar.gz) = 3c79af33542512442f8f87f6abb1faef7cd43bbfb2859260a33251d861eb0dab
-SIZE (cabal/cryptohash-sha1-0.11.100.1.tar.gz) = 10198
Index: security/hs-cryptohash-sha1/pkg-descr
===================================================================
--- security/hs-cryptohash-sha1/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
-(including HMAC support) with performance close to the fastest implementations
-available in other languages.
-
-The implementation is made in C with a haskell FFI wrapper that hides the C
-implementation.
-
-NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
-package has been deprecated and so this package continues to satisfy the need
-for a lightweight package providing the SHA1 hash algorithm without any
-dependencies on packages other than base and bytestring.
-
-Consequently, this package can be used as a drop-in replacement for cryptohash's
-Crypto.Hash.SHA1 module, though with a clearly smaller footprint.
-
-WWW: http://hackage.haskell.org/package/cryptohash-sha1
Index: security/hs-cryptohash-sha256/Makefile
===================================================================
--- security/hs-cryptohash-sha256/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= cryptohash-sha256
-PORTVERSION= 0.11.100.1
-PORTREVISION= 1
-CATEGORIES= security haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
-
-LICENSE= BSD3CLAUSE
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
Index: security/hs-cryptohash-sha256/distinfo
===================================================================
--- security/hs-cryptohash-sha256/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499788695
-SHA256 (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6
-SIZE (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 10885
Index: security/hs-cryptohash-sha256/pkg-descr
===================================================================
--- security/hs-cryptohash-sha256/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
-(including HMAC support) with performance close to the fastest implementations
-available in other languages.
-
-The implementation is made in C with a haskell FFI wrapper that hides the C
-implementation.
-
-NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
-package has been deprecated and so this package continues to satisfy the need for
-a lightweight package providing the SHA256 hash algorithm without any dependencies
-on packages other than base and bytestring.
-
-Consequently, this package can be used as a drop-in replacement for cryptohash's
-Crypto.Hash.SHA256 module, though with a clearly smaller footprint.
-
-WWW: http://hackage.haskell.org/package/cryptohash-sha256

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 7, 12:12 AM (2 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33789574
Default Alt Text
D15005.id41242.diff (28 KB)

Event Timeline