Index: archivers/hs-tar/Makefile =================================================================== --- archivers/hs-tar/Makefile +++ archivers/hs-tar/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= tar -PORTVERSION= 0.5.0.3 -PORTREVISION= 1 +PORTVERSION= 0.5.1.0 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org Index: archivers/hs-tar/distinfo =================================================================== --- archivers/hs-tar/distinfo +++ archivers/hs-tar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499611841 -SHA256 (cabal/tar-0.5.0.3.tar.gz) = d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3 -SIZE (cabal/tar-0.5.0.3.tar.gz) = 38764 +TIMESTAMP = 1523301281 +SHA256 (cabal/tar-0.5.1.0.tar.gz) = c89d697b6472b739db50e61201251fcaf8a8f5b595b1d9a488d395d7d5ce4b68 +SIZE (cabal/tar-0.5.1.0.tar.gz) = 39271 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-async/Makefile =================================================================== --- devel/hs-async/Makefile +++ devel/hs-async/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= async -PORTVERSION= 2.1.1.1 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.2 +USE_CABAL= stm>=2.2 hashable .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-async/distinfo =================================================================== --- devel/hs-async/distinfo +++ devel/hs-async/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444628 -SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2 -SIZE (cabal/async-2.1.1.1.tar.gz) = 10608 +TIMESTAMP = 1523292698 +SHA256 (cabal/async-2.2.1.tar.gz) = 8f0b86022a1319d3c1c68655790da4b7f98017982e27ec3f3dbfe01029d39027 +SIZE (cabal/async-2.2.1.tar.gz) = 12775 Index: devel/hs-basement/Makefile =================================================================== --- devel/hs-basement/Makefile +++ devel/hs-basement/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= primitive -PORTVERSION= 0.6.2.0 -PORTREVISION= 1 +PORTNAME= basement +PORTVERSION= 0.0.7 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Primitive memory-related operations +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-cabal-install/Makefile =================================================================== --- devel/hs-cabal-install/Makefile +++ devel/hs-cabal-install/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cabal-install -PORTVERSION= 1.24.0.2 -PORTREVISION= 1 +PORTVERSION= 2.2.0.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,9 +9,10 @@ LICENSE= BSD3CLAUSE -USE_CABAL= async base16-bytestring cryptohash-sha256 hackage-security \ - hashable HTTP mtl network network-uri old-time random stm \ - tar zlib +USE_CABAL= async base16-bytestring base64-bytestring \ + cryptohash-sha256 echo ed25519 edit-distance \ + hackage-security hashable HTTP mtl network network-uri \ + random resolv stm tar zlib STANDALONE= yes EXECUTABLE= cabal Index: devel/hs-cabal-install/distinfo =================================================================== --- devel/hs-cabal-install/distinfo +++ devel/hs-cabal-install/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499540276 -SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0 -SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937 +TIMESTAMP = 1523277454 +SHA256 (cabal/cabal-install-2.2.0.0.tar.gz) = c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9 +SIZE (cabal/cabal-install-2.2.0.0.tar.gz) = 662421 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 +++ devel/hs-deepseq-generics/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= deepseq-generics -PORTVERSION= 0.2.0.0 -PORTREVISION= 1 -CATEGORIES= devel haskell +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 +MAINTAINER= haskell@FreeBSD.org +COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-echo/Makefile =================================================================== --- devel/hs-echo/Makefile +++ devel/hs-echo/Makefile @@ -1,16 +1,13 @@ # $FreeBSD$ -PORTNAME= old-time -PORTVERSION= 1.1.0.3 -PORTREVISION= 2 +PORTNAME= echo +PORTVERSION= 0.1.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Time library +COMMENT= Cross-platform and cross-console library to handle echoing terminal input LICENSE= BSD3CLAUSE -USE_CABAL= old-locale>=1.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-echo/distinfo =================================================================== --- /dev/null +++ devel/hs-echo/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523290399 +SHA256 (cabal/echo-0.1.3.tar.gz) = 704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef +SIZE (cabal/echo-0.1.3.tar.gz) = 5373 Index: devel/hs-echo/files/patch-echo.cabal =================================================================== --- /dev/null +++ devel/hs-echo/files/patch-echo.cabal @@ -0,0 +1,11 @@ +--- echo.cabal.orig 2018-04-09 16:19:02 UTC ++++ echo.cabal +@@ -39,7 +39,7 @@ library + System.IO.Echo.Internal + + build-depends: base >= 4.3 && < 5 +- , process >= 1.0.1.1 && < 1.5 ++ , process >= 1.0.1.1 && < 1.7 + if os(windows) + cpp-options: "-DWINDOWS" + build-depends: mintty >= 0.1 && < 0.2 \ No newline at end of file Index: devel/hs-echo/pkg-descr =================================================================== --- /dev/null +++ devel/hs-echo/pkg-descr @@ -0,0 +1,6 @@ +The base Haskell library exposes the hGetEcho and hSetEcho functions for +querying and setting echo status, but unfortunately, neither function works +with MinTTY consoles on Windows. This library provides an alternative interface +which works with both MinTTY and other consoles. + +WWW: https://github.com/RyanGlScott/echo Index: devel/hs-exceptions/Makefile =================================================================== --- devel/hs-exceptions/Makefile +++ devel/hs-exceptions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= exceptions -PORTVERSION= 0.8.3 -PORTREVISION= 1 +PORTVERSION= 0.10.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-exceptions/distinfo =================================================================== --- devel/hs-exceptions/distinfo +++ devel/hs-exceptions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444351 -SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be -SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986 +TIMESTAMP = 1523386414 +SHA256 (cabal/exceptions-0.10.0.tar.gz) = 1edd912e5ea5cbda37941b06738597d35214dc247d332b1bfffc82adadfa49d7 +SIZE (cabal/exceptions-0.10.0.tar.gz) = 19460 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 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: devel/hs-hashable/Makefile =================================================================== --- devel/hs-hashable/Makefile +++ devel/hs-hashable/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hashable -PORTVERSION= 1.2.6.1 -PORTREVISION= 1 +PORTVERSION= 1.2.7.0 PORTEPOCH= 1 CATEGORIES= devel haskell @@ -11,8 +10,6 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.11.0.5 vector - FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41 FLAGS_DEFAULT= INTEGER_GMP SSE2 Index: devel/hs-hashable/distinfo =================================================================== --- devel/hs-hashable/distinfo +++ devel/hs-hashable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444230 -SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a -SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305 +TIMESTAMP = 1523295742 +SHA256 (cabal/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf +SIZE (cabal/hashable-1.2.7.0.tar.gz) = 30182 Index: devel/hs-hourglass/Makefile =================================================================== --- devel/hs-hourglass/Makefile +++ devel/hs-hourglass/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hourglass -PORTVERSION= 0.2.10 -PORTREVISION= 1 +PORTVERSION= 0.2.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hourglass/distinfo =================================================================== --- devel/hs-hourglass/distinfo +++ devel/hs-hourglass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627843 -SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80 -SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417 +TIMESTAMP = 1523386565 +SHA256 (cabal/hourglass-0.2.11.tar.gz) = 18a6bb303fc055275cca45aaffc17b6a04b2e9d7509aa5aa5bb9d9239f4e4f51 +SIZE (cabal/hourglass-0.2.11.tar.gz) = 25904 Index: devel/hs-memory/Makefile =================================================================== --- devel/hs-memory/Makefile +++ devel/hs-memory/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= memory -PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTVERSION= 0.14.16 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= foundation +USE_CABAL= basement foundation .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-memory/distinfo =================================================================== --- devel/hs-memory/distinfo +++ devel/hs-memory/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444278 -SHA256 (cabal/memory-0.14.6.tar.gz) = c7dec070174756f1753010585a6dcd4f958a4360634142c4e387b3475bffc160 -SIZE (cabal/memory-0.14.6.tar.gz) = 37020 +TIMESTAMP = 1523375674 +SHA256 (cabal/memory-0.14.16.tar.gz) = 7bb0834ab28ce1248f3be09df211d49d20d703cdcda3ed16cde99356e2d72b0f +SIZE (cabal/memory-0.14.16.tar.gz) = 42207 Index: devel/hs-old-locale/Makefile =================================================================== --- devel/hs-old-locale/Makefile +++ devel/hs-old-locale/Makefile @@ -2,7 +2,7 @@ PORTNAME= old-locale PORTVERSION= 1.0.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-old-locale/files/patch-git_15fea2d =================================================================== --- devel/hs-old-locale/files/patch-git_15fea2d +++ devel/hs-old-locale/files/patch-git_15fea2d @@ -16,6 +16,6 @@ System.Locale - build-depends: base >= 4.2 && < 4.9 -+ build-depends: base >= 4.2 && < 4.11 ++ build-depends: base >= 4.2 && < 4.12 ghc-options: -Wall Index: devel/hs-old-time/Makefile =================================================================== --- devel/hs-old-time/Makefile +++ devel/hs-old-time/Makefile @@ -2,7 +2,7 @@ PORTNAME= old-time PORTVERSION= 1.1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-old-time/files/patch-git_82790af =================================================================== --- devel/hs-old-time/files/patch-git_82790af +++ devel/hs-old-time/files/patch-git_82790af @@ -16,7 +16,7 @@ build-depends: - base >= 4.7 && < 4.9, -+ base >= 4.7 && < 4.11, ++ base >= 4.7 && < 4.12, old-locale == 1.0.* ghc-options: -Wall Index: devel/hs-parallel/files/patch-parallel.cabal =================================================================== --- /dev/null +++ devel/hs-parallel/files/patch-parallel.cabal @@ -0,0 +1,10 @@ +--- parallel.cabal.orig 2018-04-10 09:45:32 UTC ++++ parallel.cabal +@@ -34,7 +34,7 @@ library + + build-depends: + array >= 0.3 && < 0.6, +- base >= 4.3 && < 4.11, ++ base >= 4.3 && < 4.12, + containers >= 0.4 && < 0.6, + deepseq >= 1.1 && < 1.5 Index: devel/hs-primitive/Makefile =================================================================== --- devel/hs-primitive/Makefile +++ devel/hs-primitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= primitive -PORTVERSION= 0.6.2.0 -PORTREVISION= 1 +PORTVERSION= 0.6.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-primitive/distinfo =================================================================== --- devel/hs-primitive/distinfo +++ devel/hs-primitive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444407 -SHA256 (cabal/primitive-0.6.2.0.tar.gz) = b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1 -SIZE (cabal/primitive-0.6.2.0.tar.gz) = 23954 +TIMESTAMP = 1523292481 +SHA256 (cabal/primitive-0.6.3.0.tar.gz) = cddeff804e0f577f1be0179d5d145dfc170f8bfb66f663b9fba67104a45d9555 +SIZE (cabal/primitive-0.6.3.0.tar.gz) = 25336 Index: devel/hs-stm/Makefile =================================================================== --- devel/hs-stm/Makefile +++ devel/hs-stm/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= stm -PORTVERSION= 2.4.4.1 -PORTREVISION= 1 +PORTVERSION= 2.4.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-stm/distinfo =================================================================== --- devel/hs-stm/distinfo +++ devel/hs-stm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498678463 -SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384 -SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367 +TIMESTAMP = 1523299289 +SHA256 (cabal/stm-2.4.5.0.tar.gz) = 31d7db183f13beed5c71409d12747a7f4cf3e145630553dc86336208540859a7 +SIZE (cabal/stm-2.4.5.0.tar.gz) = 11521 Index: devel/hs-text-icu/Makefile =================================================================== --- devel/hs-text-icu/Makefile +++ devel/hs-text-icu/Makefile @@ -2,7 +2,7 @@ PORTNAME= text-icu PORTVERSION= 0.7.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,6 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.9.1.0 - LIB_DEPENDS+= libicui18n.so:devel/icu .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-text/Makefile =================================================================== --- devel/hs-text/Makefile +++ devel/hs-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= text -PORTVERSION= 1.2.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-text/distinfo =================================================================== --- devel/hs-text/distinfo +++ devel/hs-text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546607 -SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9 -SIZE (cabal/text-1.2.2.2.tar.gz) = 151048 +TIMESTAMP = 1523291352 +SHA256 (cabal/text-1.2.3.0.tar.gz) = 20e0b1627f613b32cc7f2d2e8dcc48a4a61938b24f3d14fb77cee694f0c9311a +SIZE (cabal/text-1.2.3.0.tar.gz) = 155635 Index: devel/hs-unordered-containers/Makefile =================================================================== --- devel/hs-unordered-containers/Makefile +++ devel/hs-unordered-containers/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= unordered-containers -PORTVERSION= 0.2.8.0 -PORTREVISION= 1 +PORTVERSION= 0.2.9.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-unordered-containers/distinfo =================================================================== --- devel/hs-unordered-containers/distinfo +++ devel/hs-unordered-containers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499596921 -SHA256 (cabal/unordered-containers-0.2.8.0.tar.gz) = a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8 -SIZE (cabal/unordered-containers-0.2.8.0.tar.gz) = 31824 +TIMESTAMP = 1523375916 +SHA256 (cabal/unordered-containers-0.2.9.0.tar.gz) = 6730cb5c4a3e953e2c199d6425be08fd088ff0089a3e140d63226c052e318250 +SIZE (cabal/unordered-containers-0.2.9.0.tar.gz) = 33098 Index: devel/hs-vector/files/patch-vector.cabal =================================================================== --- /dev/null +++ devel/hs-vector/files/patch-vector.cabal @@ -0,0 +1,11 @@ +--- vector.cabal.orig 2018-04-09 18:20:35 UTC ++++ vector.cabal +@@ -144,7 +144,7 @@ Library + Install-Includes: + vector.h + +- Build-Depends: base >= 4.5 && < 4.10 ++ Build-Depends: base >= 4.5 && < 4.12 + , primitive >= 0.5.0.1 && < 0.7 + , ghc-prim >= 0.2 && < 0.6 + , deepseq >= 1.1 && < 1.5 \ No newline at end of file Index: graphics/hs-dia-base/Makefile =================================================================== --- graphics/hs-dia-base/Makefile +++ graphics/hs-dia-base/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= dia-base -PORTVERSION= 0.1.1.4 -PORTREVISION= 1 -CATEGORIES= graphics haskell +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 +MAINTAINER= haskell@FreeBSD.org +COMMENT= EDSL for teaching Haskell with diagrams - data types -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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 .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 @@ -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 @@ -210,6 +211,7 @@ DRBG_port?= security/hs-DRBG ed25519_port?= security/hs-ed25519 easy-file_port?= devel/hs-easy-file +echo_port?= devel/hs-echo EdisonAPI_port?= devel/hs-EdisonAPI EdisonCore_port?= devel/hs-EdisonCore edit-distance_port?= devel/hs-edit-distance @@ -453,6 +455,7 @@ regex-pcre-builtin_port?= textproc/hs-regex-pcre-builtin # lib_depends regex-posix_port?= textproc/hs-regex-posix regex-tdfa_port?= textproc/hs-regex-tdfa +resolv_port?= net/hs-resolv resource-pool_port?= devel/hs-resource-pool resourcet_port?= devel/hs-resourcet rfc5051_port?= textproc/hs-rfc5051 Index: lang/ghc/bsd.cabal.options.mk =================================================================== --- lang/ghc/bsd.cabal.options.mk +++ lang/ghc/bsd.cabal.options.mk @@ -18,9 +18,9 @@ HADDOCK_CMD?= ${LOCALBASE}/bin/haddock HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour -GHC_VERSION?= 8.0.2 +GHC_VERSION?= 8.4.1 -HSCOLOUR_VERSION= 1.24.1 +HSCOLOUR_VERSION= 1.24.4 HSCOLOUR_DESC?= Colorize generated documentation by HsColour DYNAMIC_DESC?= Add support for dynamic linking 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: net/hs-network-uri/Makefile =================================================================== --- net/hs-network-uri/Makefile +++ net/hs-network-uri/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-uri PORTVERSION= 2.6.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: net/hs-resolv/Makefile =================================================================== --- /dev/null +++ net/hs-resolv/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= resolv +PORTVERSION= 0.1.1.1 +CATEGORIES= net haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Domain Name Service (DNS) lookup via the libresolv standard library routines + +LICENSE= GPLv3 + +USE_CABAL= base16-bytestring + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include Index: net/hs-resolv/distinfo =================================================================== --- /dev/null +++ net/hs-resolv/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523298714 +SHA256 (cabal/resolv-0.1.1.1.tar.gz) = 49b12ed2b175cca3f885c06ca6906cde1245c02b6f98f2a95fc20d6a8ae40772 +SIZE (cabal/resolv-0.1.1.1.tar.gz) = 149436 Index: net/hs-resolv/files/patch-resolv.cabal =================================================================== --- /dev/null +++ net/hs-resolv/files/patch-resolv.cabal @@ -0,0 +1,11 @@ +--- resolv.cabal.orig 2018-04-09 19:24:44 UTC ++++ resolv.cabal +@@ -78,7 +78,7 @@ library + Network.DNS.FFI + Compat + +- build-depends: base >= 4.5 && <4.11 ++ build-depends: base >= 4.5 && <4.12 + , base16-bytestring == 0.1.* + , binary >= 0.7.3 && < 0.9 + , bytestring >= 0.9.2 && < 0.11 \ No newline at end of file Index: net/hs-resolv/pkg-descr =================================================================== --- /dev/null +++ net/hs-resolv/pkg-descr @@ -0,0 +1,5 @@ +This package implements an API for accessing the Domain Name Service (DNS) +resolver service via the standard libresolv system library (whose API is +often available directly via the standard libc C library) on Unix systems. + +WWW: https://github.com/hvr/resolv Index: security/hs-cryptohash-md5/Makefile =================================================================== --- security/hs-cryptohash-md5/Makefile +++ security/hs-cryptohash-md5/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= cryptohash-md5 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 -CATEGORIES= security haskell +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 +MAINTAINER= haskell@FreeBSD.org +COMMENT= A practical incremental and one-pass, pure API to the MD5 hash algorithm -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-cryptohash-sha1/Makefile =================================================================== --- security/hs-cryptohash-sha1/Makefile +++ security/hs-cryptohash-sha1/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTNAME= cryptohash-sha1 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 -CATEGORIES= security haskell +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 +MAINTAINER= haskell@FreeBSD.org +COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-cryptohash-sha256/Makefile =================================================================== --- security/hs-cryptohash-sha256/Makefile +++ security/hs-cryptohash-sha256/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ -PORTNAME= cryptohash-sha256 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 -CATEGORIES= security haskell +PORTNAME= cryptohash-sha256 +PORTVERSION= 0.11.101.0 +CATEGORIES= security haskell -MAINTAINER= haskell@FreeBSD.org -COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm +MAINTAINER= haskell@FreeBSD.org +COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm -LICENSE= BSD3CLAUSE +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-cryptohash-sha256/distinfo =================================================================== --- security/hs-cryptohash-sha256/distinfo +++ security/hs-cryptohash-sha256/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499788695 -SHA256 (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6 -SIZE (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 10885 +TIMESTAMP = 1523276193 +SHA256 (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd +SIZE (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 14996 Index: security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal =================================================================== --- /dev/null +++ security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal @@ -0,0 +1,11 @@ +--- cryptohash-sha256.cabal.orig 2018-04-09 12:20:11 UTC ++++ cryptohash-sha256.cabal +@@ -74,7 +74,7 @@ library + Trustworthy + Unsafe + +- build-depends: base >= 4.5 && < 4.11 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + ghc-options: -Wall \ No newline at end of file Index: security/hs-cryptohash-sha256/pkg-descr =================================================================== --- security/hs-cryptohash-sha256/pkg-descr +++ security/hs-cryptohash-sha256/pkg-descr @@ -13,4 +13,4 @@ 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 +WWW: http://hackage.haskell.org/package/cryptohash-sha256 \ No newline at end of file Index: security/hs-hackage-security/Makefile =================================================================== --- security/hs-hackage-security/Makefile +++ security/hs-hackage-security/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hackage-security -PORTVERSION= 0.5.2.2 -PORTREVISION= 1 +PORTVERSION= 0.5.3.0 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= base16-bytestring base64-bytestring cryptohash-sha256 ed25519 \ - mtl network network-uri old-locale old-time parsec tar zlib + mtl network network-uri old-locale old-time tar zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-hackage-security/distinfo =================================================================== --- security/hs-hackage-security/distinfo +++ security/hs-hackage-security/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499790857 -SHA256 (cabal/hackage-security-0.5.2.2.tar.gz) = 507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41 -SIZE (cabal/hackage-security-0.5.2.2.tar.gz) = 83131 +TIMESTAMP = 1523300294 +SHA256 (cabal/hackage-security-0.5.3.0.tar.gz) = db986e17e9265aa9e40901690815b890b97d53159eb24d0a6cafaa7c18577c21 +SIZE (cabal/hackage-security-0.5.3.0.tar.gz) = 87119 Index: security/hs-hackage-security/files/patch-hackage-security.cabal =================================================================== --- security/hs-hackage-security/files/patch-hackage-security.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- hackage-security.cabal.orig 2016-08-28 22:57:40 UTC -+++ hackage-security.cabal -@@ -101,7 +101,6 @@ library - bytestring >= 0.9 && < 0.11, - Cabal >= 1.14 && < 1.26, - containers >= 0.4 && < 0.6, -- directory >= 1.1.0.2 && < 1.3, - ed25519 >= 0.0 && < 0.1, - filepath >= 1.2 && < 1.5, - mtl >= 2.2 && < 2.3, Index: textproc/hs-parsec/Makefile =================================================================== --- textproc/hs-parsec/Makefile +++ textproc/hs-parsec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= parsec -PORTVERSION= 3.1.11 -PORTREVISION= 1 +PORTVERSION= 3.1.13.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-parsec/distinfo =================================================================== --- textproc/hs-parsec/distinfo +++ textproc/hs-parsec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499618976 -SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e -SIZE (cabal/parsec-3.1.11.tar.gz) = 32412 +TIMESTAMP = 1523296094 +SHA256 (cabal/parsec-3.1.13.0.tar.gz) = 7861ae437a6177ee7c08899432fd8c062e7c110361da48a9f9e88263fd4d80f1 +SIZE (cabal/parsec-3.1.13.0.tar.gz) = 35207 Index: textproc/hs-xml/Makefile =================================================================== --- textproc/hs-xml/Makefile +++ textproc/hs-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= xml PORTVERSION= 1.3.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-HTTP/Makefile =================================================================== --- www/hs-HTTP/Makefile +++ www/hs-HTTP/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= HTTP -PORTVERSION= 4000.3.7 -PORTREVISION= 1 +PORTVERSION= 4000.3.11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \ - parsec>=2.0 +USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 FLAGS_ENABLE= network-uri FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests Index: www/hs-HTTP/distinfo =================================================================== --- www/hs-HTTP/distinfo +++ www/hs-HTTP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538127 -SHA256 (cabal/HTTP-4000.3.7.tar.gz) = d5c0cceb84e84434e851e97b3c2fce4b3e600d0410e7ac4427df44c541adeae8 -SIZE (cabal/HTTP-4000.3.7.tar.gz) = 71709 +TIMESTAMP = 1523302416 +SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645 +SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747