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: archivers/hs-zip-archive/Makefile =================================================================== --- archivers/hs-zip-archive/Makefile +++ archivers/hs-zip-archive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= zip-archive -PORTVERSION= 0.3.1.1 -PORTREVISION= 1 +PORTVERSION= 0.3.2.4 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= digest>=0.0.0.1 mtl old-time text>=0.11 zlib +USE_CABAL= digest>=0.0.0.1 mtl old-time zlib FLAGS_DEFINE= EXECUTABLE Index: archivers/hs-zip-archive/distinfo =================================================================== --- archivers/hs-zip-archive/distinfo +++ archivers/hs-zip-archive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499611845 -SHA256 (cabal/zip-archive-0.3.1.1.tar.gz) = 9e868e649e6fd06cf50c2f0f1e480ce36640494449e415abf2509f9347f08325 -SIZE (cabal/zip-archive-0.3.1.1.tar.gz) = 16107 +TIMESTAMP = 1523638345 +SHA256 (cabal/zip-archive-0.3.2.4.tar.gz) = 20612ed34d8d14deef120440c75f951a5c92c9f39f0de1b82ebac6d5923b3785 +SIZE (cabal/zip-archive-0.3.2.4.tar.gz) = 18370 Index: audio/hs-libmpd/Makefile =================================================================== --- audio/hs-libmpd/Makefile +++ audio/hs-libmpd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libmpd -PORTVERSION= 0.9.0.6 -PORTREVISION= 1 +PORTVERSION= 0.9.0.8 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10.1 data-default-class>=0.0.1 mtl>=2.0 \ - network>=2.1 old-locale>=1.0 text>=0.11 utf8-string>=0.3.1 + network>=2.1 old-locale>=1.0 utf8-string>=0.3.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: audio/hs-libmpd/distinfo =================================================================== --- audio/hs-libmpd/distinfo +++ audio/hs-libmpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538914 -SHA256 (cabal/libmpd-0.9.0.6.tar.gz) = bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937 -SIZE (cabal/libmpd-0.9.0.6.tar.gz) = 38707 +TIMESTAMP = 1524150587 +SHA256 (cabal/libmpd-0.9.0.8.tar.gz) = 582b0a405e39148d3a5046e8ad00c9e217688e60c70393eb36cd651e1991ed4e +SIZE (cabal/libmpd-0.9.0.8.tar.gz) = 38932 Index: benchmarks/hs-criterion/Makefile =================================================================== --- benchmarks/hs-criterion/Makefile +++ benchmarks/hs-criterion/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= criterion -PORTVERSION= 1.2.1.0 -PORTREVISION= 1 +PORTVERSION= 1.4.1.0 CATEGORIES= benchmarks haskell MAINTAINER= haskell@FreeBSD.org @@ -11,10 +10,10 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson ansi-wl-pprint base-compat cassava code-page \ - exceptions Glob js-flot js-jquery microstache mtl mwc-random \ - optparse-applicative parsec statistics text transformers-compat \ - vector vector-algorithms +USE_CABAL= aeson ansi-wl-pprint base-compat base-compat-batteries \ + cassava code-page exceptions Glob js-flot js-jquery \ + microstache mtl mwc-random optparse-applicative statistics \ + transformers-compat vector vector-algorithms INSTALL_PORTEXAMPLES= \ cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} Index: benchmarks/hs-criterion/distinfo =================================================================== --- benchmarks/hs-criterion/distinfo +++ benchmarks/hs-criterion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499613825 -SHA256 (cabal/criterion-1.2.1.0.tar.gz) = d9f4bb88a8762f91ce305896cd7e964d25f007949f7e05514503eec59ca97041 -SIZE (cabal/criterion-1.2.1.0.tar.gz) = 126663 +TIMESTAMP = 1525009665 +SHA256 (cabal/criterion-1.4.1.0.tar.gz) = c49306676aa7927c3ca3c1807b081d1e86771eb8da99c8391f9c4dacb24a826c +SIZE (cabal/criterion-1.4.1.0.tar.gz) = 130976 Index: converters/hs-aeson-compat/Makefile =================================================================== --- converters/hs-aeson-compat/Makefile +++ converters/hs-aeson-compat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson-compat -PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTVERSION= 0.3.7.1 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson attoparsec attoparsec-iso8601 base-compat exceptions \ - hashable scientific semigroups tagged text time-locale-compat \ + hashable scientific semigroups tagged time-locale-compat \ unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: converters/hs-aeson-compat/distinfo =================================================================== --- converters/hs-aeson-compat/distinfo +++ converters/hs-aeson-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499691052 -SHA256 (cabal/aeson-compat-0.3.7.tar.gz) = 1bf2c2a3d38caba5d3336757f60702afb5dcac6a77aa3d86c9d55f81e4517c14 -SIZE (cabal/aeson-compat-0.3.7.tar.gz) = 6900 +TIMESTAMP = 1524342688 +SHA256 (cabal/aeson-compat-0.3.7.1.tar.gz) = 59740dc1e37b08e60abb47f38b87de5b9805611a1b468cd18294d5982a1dcacb +SIZE (cabal/aeson-compat-0.3.7.1.tar.gz) = 6913 Index: converters/hs-aeson-compat/files/patch-aeson-compat.cabal =================================================================== --- converters/hs-aeson-compat/files/patch-aeson-compat.cabal +++ converters/hs-aeson-compat/files/patch-aeson-compat.cabal @@ -1,18 +1,21 @@ ---- aeson-compat.cabal.orig 2017-06-07 12:52:36 UTC +--- aeson-compat.cabal.orig 2017-07-24 12:29:50 UTC +++ aeson-compat.cabal -@@ -42,7 +42,6 @@ library +@@ -31,14 +31,14 @@ library + src + ghc-options: -Wall + build-depends: +- base >=4.6 && <4.11 +- , base-compat >=0.6.0 && <0.10 +- , aeson >=0.7.0.6 && <1.3 ++ base >=4.6 && <4.12 ++ , base-compat >=0.6.0 && <0.11 ++ , aeson >=0.7.0.6 && <1.4 + , attoparsec >=0.12 && <0.14 + , attoparsec-iso8601 >=1.0.0.0 && <1.1 + , bytestring >=0.10 && <0.11 , containers >=0.5 && <0.6 - , exceptions >=0.8 && <0.9 +- , exceptions >=0.8 && <0.9 ++ , exceptions >=0.8 && <0.11 , hashable >=1.2 && <1.3 -- , nats >=1 && <1.2 , scientific >=0.3 && <0.4 - , text >=1.2 && <1.3 - , time >=1.4.2 && <1.9 -@@ -70,7 +69,6 @@ test-suite aeson-compat-test - , containers - , exceptions - , hashable -- , nats - , scientific - , text - , time + , text >=1.2 && <1.3 \ No newline at end of file Index: converters/hs-aeson-pretty/Makefile =================================================================== --- converters/hs-aeson-pretty/Makefile +++ converters/hs-aeson-pretty/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson-pretty -PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec base-compat cmdargs scientific text \ +USE_CABAL= aeson attoparsec base-compat cmdargs scientific \ unordered-containers vector FLAGS_DISABLE= lib-only Index: converters/hs-aeson-pretty/distinfo =================================================================== --- converters/hs-aeson-pretty/distinfo +++ converters/hs-aeson-pretty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499545723 -SHA256 (cabal/aeson-pretty-0.8.5.tar.gz) = dd17e86c64b3fe2efb7a855b27b0e5490e42dc58194ae1809d8b662d4e42a9f9 -SIZE (cabal/aeson-pretty-0.8.5.tar.gz) = 5568 +TIMESTAMP = 1524342480 +SHA256 (cabal/aeson-pretty-0.8.7.tar.gz) = c1c1ecc5e3abd004a6c4c256ee6f61da2a43d7f1452ffa391dee250df43b27d5 +SIZE (cabal/aeson-pretty-0.8.7.tar.gz) = 5610 Index: converters/hs-aeson/Makefile =================================================================== --- converters/hs-aeson/Makefile +++ converters/hs-aeson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aeson -PORTVERSION= 1.2.1.0 -PORTREVISION= 1 +PORTVERSION= 1.3.1.0 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.13.0.1 base-compat>=0.9.1 dlist>=0.6 hashable>=1.1.2.0 \ - scientific>=0.3.1 syb tagged text>=1.1.1.0 time-locale-compat>=0.1.1 \ + scientific>=0.3.1 tagged th-abstraction time-locale-compat>=0.1.1 \ unordered-containers>=0.2.3.0 uuid-types>=1.0.3 vector>=0.8 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: converters/hs-aeson/distinfo =================================================================== --- converters/hs-aeson/distinfo +++ converters/hs-aeson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499459814 -SHA256 (cabal/aeson-1.2.1.0.tar.gz) = 96170fdbed9bf52357bd6eada0173c4ae8086df01522ed2b8a070f2f51148a73 -SIZE (cabal/aeson-1.2.1.0.tar.gz) = 272206 +TIMESTAMP = 1523782803 +SHA256 (cabal/aeson-1.3.1.0.tar.gz) = 3977f17b1588bd530755e3517d272024229e72d8a110f15b5b78fc15df6c5652 +SIZE (cabal/aeson-1.3.1.0.tar.gz) = 261732 Index: converters/hs-json/Makefile =================================================================== --- converters/hs-json/Makefile +++ converters/hs-json/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= json -PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTVERSION= 0.9.2 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl parsec syb text +USE_CABAL= mtl syb .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: converters/hs-json/distinfo =================================================================== --- converters/hs-json/distinfo +++ converters/hs-json/distinfo @@ -1,2 +1,3 @@ -SHA256 (cabal/json-0.9.1.tar.gz) = 96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2 -SIZE (cabal/json-0.9.1.tar.gz) = 22568 +TIMESTAMP = 1523994029 +SHA256 (cabal/json-0.9.2.tar.gz) = e6bb16fa791cc3833ae7b459b7e7885c1c2b11b0d294b7e095287c54fa73738e +SIZE (cabal/json-0.9.2.tar.gz) = 22650 Index: converters/hs-sandi/Makefile =================================================================== --- converters/hs-sandi/Makefile +++ converters/hs-sandi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sandi -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org Index: converters/hs-sandi/distinfo =================================================================== --- converters/hs-sandi/distinfo +++ converters/hs-sandi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499619802 -SHA256 (cabal/sandi-0.4.0.tar.gz) = 40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea -SIZE (cabal/sandi-0.4.0.tar.gz) = 19319 +TIMESTAMP = 1524431120 +SHA256 (cabal/sandi-0.4.2.tar.gz) = 2bc1fc4f8e71009adc9f38304f63684f2795c31077670214147f261bd2bc7337 +SIZE (cabal/sandi-0.4.2.tar.gz) = 19198 Index: databases/hs-esqueleto/Makefile =================================================================== --- databases/hs-esqueleto/Makefile +++ databases/hs-esqueleto/Makefile @@ -2,7 +2,7 @@ PORTNAME= esqueleto PORTVERSION= 2.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,9 @@ LICENSE= BSD3CLAUSE USE_CABAL= blaze-html conduit monad-logger persistent \ - resourcet tagged text unordered-containers + resourcet tagged unordered-containers + +IGNORE= Doesn't build with recent Persistent .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: databases/hs-hedis/Makefile =================================================================== --- databases/hs-hedis/Makefile +++ databases/hs-hedis/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hedis -PORTVERSION= 0.9.8 +PORTVERSION= 0.10.1 PORTREVISION= 1 CATEGORIES= databases haskell @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= async bytestring-lexing mtl network resource-pool scanner stm \ - text unordered-containers vector +USE_CABAL= async bytestring-lexing errors HTTP mtl network network-uri \ + resource-pool scanner unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: databases/hs-hedis/distinfo =================================================================== --- databases/hs-hedis/distinfo +++ databases/hs-hedis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499619995 -SHA256 (cabal/hedis-0.9.8.tar.gz) = 822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62 -SIZE (cabal/hedis-0.9.8.tar.gz) = 40058 +TIMESTAMP = 1524158122 +SHA256 (cabal/hedis-0.10.1.tar.gz) = 56afcf52d8b32f23a79de7c50bcaf309f0dfd610cceacb6174dfdce0c051f5f7 +SIZE (cabal/hedis-0.10.1.tar.gz) = 42203 Index: databases/hs-mysql/Makefile =================================================================== --- databases/hs-mysql/Makefile +++ databases/hs-mysql/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTVERSION= 0.1.5 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_MYSQL= yes +USES= mysql ssl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: databases/hs-mysql/distinfo =================================================================== --- databases/hs-mysql/distinfo +++ databases/hs-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450806 -SHA256 (cabal/mysql-0.1.4.tar.gz) = 9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e -SIZE (cabal/mysql-0.1.4.tar.gz) = 16219 +TIMESTAMP = 1524151121 +SHA256 (cabal/mysql-0.1.5.tar.gz) = 49b367d07f6d93fd4cbd08390f83bbf8e40c66156a1d2b0f570b68921e6f3075 +SIZE (cabal/mysql-0.1.5.tar.gz) = 16389 Index: databases/hs-persistent-sqlite/Makefile =================================================================== --- databases/hs-persistent-sqlite/Makefile +++ databases/hs-persistent-sqlite/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent-sqlite -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.1.2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= aeson conduit microlens-th monad-control monad-logger \ - old-locale persistent resource-pool resourcet text \ + old-locale persistent resource-pool resourcet \ unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: databases/hs-persistent-sqlite/distinfo =================================================================== --- databases/hs-persistent-sqlite/distinfo +++ databases/hs-persistent-sqlite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620122 -SHA256 (cabal/persistent-sqlite-2.6.2.tar.gz) = 6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf -SIZE (cabal/persistent-sqlite-2.6.2.tar.gz) = 3568400 +TIMESTAMP = 1525169028 +SHA256 (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2f7157f3830370f60c7c36490ea49b7c52caf0f2a7349f86cf47970189f9ad0c +SIZE (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2044695 Index: databases/hs-persistent-template/Makefile =================================================================== --- databases/hs-persistent-template/Makefile +++ databases/hs-persistent-template/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent-template -PORTVERSION= 2.5.2 -PORTREVISION= 1 +PORTVERSION= 2.5.4 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= aeson aeson-compat http-api-data monad-control monad-logger \ - path-pieces persistent tagged text unordered-containers + path-pieces persistent tagged unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: databases/hs-persistent-template/distinfo =================================================================== --- databases/hs-persistent-template/distinfo +++ databases/hs-persistent-template/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620138 -SHA256 (cabal/persistent-template-2.5.2.tar.gz) = de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011 -SIZE (cabal/persistent-template-2.5.2.tar.gz) = 20403 +TIMESTAMP = 1525178560 +SHA256 (cabal/persistent-template-2.5.4.tar.gz) = 4cae740ce92f98cb3ae9e092e740753394d5687b887399ee5f87af7f3c730a01 +SIZE (cabal/persistent-template-2.5.4.tar.gz) = 21079 Index: databases/hs-persistent-template/files/patch-persistent-template.cabal =================================================================== --- databases/hs-persistent-template/files/patch-persistent-template.cabal +++ databases/hs-persistent-template/files/patch-persistent-template.cabal @@ -1,11 +1,11 @@ ---- persistent-template.cabal.orig 2017-07-10 13:31:32 UTC +--- persistent-template.cabal.orig 2018-05-01 13:03:22 UTC +++ persistent-template.cabal @@ -23,7 +23,7 @@ library , text >= 0.5 , transformers >= 0.2 && < 0.6 , containers -- , aeson >= 0.7 && < 1.2 -+ , aeson >= 0.7 && < 1.3 +- , aeson >= 0.7 && < 1.3 ++ , aeson >= 0.7 && < 1.4 , aeson-compat >= 0.3.2.0 && < 0.4 , monad-logger - , unordered-containers + , unordered-containers \ No newline at end of file Index: databases/hs-persistent/Makefile =================================================================== --- databases/hs-persistent/Makefile +++ databases/hs-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.8.2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org @@ -12,10 +11,10 @@ USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \ blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \ - fast-logger>=2.1 http-api-data lifted-base>=0.1 monad-control>=0.3 \ - monad-logger>=0.3 mtl old-locale path-pieces>=0.1 resource-pool \ - resourcet>=1.1 scientific silently tagged text>=0.8 \ - transformers-base unordered-containers vector + fast-logger>=2.1 haskell-src-meta http-api-data lifted-base \ + monad-control>=0.3 monad-logger>=0.3 mtl old-locale \ + path-pieces>=0.1 resource-pool resourcet>=1.1 scientific \ + silently tagged transformers-base unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: databases/hs-persistent/distinfo =================================================================== --- databases/hs-persistent/distinfo +++ databases/hs-persistent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620101 -SHA256 (cabal/persistent-2.7.0.tar.gz) = cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea -SIZE (cabal/persistent-2.7.0.tar.gz) = 69320 +TIMESTAMP = 1524929752 +SHA256 (cabal/persistent-2.8.2.tar.gz) = 696bb279259e307778dc7fbd49565c48a66429f14e793a41a13cfae0968c1ec0 +SIZE (cabal/persistent-2.8.2.tar.gz) = 58648 Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -913,11 +913,9 @@ SUBDIR += horde-whups SUBDIR += hp48cc SUBDIR += hp48xgcc - SUBDIR += hs-BNFC SUBDIR += hs-Boolean SUBDIR += hs-BoundedChan SUBDIR += hs-ConfigFile - SUBDIR += hs-DrIFT SUBDIR += hs-EdisonAPI SUBDIR += hs-EdisonCore SUBDIR += hs-Glob @@ -954,10 +952,12 @@ SUBDIR += hs-atomic-primops SUBDIR += hs-auto-update SUBDIR += hs-base-compat + SUBDIR += hs-base-compat-batteries SUBDIR += hs-base-orphans SUBDIR += hs-base-unicode-symbols SUBDIR += hs-base16-bytestring SUBDIR += hs-base64-bytestring + SUBDIR += hs-basement SUBDIR += hs-basic-prelude SUBDIR += hs-bifunctors SUBDIR += hs-bits-atomic @@ -1012,6 +1012,7 @@ SUBDIR += hs-dlist SUBDIR += hs-dlist-instances SUBDIR += hs-easy-file + SUBDIR += hs-echo SUBDIR += hs-edit-distance SUBDIR += hs-either SUBDIR += hs-enclosed-exceptions @@ -1051,8 +1052,8 @@ SUBDIR += hs-haskell-lexer SUBDIR += hs-haskell-src SUBDIR += hs-haskell-src-exts + SUBDIR += hs-haskell-src-meta SUBDIR += hs-hasktags - SUBDIR += hs-hastache SUBDIR += hs-hex SUBDIR += hs-hinotify SUBDIR += hs-hint @@ -1063,6 +1064,7 @@ SUBDIR += hs-hsb2hs SUBDIR += hs-hslogger SUBDIR += hs-hslua + SUBDIR += hs-hslua-module-text SUBDIR += hs-hspec SUBDIR += hs-hspec-core SUBDIR += hs-hspec-discover @@ -1094,7 +1096,6 @@ SUBDIR += hs-monad-par SUBDIR += hs-monad-par-extras SUBDIR += hs-monad-unlift - SUBDIR += hs-monadplus SUBDIR += hs-monads-tf SUBDIR += hs-mono-traversable SUBDIR += hs-mono-traversable-instances @@ -1139,8 +1140,9 @@ SUBDIR += hs-simple-reflect SUBDIR += hs-smallcheck SUBDIR += hs-split - SUBDIR += hs-stm SUBDIR += hs-stm-chans + SUBDIR += hs-storable-record + SUBDIR += hs-storable-tuple SUBDIR += hs-streaming-commons SUBDIR += hs-strict SUBDIR += hs-syb @@ -1153,13 +1155,15 @@ SUBDIR += hs-test-framework SUBDIR += hs-test-framework-hunit SUBDIR += hs-test-framework-quickcheck2 - SUBDIR += hs-text SUBDIR += hs-text-icu SUBDIR += hs-text-short SUBDIR += hs-tf-random SUBDIR += hs-th-abstraction + SUBDIR += hs-th-expand-syns SUBDIR += hs-th-lift SUBDIR += hs-th-lift-instances + SUBDIR += hs-th-orphans + SUBDIR += hs-th-reify-many SUBDIR += hs-threads SUBDIR += hs-threadscope SUBDIR += hs-time-compat @@ -1174,6 +1178,9 @@ SUBDIR += hs-uniplate SUBDIR += hs-unix-compat SUBDIR += hs-unix-time + SUBDIR += hs-unliftio + SUBDIR += hs-unliftio-core + SUBDIR += hs-unicode-show SUBDIR += hs-unordered-containers SUBDIR += hs-utf8-light SUBDIR += hs-utf8-string Index: devel/hs-BNFC/Makefile =================================================================== --- devel/hs-BNFC/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Kai Wang -# $FreeBSD$ - -PORTNAME= BNFC -PORTVERSION= 2.8.1 -PORTREVISION= 1 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Compiler front-end generator - -LICENSE= GPLv2 - -USE_CABAL= mtl -USE_ALEX= yes -USE_HAPPY= yes - -EXECUTABLE= bnfc - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: devel/hs-BNFC/distinfo =================================================================== --- devel/hs-BNFC/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627811 -SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920 -SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015 Index: devel/hs-BNFC/pkg-descr =================================================================== --- devel/hs-BNFC/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -The BNF Converter is a compiler construction tool generating a compiler -front-end from a Labelled BNF grammar. It was originally written to generate -Haskell, but starting from Version 2.0, it can also be used for generating -Java, C++, and C. Given a Labelled BNF grammar the tool produces: an -abstract syntax as a Haskell/C++/C module or Java directory, a case skeleton -for the abstract syntax in the same language, an Alex, JLex, or Flex lexer -generator file, a Happy, CUP, or Bison parser generator file, a pretty-printer -as a Haskell/Java/C++/C module, a Latex file containing a readable -specification of the language. - -WWW: http://bnfc.digitalgrammars.com/ Index: devel/hs-ConfigFile/Makefile =================================================================== --- devel/hs-ConfigFile/Makefile +++ devel/hs-ConfigFile/Makefile @@ -2,7 +2,7 @@ PORTNAME= ConfigFile PORTVERSION= 1.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= MissingH>=1.0.0 mtl parsec +USE_CABAL= MissingH>=1.0.0 mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-DrIFT/Makefile =================================================================== --- devel/hs-DrIFT/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTNAME= DrIFT -PORTVERSION= 2.4.2 -PORTREVISION= 4 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Program to derive type class instances - -LICENSE= BSD3CLAUSE - -USE_CABAL= old-time random - -EXECUTABLE= DrIFT drift-ghc - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: devel/hs-DrIFT/distinfo =================================================================== --- devel/hs-DrIFT/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627812 -SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0 -SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676 Index: devel/hs-DrIFT/files/patch-src_ParseLib2.hs =================================================================== --- devel/hs-DrIFT/files/patch-src_ParseLib2.hs +++ /dev/null @@ -1,25 +0,0 @@ ---- src/ParseLib2.hs.orig 2013-11-11 15:22:00 UTC -+++ src/ParseLib2.hs -@@ -32,6 +32,7 @@ module ParseLib2 - opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where - - import Data.Char -+import Control.Applicative (Alternative, empty, (<|>)) - import Control.Monad - - infixr 5 +++ -@@ -62,6 +63,14 @@ instance MonadPlus Parser where - -- mplus :: Parser a -> Parser a -> Parser a - (P p) `mplus` (P q) = P (\pos inp -> (p pos inp ++ q pos inp)) - -+instance Applicative Parser where -+ pure = return -+ (<*>) = ap -+ -+instance Alternative Parser where -+ empty = mzero -+ (<|>) = mplus -+ - -- bits which donn't fit into Haskell's type classes just yet :-( - - env :: Parser Pos Index: devel/hs-DrIFT/pkg-descr =================================================================== --- devel/hs-DrIFT/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -DrIFT is a type sensitive preprocessor for Haskell. It extracts type -declarations and directives from modules. The directives cause rules to -be fired on the parsed type declarations, generating new code which is -then appended to the bottom of the input file. The rules are expressed -as Haskell code, and it is intended that the user can add new rules as -required. DrIFT automates instance derivation for classes that aren't -supported by the standard compilers. In addition, instances can be -produced in separate modules to that containing the type declaration. -This allows instances to be derived for a type after the original module -has been compiled. As a bonus, simple utility functions can also be -produced from a type. - -WWW: http://repetae.net/computer/haskell/DrIFT/ Index: devel/hs-EdisonCore/Makefile =================================================================== --- devel/hs-EdisonCore/Makefile +++ devel/hs-EdisonCore/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ PORTNAME= EdisonCore -PORTVERSION= 1.3.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= A library of efficent, purely-functional data structures (Core Implementations) -USE_CABAL= EdisonAPI mtl QuickCheck +LICENSE= MIT + +USE_CABAL= EdisonAPI mtl semigroups QuickCheck .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-EdisonCore/distinfo =================================================================== --- devel/hs-EdisonCore/distinfo +++ devel/hs-EdisonCore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500996696 -SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b -SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699 +TIMESTAMP = 1523469795 +SHA256 (cabal/EdisonCore-1.3.2.1.tar.gz) = 73c6014d07107a9ed21df76a59f70c9d68d64ac84cced35f7b628f1d792cf239 +SIZE (cabal/EdisonCore-1.3.2.1.tar.gz) = 82522 Index: devel/hs-List/Makefile =================================================================== --- devel/hs-List/Makefile +++ devel/hs-List/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= List -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.6.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-List/distinfo =================================================================== --- devel/hs-List/distinfo +++ devel/hs-List/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627813 -SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889 -SIZE (cabal/List-0.6.0.tar.gz) = 6189 +TIMESTAMP = 1523654714 +SHA256 (cabal/List-0.6.2.tar.gz) = c4b92be1202fc59112018f76d5b17cd3a659ebc36384a46e000ab2fbaf99b878 +SIZE (cabal/List-0.6.2.tar.gz) = 7128 Index: devel/hs-ListLike/Makefile =================================================================== --- devel/hs-ListLike/Makefile +++ devel/hs-ListLike/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ListLike -PORTVERSION= 4.5.1 -PORTREVISION= 1 +PORTVERSION= 4.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= dlist fmlist text utf8-string vector +USE_CABAL= dlist fmlist primitive utf8-string vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-ListLike/distinfo =================================================================== --- devel/hs-ListLike/distinfo +++ devel/hs-ListLike/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499719758 -SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d -SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600 +TIMESTAMP = 1523448782 +SHA256 (cabal/ListLike-4.6.tar.gz) = c1cdec79a5f585a5839eea26a2afe6a37aab5ed2f402a16e7d59fe9a4e925a9a +SIZE (cabal/ListLike-4.6.tar.gz) = 30544 Index: devel/hs-MemoTrie/Makefile =================================================================== --- devel/hs-MemoTrie/Makefile +++ devel/hs-MemoTrie/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MemoTrie -PORTVERSION= 0.6.8 -PORTREVISION= 1 +PORTVERSION= 0.6.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-MemoTrie/distinfo =================================================================== --- devel/hs-MemoTrie/distinfo +++ devel/hs-MemoTrie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627814 -SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4 -SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399 +TIMESTAMP = 1523960769 +SHA256 (cabal/MemoTrie-0.6.9.tar.gz) = 1d6045b8fdf7b89ed6b495e535613f5091cdfc9cdfe05a862207e76ce205f794 +SIZE (cabal/MemoTrie-0.6.9.tar.gz) = 8436 Index: devel/hs-MissingH/Makefile =================================================================== --- devel/hs-MissingH/Makefile +++ devel/hs-MissingH/Makefile @@ -3,7 +3,7 @@ PORTNAME= MissingH PORTVERSION= 1.4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hslogger HUnit mtl network old-time parsec random regex-compat +USE_CABAL= hslogger HUnit mtl network old-time random regex-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-PSQueue/Makefile =================================================================== --- devel/hs-PSQueue/Makefile +++ devel/hs-PSQueue/Makefile @@ -10,5 +10,7 @@ LICENSE= BSD3CLAUSE +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-PSQueue/files/patch-Data_PSQueue.hs =================================================================== --- /dev/null +++ devel/hs-PSQueue/files/patch-Data_PSQueue.hs @@ -0,0 +1,11 @@ +--- Data/PSQueue.hs.orig 2018-04-19 15:27:45 UTC ++++ Data/PSQueue.hs +@@ -62,7 +62,7 @@ module Data.PSQueue + , foldl + ) where + +-import Prelude hiding (lookup,null,foldl,foldr) ++import Prelude hiding (lookup,null,foldl,foldr,(<>)) + import qualified Prelude as P + + {- \ No newline at end of file Index: devel/hs-ReadArgs/Makefile =================================================================== --- devel/hs-ReadArgs/Makefile +++ devel/hs-ReadArgs/Makefile @@ -2,7 +2,7 @@ PORTNAME= ReadArgs PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13 +USE_CABAL= system-filepath>=0.4.7 EXECUTABLE= ReadArgsEx Index: devel/hs-SafeSemaphore/Makefile =================================================================== --- devel/hs-SafeSemaphore/Makefile +++ devel/hs-SafeSemaphore/Makefile @@ -2,7 +2,7 @@ PORTNAME= SafeSemaphore PORTVERSION= 0.10.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-ShellCheck/Makefile =================================================================== --- devel/hs-ShellCheck/Makefile +++ devel/hs-ShellCheck/Makefile @@ -11,9 +11,11 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_CABAL= json mtl>=2.2.1 parsec QuickCheck>=2.7.4 regex-tdfa +USE_CABAL= json mtl>=2.2.1 QuickCheck>=2.7.4 regex-tdfa EXECUTABLE= shellcheck +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-StateVar/Makefile =================================================================== --- devel/hs-StateVar/Makefile +++ devel/hs-StateVar/Makefile @@ -2,7 +2,7 @@ PORTNAME= StateVar PORTVERSION= 1.1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-TypeCompose/Makefile =================================================================== --- devel/hs-TypeCompose/Makefile +++ devel/hs-TypeCompose/Makefile @@ -13,5 +13,7 @@ USE_CABAL= base-orphans +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-activehs-base/Makefile =================================================================== --- devel/hs-activehs-base/Makefile +++ devel/hs-activehs-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= activehs-base PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-activehs-base/files/patch-activehs-base.cabal =================================================================== --- devel/hs-activehs-base/files/patch-activehs-base.cabal +++ devel/hs-activehs-base/files/patch-activehs-base.cabal @@ -3,8 +3,9 @@ @@ -22,6 +22,6 @@ Library ActiveHs.Base Build-Depends: - base >= 4.0 && < 4.10, +- base >= 4.0 && < 4.10, - QuickCheck >= 2.4 && < 2.9 ++ base >= 4.0 && < 4.12, + QuickCheck >= 2.4 && < 2.11 Index: devel/hs-ansi-terminal/Makefile =================================================================== --- devel/hs-ansi-terminal/Makefile +++ devel/hs-ansi-terminal/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ansi-terminal -PORTVERSION= 0.6.3.1 -PORTREVISION= 1 +PORTVERSION= 0.8.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,6 +9,8 @@ LICENSE= BSD3CLAUSE +USE_CABAL= colour + FLAGS_DISABLE= Example .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-ansi-terminal/distinfo =================================================================== --- devel/hs-ansi-terminal/distinfo +++ devel/hs-ansi-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627818 -SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095 -SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199 +TIMESTAMP = 1524847331 +SHA256 (cabal/ansi-terminal-0.8.0.2.tar.gz) = 891ac933759fee1f6aad8b38ffc718efd685edf35cbe5283cc304d3a290af0fa +SIZE (cabal/ansi-terminal-0.8.0.2.tar.gz) = 29359 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-arrows/Makefile =================================================================== --- devel/hs-arrows/Makefile +++ devel/hs-arrows/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= arrows -PORTVERSION= 0.4.4.1 -PORTREVISION= 11 +PORTVERSION= 0.4.4.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-arrows/distinfo =================================================================== --- devel/hs-arrows/distinfo +++ devel/hs-arrows/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627819 -SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2 -SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261 +TIMESTAMP = 1524150955 +SHA256 (cabal/arrows-0.4.4.2.tar.gz) = f65ac93306629e70ae0d92914cc04d6ab499de3168036f0623aba3fffd22ab09 +SIZE (cabal/arrows-0.4.4.2.tar.gz) = 12701 Index: devel/hs-asn1-data/Makefile =================================================================== --- devel/hs-asn1-data/Makefile +++ devel/hs-asn1-data/Makefile @@ -2,7 +2,7 @@ PORTNAME= asn1-data PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= cereal mtl text>=0.11 +USE_CABAL= cereal mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-async/Makefile =================================================================== --- devel/hs-async/Makefile +++ devel/hs-async/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= async -PORTVERSION= 2.1.1.1 +PORTVERSION= 2.2.1 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.2 +USE_CABAL= 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-atomic-primops/Makefile =================================================================== --- devel/hs-atomic-primops/Makefile +++ devel/hs-atomic-primops/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= atomic-primops -PORTVERSION= 0.8.0.4 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-atomic-primops/distinfo =================================================================== --- devel/hs-atomic-primops/distinfo +++ devel/hs-atomic-primops/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450732 -SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864 -SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075 +TIMESTAMP = 1524158958 +SHA256 (cabal/atomic-primops-0.8.2.tar.gz) = 67f8872e0c1e634d819a967365eb4ad514e9b2cde967fbc710da7cdc4d17d933 +SIZE (cabal/atomic-primops-0.8.2.tar.gz) = 36157 Index: devel/hs-base-compat-batteries/Makefile =================================================================== --- devel/hs-base-compat-batteries/Makefile +++ devel/hs-base-compat-batteries/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= hslua -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTNAME= base-compat-batteries +PORTVERSION= 0.10.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Lua language interpreter embedding in Haskell +COMMENT= base-compat with extra batteries LICENSE= MIT +USE_CABAL= base-compat + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-base-compat-batteries/distinfo =================================================================== --- /dev/null +++ devel/hs-base-compat-batteries/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525010214 +SHA256 (cabal/base-compat-batteries-0.10.1.tar.gz) = 15578bafe45db81f7c7ad33253b2b047dab9b6df4ca7ca57f541d64084f113c9 +SIZE (cabal/base-compat-batteries-0.10.1.tar.gz) = 15813 Index: devel/hs-base-compat-batteries/pkg-descr =================================================================== --- /dev/null +++ devel/hs-base-compat-batteries/pkg-descr @@ -0,0 +1,11 @@ +Provides functions available in later versions of base to a wider range of +compilers, without requiring you to use CPP pragmas in your code. See the README +for what is covered. Also see the changelog for recent changes. + +Note that base-compat does not add any orphan instances. There is a separate +package, base-orphans, for that. + +In addition, base-compat does not backport any data types or type classes. +See this section of the README for more info. + +WWW: https://github.com/haskell-compat/base-compat Index: devel/hs-base-compat/Makefile =================================================================== --- devel/hs-base-compat/Makefile +++ devel/hs-base-compat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= base-compat -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 0.10.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-base-compat/distinfo =================================================================== --- devel/hs-base-compat/distinfo +++ devel/hs-base-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499541026 -SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210 -SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632 +TIMESTAMP = 1525011068 +SHA256 (cabal/base-compat-0.10.1.tar.gz) = b2ec2193d4a76a92c0ddcd69bb1b5879d50c98dd38422b0d86f85aea3112bb6d +SIZE (cabal/base-compat-0.10.1.tar.gz) = 31954 Index: devel/hs-basement/Makefile =================================================================== --- devel/hs-basement/Makefile +++ devel/hs-basement/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= List -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTNAME= basement +PORTVERSION= 0.0.7 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= List monad transformer and class +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-basic-prelude/Makefile =================================================================== --- devel/hs-basic-prelude/Makefile +++ devel/hs-basic-prelude/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= basic-prelude -PORTVERSION= 0.6.1.1 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ LICENSE= MIT -USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe text \ - unordered-containers vector +USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe unordered-containers \ + vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-basic-prelude/distinfo =================================================================== --- devel/hs-basic-prelude/distinfo +++ devel/hs-basic-prelude/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627821 -SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7 -SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009 +TIMESTAMP = 1524414505 +SHA256 (cabal/basic-prelude-0.7.0.tar.gz) = 10755f892548faa956b81b40d1d03ec6e94609fd8ec8e92be09b4453b7ad9379 +SIZE (cabal/basic-prelude-0.7.0.tar.gz) = 6471 Index: devel/hs-bifunctors/Makefile =================================================================== --- devel/hs-bifunctors/Makefile +++ devel/hs-bifunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bifunctors -PORTVERSION= 5.4.2 -PORTREVISION= 1 +PORTVERSION= 5.5.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3 +USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3 \ + th-abstraction .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-bifunctors/distinfo =================================================================== --- devel/hs-bifunctors/distinfo +++ devel/hs-bifunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499542053 -SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d -SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535 +TIMESTAMP = 1523787744 +SHA256 (cabal/bifunctors-5.5.2.tar.gz) = 332bb2ea19e77dac55282daff8046d89f69514ced5b987779d887e53b5d7cb11 +SIZE (cabal/bifunctors-5.5.2.tar.gz) = 37983 Index: devel/hs-bifunctors/files/patch-bifunctors.cabal =================================================================== --- /dev/null +++ devel/hs-bifunctors/files/patch-bifunctors.cabal @@ -0,0 +1,11 @@ +--- bifunctors.cabal.orig 2018-04-15 11:07:07 UTC ++++ bifunctors.cabal +@@ -43,7 +43,7 @@ library + base-orphans >= 0.5.2 && < 1, + comonad >= 4 && < 6, + containers >= 0.1 && < 0.6, +- template-haskell >= 2.4 && < 2.13, ++ template-haskell >= 2.4 && < 2.14, + th-abstraction >= 0.2.2 && < 0.3, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.5 && < 0.6 \ No newline at end of file Index: devel/hs-blaze-builder/Makefile =================================================================== --- devel/hs-blaze-builder/Makefile +++ devel/hs-blaze-builder/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-builder -PORTVERSION= 0.4.0.2 -PORTREVISION= 1 +PORTVERSION= 0.4.1.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.10 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-blaze-builder/distinfo =================================================================== --- devel/hs-blaze-builder/distinfo +++ devel/hs-blaze-builder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546087 -SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4 -SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681 +TIMESTAMP = 1523427415 +SHA256 (cabal/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814 +SIZE (cabal/blaze-builder-0.4.1.0.tar.gz) = 61365 Index: devel/hs-blaze-textual/Makefile =================================================================== --- devel/hs-blaze-textual/Makefile +++ devel/hs-blaze-textual/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-textual PORTVERSION= 0.2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= blaze-builder>=0.2.1.4 double-conversion>=0.2.0.1 \ - old-locale text>=0.11.0.2 vector + old-locale vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-boxes/Makefile =================================================================== --- devel/hs-boxes/Makefile +++ devel/hs-boxes/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= boxes -PORTVERSION= 0.1.4 -PORTREVISION= 2 +PORTVERSION= 0.1.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-boxes/distinfo =================================================================== --- devel/hs-boxes/distinfo +++ devel/hs-boxes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627822 -SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8 -SIZE (cabal/boxes-0.1.4.tar.gz) = 6481 +TIMESTAMP = 1523955976 +SHA256 (cabal/boxes-0.1.5.tar.gz) = 38e1782e8a458f342a0acbb74af8f55cb120756bc3af7ee7220d955812af56c3 +SIZE (cabal/boxes-0.1.5.tar.gz) = 7598 Index: devel/hs-c2hs/Makefile =================================================================== --- devel/hs-c2hs/Makefile +++ devel/hs-c2hs/Makefile @@ -3,7 +3,7 @@ PORTNAME= c2hs PORTVERSION= 0.28.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= GPLv2 -USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 text yaml>=0.8 +USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 yaml>=0.8 XMLDOCS= doc/users_guide:html Index: devel/hs-cabal-install/Makefile =================================================================== --- devel/hs-cabal-install/Makefile +++ devel/hs-cabal-install/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cabal-install -PORTVERSION= 1.24.0.2 +PORTVERSION= 2.2.0.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,9 +10,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 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-chunked-data/Makefile =================================================================== --- devel/hs-chunked-data/Makefile +++ devel/hs-chunked-data/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= chunked-data -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= MIT -USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups text>=0.11 \ - vector +USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-chunked-data/distinfo =================================================================== --- devel/hs-chunked-data/distinfo +++ devel/hs-chunked-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627825 -SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f -SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349 +TIMESTAMP = 1524413491 +SHA256 (cabal/chunked-data-0.3.1.tar.gz) = f710c581aee1f899e807fc9e6cba721b27d53dc9d56986f1922bc7ccddf1a79a +SIZE (cabal/chunked-data-0.3.1.tar.gz) = 4605 Index: devel/hs-classy-prelude-conduit/Makefile =================================================================== --- devel/hs-classy-prelude-conduit/Makefile +++ devel/hs-classy-prelude-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= classy-prelude-conduit -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-classy-prelude-conduit/distinfo =================================================================== --- devel/hs-classy-prelude-conduit/distinfo +++ devel/hs-classy-prelude-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627826 -SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f -SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735 +TIMESTAMP = 1525092204 +SHA256 (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 39ef2567a3542ebf91f6ebc103cc4afb64c2a4ec051c7ce578b577ef9931c424 +SIZE (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 1979 Index: devel/hs-classy-prelude/Makefile =================================================================== --- devel/hs-classy-prelude/Makefile +++ devel/hs-classy-prelude/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= classy-prelude -PORTVERSION= 1.2.0.1 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ exceptions hashable lifted-async lifted-base monad-unlift \ mono-traversable mono-traversable-instances mtl \ mutable-containers primitive safe-exceptions say semigroups \ - stm stm-chans text time-locale-compat transformers-base \ + stm-chans time-locale-compat transformers-base unliftio \ unordered-containers vector vector-instances .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-classy-prelude/distinfo =================================================================== --- devel/hs-classy-prelude/distinfo +++ devel/hs-classy-prelude/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627825 -SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34 -SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017 +TIMESTAMP = 1525004675 +SHA256 (cabal/classy-prelude-1.4.0.tar.gz) = 2b3b255676ab0fdeb39aebafa3543535ddd684d00c645b643e50cb9e2d25f9e0 +SIZE (cabal/classy-prelude-1.4.0.tar.gz) = 12056 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-concurrent-output/Makefile =================================================================== --- devel/hs-concurrent-output/Makefile +++ devel/hs-concurrent-output/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= concurrent-output -PORTVERSION= 1.10.0 +PORTVERSION= 1.10.5 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ LICENSE= BSD2CLAUSE -USE_CABAL= text async stm exceptions ansi-terminal terminal-size +USE_CABAL= async exceptions ansi-terminal terminal-size .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-concurrent-output/distinfo =================================================================== --- devel/hs-concurrent-output/distinfo +++ devel/hs-concurrent-output/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501333173 -SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2 -SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764 +TIMESTAMP = 1523694433 +SHA256 (cabal/concurrent-output-1.10.5.tar.gz) = 98c096228664d591eb2c352080955a202e883cdab8452efae3cae407e30fa5c3 +SIZE (cabal/concurrent-output-1.10.5.tar.gz) = 21970 Index: devel/hs-concurrent-output/files/patch-concurrent-output.cabal =================================================================== --- devel/hs-concurrent-output/files/patch-concurrent-output.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- concurrent-output.cabal.orig 2017-05-19 15:55:09 UTC -+++ concurrent-output.cabal -@@ -34,7 +34,7 @@ Library - , text (>= 0.11.0 && < 1.3.0) - , async (>= 2.0 && < 2.2) - , stm (>= 2.0 && < 2.5) -- , process (>= 1.6.0 && < 1.7.0) -+ , process - , directory (>= 1.2.0 && < 1.4.0) - , transformers (>= 0.3.0 && < 0.6.0) - , exceptions (>= 0.6.0 && < 0.9.0) Index: devel/hs-conduit-combinators/Makefile =================================================================== --- devel/hs-conduit-combinators/Makefile +++ devel/hs-conduit-combinators/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= conduit-combinators -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= base16-bytestring base64-bytestring>=0.1.1.1 chunked-data \ conduit>=1.2.2 conduit-extra>=1.1.1 monad-control \ mono-traversable>=0.4 mwc-random primitive resourcet \ - text transformers-base unix-compat vector void + transformers-base unix-compat vector void .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-conduit-combinators/distinfo =================================================================== --- devel/hs-conduit-combinators/distinfo +++ devel/hs-conduit-combinators/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627827 -SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918 -SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380 +TIMESTAMP = 1525004319 +SHA256 (cabal/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3 +SIZE (cabal/conduit-combinators-1.3.0.tar.gz) = 2204 Index: devel/hs-conduit-extra/Makefile =================================================================== --- devel/hs-conduit-extra/Makefile +++ devel/hs-conduit-extra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= conduit-extra -PORTVERSION= 1.1.16 +PORTVERSION= 1.3.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \ monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \ - stm streaming-commons>=0.1.11 text transformers-base + streaming-commons>=0.1.11 transformers-base typed-process .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-conduit-extra/distinfo =================================================================== --- devel/hs-conduit-extra/distinfo +++ devel/hs-conduit-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627827 -SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5 -SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402 +TIMESTAMP = 1523897535 +SHA256 (cabal/conduit-extra-1.3.0.tar.gz) = 2c41c925fc53d9ba2e640c7cdca72c492b28c0d45f1a82e94baef8dfa65922ae +SIZE (cabal/conduit-extra-1.3.0.tar.gz) = 32716 Index: devel/hs-conduit/Makefile =================================================================== --- devel/hs-conduit/Makefile +++ devel/hs-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= conduit -PORTVERSION= 1.2.11 -PORTREVISION= 1 +PORTVERSION= 1.3.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ LICENSE= MIT -USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mtl resourcet>=1.1 \ - transformers-base>=0.4.1 void>=0.5.5 +USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mono-traversable mtl \ + resourcet>=1.1 transformers-base>=0.4.1 vector void>=0.5.5 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-conduit/distinfo =================================================================== --- devel/hs-conduit/distinfo +++ devel/hs-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543753 -SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7 -SIZE (cabal/conduit-1.2.11.tar.gz) = 50240 +TIMESTAMP = 1523696712 +SHA256 (cabal/conduit-1.3.0.2.tar.gz) = c0f099d242504e65a78e1cbb54c18afad45fe2c9297d1d918ce28ae7dc4a1e5b +SIZE (cabal/conduit-1.3.0.2.tar.gz) = 86664 Index: devel/hs-configurator/Makefile =================================================================== --- devel/hs-configurator/Makefile +++ devel/hs-configurator/Makefile @@ -2,7 +2,7 @@ PORTNAME= configurator PORTVERSION= 0.3.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec>=0.10.0.2 hashable text>=0.11.1.0 unix-compat \ - unordered-containers +USE_CABAL= attoparsec>=0.10.0.2 hashable unix-compat unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-constraints/Makefile =================================================================== --- devel/hs-constraints/Makefile +++ devel/hs-constraints/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= constraints -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable mtl transformers-compat +USE_CABAL= hashable mtl semigroups transformers-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-constraints/distinfo =================================================================== --- devel/hs-constraints/distinfo +++ devel/hs-constraints/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444670 -SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785 -SIZE (cabal/constraints-0.9.1.tar.gz) = 18503 +TIMESTAMP = 1523445706 +SHA256 (cabal/constraints-0.10.tar.gz) = c224b82e53c21791083c83fed2f2c938bd715a63c8efa90a5abcc3d8859126c6 +SIZE (cabal/constraints-0.10.tar.gz) = 19703 Index: devel/hs-convertible/Makefile =================================================================== --- devel/hs-convertible/Makefile +++ devel/hs-convertible/Makefile @@ -3,7 +3,7 @@ PORTNAME= convertible PORTVERSION= 1.1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl old-locale old-time text>=0.8 +USE_CABAL= mtl old-locale old-time .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-darcs/Makefile =================================================================== --- devel/hs-darcs/Makefile +++ devel/hs-darcs/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= darcs -PORTVERSION= 2.12.5 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,13 +12,15 @@ USE_CABAL= async attoparsec base16-bytestring cryptohash \ data-ordlist dataenc fgl graphviz hashable html HTTP \ - mmap mtl parsec random \ + mmap mtl random \ regex-applicative regex-compat-tdfa sandi tar \ - text transformers-compat unix-compat \ + transformers-compat unix-compat \ utf8-string vector zip-archive zlib EXECUTABLE= darcs +IGNORE= Depends on graphics/hs-graphviz, which doesn't compile with recent GHC + MAN1PAGES= darcs.1 FLAGS_DEFINE= STATIC TERMINFO THREADED Index: devel/hs-darcs/distinfo =================================================================== --- devel/hs-darcs/distinfo +++ devel/hs-darcs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538866 -SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553 -SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698 +TIMESTAMP = 1525013682 +SHA256 (cabal/darcs-2.14.0.tar.gz) = 19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803 +SIZE (cabal/darcs-2.14.0.tar.gz) = 1063067 Index: devel/hs-darcs/files/patch-darcs.cabal =================================================================== --- devel/hs-darcs/files/patch-darcs.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- darcs.cabal.orig 2017-07-11 16:28:16 UTC -+++ darcs.cabal -@@ -400,7 +400,7 @@ Library - transformers-compat >= 0.4 && < 0.6, - parsec >= 3.1 && < 3.2, - fgl >= 5.5.0.1 && < 5.6, -- graphviz >= 2999.17.0.1 && < 2999.19, -+ graphviz >= 2999.17.0.1 && < 2999.20, - html >= 1.0.1.2 && < 1.1, - filepath >= 1.3.0.1 && < 1.5.0.0, - haskeline >= 0.6.3 && < 0.8, Index: devel/hs-data-pprint/files/patch-Data_PPrint.hs =================================================================== --- /dev/null +++ devel/hs-data-pprint/files/patch-Data_PPrint.hs @@ -0,0 +1,9 @@ +--- Data/PPrint.hs.orig 2018-04-13 19:36:43 UTC ++++ Data/PPrint.hs +@@ -60,6 +60,6 @@ a === b = do + showBotts :: [(String, String)] -> Doc + showBotts es = vcat $ map f es + where +- f (i, e) = text i <> text ":" <+> vcat (map text $ lines e) ++ f (i, e) = text i Text.PrettyPrint.HughesPJ.<> text ":" <+> vcat (map text $ lines e) + Index: devel/hs-data-pprint/files/patch-data-pprint.cabal =================================================================== --- devel/hs-data-pprint/files/patch-data-pprint.cabal +++ devel/hs-data-pprint/files/patch-data-pprint.cabal @@ -1,10 +1,14 @@ ---- data-pprint.cabal.orig 2017-07-10 15:51:41 UTC +--- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC +++ data-pprint.cabal -@@ -72,6 +72,6 @@ library +@@ -68,10 +68,10 @@ library + System.IO.Parallel + other-modules: + build-depends: +- base >= 4.0 && < 4.10, ++ base >= 4.0 && < 4.12, pretty >= 1.0 && < 1.2, mtl >= 2.0 && < 2.3, deepseq >= 1.1 && < 1.5, - time >= 1.2 && < 1.6, -+ time >= 1.2 && < 1.7, ++ time >= 1.2 && < 1.9, parallel >= 3.1 && < 3.3 - Index: devel/hs-dbus/Makefile =================================================================== --- devel/hs-dbus/Makefile +++ devel/hs-dbus/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= dbus -PORTVERSION= 0.10.13 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ LICENSE= GPLv3 -USE_CABAL= cereal libxml-sax network parsec random text vector xml-types +USE_CABAL= cereal lens libxml-sax network random split th-lift vector \ + xml-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-dbus/distinfo =================================================================== --- devel/hs-dbus/distinfo +++ devel/hs-dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501342515 -SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca -SIZE (cabal/dbus-0.10.13.tar.gz) = 75603 +TIMESTAMP = 1524595525 +SHA256 (cabal/dbus-1.0.1.tar.gz) = a325b5c6958a343b30fd378d54ac01f9db889a4d7cadb14b2103da7ef4e7e8f5 +SIZE (cabal/dbus-1.0.1.tar.gz) = 77535 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= 2 +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-deepseq-generics/files/patch-deepseq-generics.cabal =================================================================== --- /dev/null +++ devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal @@ -0,0 +1,10 @@ +--- deepseq-generics.cabal.orig 2018-04-11 11:03:49 UTC ++++ deepseq-generics.cabal +@@ -42,7 +42,7 @@ source-repository head + library + default-language: Haskell2010 + exposed-modules: Control.DeepSeq.Generics +- build-depends: base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5 ++ build-depends: base >= 4.5 && < 4.12, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5 + other-extensions: BangPatterns, FlexibleContexts, TypeOperators + ghc-options: -Wall Index: devel/hs-echo/Makefile =================================================================== --- devel/hs-echo/Makefile +++ devel/hs-echo/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= List -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTNAME= echo +PORTVERSION= 0.1.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= List monad transformer and class +COMMENT= Cross-platform and cross-console library to handle echoing terminal input LICENSE= BSD3CLAUSE 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-either/Makefile =================================================================== --- devel/hs-either/Makefile +++ devel/hs-either/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= either -PORTVERSION= 4.4.1.1 -PORTREVISION= 1 +PORTVERSION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-either/distinfo =================================================================== --- devel/hs-either/distinfo +++ devel/hs-either/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627832 -SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3 -SIZE (cabal/either-4.4.1.1.tar.gz) = 9376 +TIMESTAMP = 1524406695 +SHA256 (cabal/either-5.tar.gz) = 75cee27641a34f80e6c71f82469a76c7f51d23a522e792e2733269ebf7cbf420 +SIZE (cabal/either-5.tar.gz) = 8637 Index: devel/hs-either/files/patch-either.cabal =================================================================== --- devel/hs-either/files/patch-either.cabal +++ /dev/null @@ -1,14 +0,0 @@ ---- either.cabal.orig 2017-07-10 15:15:32 UTC -+++ either.cabal -@@ -32,9 +32,9 @@ library - exceptions >= 0.5 && < 0.9, - free >= 4.9 && < 5, - monad-control >= 0.3.2 && < 1.1, -- MonadRandom >= 0.1 && < 0.5, -+ MonadRandom >= 0.1 && < 0.6, - mtl >= 2.0 && < 2.3, -- mmorph >= 1.0.0 && < 1.1, -+ mmorph >= 1.0.0 && < 1.2, - profunctors >= 4 && < 6, - semigroups >= 0.8.3.1 && < 1, - semigroupoids >= 4 && < 6, Index: devel/hs-enumerator/Makefile =================================================================== --- devel/hs-enumerator/Makefile +++ devel/hs-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= enumerator PORTVERSION= 0.4.20 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= text>=0.7 +IGNORE= Doesn't build with recent GHC version .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-errors/Makefile =================================================================== --- devel/hs-errors/Makefile +++ devel/hs-errors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= errors -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text +USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-errors/distinfo =================================================================== --- devel/hs-errors/distinfo +++ devel/hs-errors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499451104 -SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531 -SIZE (cabal/errors-2.2.1.tar.gz) = 8821 +TIMESTAMP = 1523996378 +SHA256 (cabal/errors-2.2.5.tar.gz) = e917ca560c5573d792483677fa5ad30d9d1923d21361ce24879cb51e6fbc735c +SIZE (cabal/errors-2.2.5.tar.gz) = 9030 Index: devel/hs-exceptions/Makefile =================================================================== --- devel/hs-exceptions/Makefile +++ devel/hs-exceptions/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exceptions -PORTVERSION= 0.8.3 +PORTVERSION= 0.10.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl stm transformers-compat +USE_CABAL= mtl transformers-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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-extra/Makefile =================================================================== --- devel/hs-extra/Makefile +++ devel/hs-extra/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= extra -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-extra/distinfo =================================================================== --- devel/hs-extra/distinfo +++ devel/hs-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627833 -SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df -SIZE (cabal/extra-1.6.tar.gz) = 36369 +TIMESTAMP = 1525013177 +SHA256 (cabal/extra-1.6.6.tar.gz) = 79996e6a8add465b9ae6253249199afc7fb2e4df475744dbe32b3c0b4573a09d +SIZE (cabal/extra-1.6.6.tar.gz) = 39499 Index: devel/hs-fast-logger/Makefile =================================================================== --- devel/hs-fast-logger/Makefile +++ devel/hs-fast-logger/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fast-logger -PORTVERSION= 2.4.10 -PORTREVISION= 1 +PORTVERSION= 2.4.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= auto-update easy-file old-locale text unix-time +USE_CABAL= auto-update easy-file old-locale unix-time .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-fast-logger/distinfo =================================================================== --- devel/hs-fast-logger/distinfo +++ devel/hs-fast-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627834 -SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d -SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537 +TIMESTAMP = 1523783540 +SHA256 (cabal/fast-logger-2.4.11.tar.gz) = bbe5deab58f435754dbe938cf0ddf26fc21f317c35fb3431d4bdb96809dea2a9 +SIZE (cabal/fast-logger-2.4.11.tar.gz) = 10326 Index: devel/hs-filestore/Makefile =================================================================== --- devel/hs-filestore/Makefile +++ devel/hs-filestore/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= filestore -PORTVERSION= 0.6.3.1 -PORTREVISION= 1 +PORTVERSION= 0.6.3.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= Diff>=0.2 old-locale>=1.0 parsec>=2 split>=0.1 \ - utf8-string>=0.3 xml>=1.3 +USE_CABAL= Diff>=0.2 old-locale>=1.0 split>=0.1 utf8-string>=0.3 xml>=1.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-filestore/distinfo =================================================================== --- devel/hs-filestore/distinfo +++ devel/hs-filestore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627835 -SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de -SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776 +TIMESTAMP = 1523961106 +SHA256 (cabal/filestore-0.6.3.2.tar.gz) = 1b8090d20c940ac3444dd9649ed71e934601dba9f2fb9579e67fff6dcd32a15b +SIZE (cabal/filestore-0.6.3.2.tar.gz) = 31870 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-free/Makefile =================================================================== --- devel/hs-free/Makefile +++ devel/hs-free/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= free -PORTVERSION= 4.12.4 -PORTREVISION= 1 +PORTVERSION= 5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= bifunctors>=4 comonad>=4 distributive>=0.2.1 exceptions>=0.6 \ mtl>=2.0.1.0 prelude-extras>=0.4 profunctors>=4 \ - semigroupoids>=4 semigroups>=0.8.3.1 + semigroupoids>=4 semigroups>=0.8.3.1 transformers-base .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-free/distinfo =================================================================== --- devel/hs-free/distinfo +++ devel/hs-free/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627836 -SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784 -SIZE (cabal/free-4.12.4.tar.gz) = 50601 +TIMESTAMP = 1523821134 +SHA256 (cabal/free-5.0.1.tar.gz) = b75cb592fdcbe11b83d2316c0cb5c8a66621709f57af9f52bbfcc8e4524e6299 +SIZE (cabal/free-5.0.1.tar.gz) = 64069 Index: devel/hs-free/files/patch-free.cabal =================================================================== --- /dev/null +++ devel/hs-free/files/patch-free.cabal @@ -0,0 +1,11 @@ +--- free.cabal.orig 2018-04-15 20:31:19 UTC ++++ free.cabal +@@ -84,7 +84,7 @@ library + transformers-base < 0.5, + transformers-compat >= 0.3 && < 1, + template-haskell >= 2.7.0.0 && < 3, +- exceptions >= 0.6 && < 0.10, ++ exceptions >= 0.6 && < 0.11, + containers < 0.6 + + exposed-modules: \ No newline at end of file Index: devel/hs-fsnotify/Makefile =================================================================== --- devel/hs-fsnotify/Makefile +++ devel/hs-fsnotify/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fsnotify -PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTVERSION= 0.2.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= async>=2.0.1 hinotify>=0.3.7 text>=0.11.0 unix-compat>=0.2 +USE_CABAL= async>=2.0.1 hinotify>=0.3.7 unix-compat>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-fsnotify/distinfo =================================================================== --- devel/hs-fsnotify/distinfo +++ devel/hs-fsnotify/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627836 -SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b -SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689 +TIMESTAMP = 1523958991 +SHA256 (cabal/fsnotify-0.2.1.1.tar.gz) = 175a75962ad07c30c031fa8931f8d3e32abc06a96676e73e65cb7207e9d2dc90 +SIZE (cabal/fsnotify-0.2.1.1.tar.gz) = 14695 Index: devel/hs-gconf/Makefile =================================================================== --- devel/hs-gconf/Makefile +++ devel/hs-gconf/Makefile @@ -2,7 +2,7 @@ PORTNAME= gconf PORTVERSION= 0.13.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools text>=0.11.0.6 +USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools USE_GNOME= gconf2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-generic-deriving/Makefile =================================================================== --- devel/hs-generic-deriving/Makefile +++ devel/hs-generic-deriving/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= generic-deriving -PORTVERSION= 1.11.2 -PORTREVISION= 1 +PORTVERSION= 1.12.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-generic-deriving/distinfo =================================================================== --- devel/hs-generic-deriving/distinfo +++ devel/hs-generic-deriving/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450572 -SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9 -SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546 +TIMESTAMP = 1523447778 +SHA256 (cabal/generic-deriving-1.12.1.tar.gz) = f5fd3f733a20deee5a6e752969edac1e04a90e2ee34e005fccb5d35a5c129473 +SIZE (cabal/generic-deriving-1.12.1.tar.gz) = 67982 Index: devel/hs-generic-deriving/files/patch-generic-deriving.cabal =================================================================== --- /dev/null +++ devel/hs-generic-deriving/files/patch-generic-deriving.cabal @@ -0,0 +1,11 @@ +--- generic-deriving.cabal.orig 2018-04-11 11:59:07 UTC ++++ generic-deriving.cabal +@@ -77,7 +77,7 @@ library + + build-depends: containers >= 0.1 && < 0.6 + , ghc-prim < 1 +- , template-haskell >= 2.4 && < 2.13 ++ , template-haskell >= 2.4 && < 2.14 + + default-language: Haskell2010 + ghc-options: -Wall \ No newline at end of file Index: devel/hs-geniplate-mirror/Makefile =================================================================== --- devel/hs-geniplate-mirror/Makefile +++ devel/hs-geniplate-mirror/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= geniplate-mirror -PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTVERSION= 0.7.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-geniplate-mirror/distinfo =================================================================== --- devel/hs-geniplate-mirror/distinfo +++ devel/hs-geniplate-mirror/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447732 -SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f -SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297 +TIMESTAMP = 1523650498 +SHA256 (cabal/geniplate-mirror-0.7.6.tar.gz) = 4b6b82d0348e79ae4a5e1deac029441251ae87ec15a7667cf0a1de5ff80215f8 +SIZE (cabal/geniplate-mirror-0.7.6.tar.gz) = 9314 Index: devel/hs-ghc-events/Makefile =================================================================== --- devel/hs-ghc-events/Makefile +++ devel/hs-ghc-events/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ghc-events -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=2.2.1 +USE_CABAL= mtl>=2.2.1 vector EXECUTABLE= ghc-events Index: devel/hs-ghc-events/distinfo =================================================================== --- devel/hs-ghc-events/distinfo +++ devel/hs-ghc-events/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499451126 -SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769 -SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517 +TIMESTAMP = 1523991488 +SHA256 (cabal/ghc-events-0.7.2.tar.gz) = b01643f72a448fcd63a0b48781d71b21fb0bb22a54967f0b8a39db0e5638ffbf +SIZE (cabal/ghc-events-0.7.2.tar.gz) = 203071 Index: devel/hs-glib/Makefile =================================================================== --- devel/hs-glib/Makefile +++ devel/hs-glib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= glib -PORTVERSION= 0.13.4.1 -PORTREVISION= 1 +PORTVERSION= 0.13.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= gtk2hs-buildtools text>=1.0.0.0 utf8-string>=0.2 +USE_CABAL= gtk2hs-buildtools utf8-string>=0.2 USE_GNOME= glib20 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-glib/distinfo =================================================================== --- devel/hs-glib/distinfo +++ devel/hs-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537811 -SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630 -SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441 +TIMESTAMP = 1524403919 +SHA256 (cabal/glib-0.13.6.0.tar.gz) = 4e71062c6a458440294d820e21449aa4666deed2ea233ef5915da7c1d4aee8eb +SIZE (cabal/glib-0.13.6.0.tar.gz) = 39809 Index: devel/hs-gtk2hs-buildtools/Makefile =================================================================== --- devel/hs-gtk2hs-buildtools/Makefile +++ devel/hs-gtk2hs-buildtools/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gtk2hs-buildtools -PORTVERSION= 0.13.2.2 -PORTREVISION= 1 +PORTVERSION= 0.13.3.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-gtk2hs-buildtools/distinfo =================================================================== --- devel/hs-gtk2hs-buildtools/distinfo +++ devel/hs-gtk2hs-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499539633 -SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b -SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124 +TIMESTAMP = 1523786090 +SHA256 (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 220f2f4aa1e01b8585fddf35bfc9f3a9dd300f2308d3c2b800c621cdd2ce7154 +SIZE (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 177911 Index: devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs =================================================================== --- /dev/null +++ devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs @@ -0,0 +1,10 @@ +--- c2hs/c/CPretty.hs.orig 2018-04-15 10:03:19 UTC ++++ c2hs/c/CPretty.hs +@@ -34,6 +34,8 @@ module CPretty ( + -- we are just providing instances to the class `Pretty' + ) where + ++import Prelude hiding ((<>)) ++ + import Idents (Ident, identToLexeme) + import Text.PrettyPrint.HughesPJ Index: devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal =================================================================== --- /dev/null +++ devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal @@ -0,0 +1,11 @@ +--- gtk2hs-buildtools.cabal.orig 2018-04-15 10:01:41 UTC ++++ gtk2hs-buildtools.cabal +@@ -40,7 +40,7 @@ Library + build-depends: base >= 4 && < 5, + process, array, pretty, + filepath, random, +- Cabal >= 1.24.0.0 && < 2.1, ++ Cabal >= 1.24.0.0 && < 2.3, + filepath >= 1.3.0.0 && < 1.5, + directory >= 1.2.0.0 && < 1.4, + containers >= 0.5.5.1 && < 0.6 \ No newline at end of file Index: devel/hs-haddock-api/Makefile =================================================================== --- devel/hs-haddock-api/Makefile +++ devel/hs-haddock-api/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haddock-api -PORTVERSION= 2.17.4 -PORTREVISION= 1 +PORTVERSION= 2.19.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haddock-api/distinfo =================================================================== --- devel/hs-haddock-api/distinfo +++ devel/hs-haddock-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499452541 -SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601 -SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712 +TIMESTAMP = 1523989416 +SHA256 (cabal/haddock-api-2.19.0.1.tar.gz) = 432be5729450dc1923637d4a3533932582a490e1fe81d48af8be9e2ba93ed130 +SIZE (cabal/haddock-api-2.19.0.1.tar.gz) = 177912 Index: devel/hs-haddock-library/Makefile =================================================================== --- devel/hs-haddock-library/Makefile +++ devel/hs-haddock-library/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haddock-library -PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTVERSION= 1.5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ LICENSE= BSD3CLAUSE +USE_CABAL= attoparsec + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-haddock-library/distinfo =================================================================== --- devel/hs-haddock-library/distinfo +++ devel/hs-haddock-library/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448291 -SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b -SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863 +TIMESTAMP = 1523633978 +SHA256 (cabal/haddock-library-1.5.0.1.tar.gz) = ff2c10f043524135c809303c0d81c7f27a954f0174784e59a497e75e287aabb2 +SIZE (cabal/haddock-library-1.5.0.1.tar.gz) = 47111 Index: devel/hs-haddock-library/files/patch-haddock-library.cabal =================================================================== --- /dev/null +++ devel/hs-haddock-library/files/patch-haddock-library.cabal @@ -0,0 +1,45 @@ +--- haddock-library.cabal.orig 2018-04-13 16:29:12 UTC ++++ haddock-library.cabal +@@ -49,42 +49,6 @@ library + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + +-library attoparsec +- default-language: Haskell2010 +- +- build-depends: +- base >= 4.5 && < 4.12 +- , bytestring >= 0.9.2.1 && < 0.11 +- , deepseq >= 1.3 && < 1.5 +- +- hs-source-dirs: vendor/attoparsec-0.13.1.0 +- +- -- NB: haddock-library needs only small part of lib:attoparsec +- -- internally, so we only bundle that subset here +- exposed-modules: +- Data.Attoparsec.ByteString +- Data.Attoparsec.ByteString.Char8 +- Data.Attoparsec.Combinator +- +- other-modules: +- Data.Attoparsec +- Data.Attoparsec.ByteString.Buffer +- Data.Attoparsec.ByteString.FastSet +- Data.Attoparsec.ByteString.Internal +- Data.Attoparsec.Internal +- Data.Attoparsec.Internal.Fhthagn +- Data.Attoparsec.Internal.Types +- Data.Attoparsec.Number +- +- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 +- +- ghc-options: -Wall +- if impl(ghc >= 8.0) +- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances +- else +- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0 +- +- + test-suite spec + type: exitcode-stdio-1.0 + default-language: Haskell2010 \ No newline at end of file Index: devel/hs-haddock/Makefile =================================================================== --- devel/hs-haddock/Makefile +++ devel/hs-haddock/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 2.17.5 -PORTREVISION= 1 +PORTVERSION= 2.19.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haddock/distinfo =================================================================== --- devel/hs-haddock/distinfo +++ devel/hs-haddock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538938 -SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3 -SIZE (cabal/haddock-2.17.5.tar.gz) = 244683 +TIMESTAMP = 1524638302 +SHA256 (cabal/haddock-2.19.0.1.tar.gz) = 6769a3fae0a7c2c7ebb41029d4d3c7916eb7d75fe6f307a0f7d00b07814c32bc +SIZE (cabal/haddock-2.19.0.1.tar.gz) = 276623 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-hashtables/Makefile =================================================================== --- devel/hs-hashtables/Makefile +++ devel/hs-hashtables/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hashtables -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hashtables/distinfo =================================================================== --- devel/hs-hashtables/distinfo +++ devel/hs-hashtables/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499459894 -SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951 -SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674 +TIMESTAMP = 1523445335 +SHA256 (cabal/hashtables-1.2.3.0.tar.gz) = f956b4bb6113f30193c9d85caebeda5000c29d8acf4f4994af650d3748bf73a5 +SIZE (cabal/hashtables-1.2.3.0.tar.gz) = 57335 Index: devel/hs-haskell-src-exts/Makefile =================================================================== --- devel/hs-haskell-src-exts/Makefile +++ devel/hs-haskell-src-exts/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haskell-src-exts -PORTVERSION= 1.19.1 -PORTREVISION= 1 +PORTVERSION= 1.20.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haskell-src-exts/distinfo =================================================================== --- devel/hs-haskell-src-exts/distinfo +++ devel/hs-haskell-src-exts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501416565 -SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971 -SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952 +TIMESTAMP = 1523958315 +SHA256 (cabal/haskell-src-exts-1.20.2.tar.gz) = 9f6686e8bc8b849991207304e524747b0d1dcedfea351ac073ce971b36f9a3ea +SIZE (cabal/haskell-src-exts-1.20.2.tar.gz) = 1387571 Index: devel/hs-haskell-src-meta/Makefile =================================================================== --- devel/hs-haskell-src-meta/Makefile +++ devel/hs-haskell-src-meta/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= activehs-base -PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTNAME= haskell-src-meta +PORTVERSION= 0.8.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Basic definitions for activehs +COMMENT= Parse source to template-haskell abstract syntax LICENSE= BSD3CLAUSE -USE_CABAL= QuickCheck>=2.4 +USE_CABAL= haskell-src-exts safe syb th-orphans .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-haskell-src-meta/distinfo =================================================================== --- /dev/null +++ devel/hs-haskell-src-meta/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524930351 +SHA256 (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 4b7b143b94fcf147b96bb34822c2feeae29daadd3a22796ee36cadd5ca262c8b +SIZE (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 20217 Index: devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal =================================================================== --- /dev/null +++ devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal @@ -0,0 +1,16 @@ +--- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC ++++ haskell-src-meta.cabal +@@ -17,11 +17,11 @@ description: The translation from haskell-src-e + extra-source-files: ChangeLog README.md examples/*.hs + + library +- build-depends: base >= 4.6 && < 4.11, ++ build-depends: base >= 4.6 && < 4.12, + haskell-src-exts >= 1.18 && < 1.21, + pretty >= 1.0 && < 1.2, + syb >= 0.1 && < 0.8, +- template-haskell >= 2.8 && < 2.13, ++ template-haskell >= 2.8 && < 2.14, + th-orphans >= 0.9.1 && < 0.14 + + if impl(ghc < 7.8) \ No newline at end of file Index: devel/hs-haskell-src-meta/pkg-descr =================================================================== --- /dev/null +++ devel/hs-haskell-src-meta/pkg-descr @@ -0,0 +1,4 @@ +The translation from haskell-src-exts abstract syntax to template-haskell +abstract syntax. + +WWW: https://github.com/bmillwood/haskell-src-meta/ Index: devel/hs-haskell-src/Makefile =================================================================== --- devel/hs-haskell-src/Makefile +++ devel/hs-haskell-src/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haskell-src -PORTVERSION= 1.0.2.0 -PORTREVISION= 2 +PORTVERSION= 1.0.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haskell-src/distinfo =================================================================== --- devel/hs-haskell-src/distinfo +++ devel/hs-haskell-src/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627839 -SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6 -SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636 +TIMESTAMP = 1524150777 +SHA256 (cabal/haskell-src-1.0.3.0.tar.gz) = b4b4941e8883da32c3f2b93f3ecdd5cff82ff9304cb91e89850b19095c908dbc +SIZE (cabal/haskell-src-1.0.3.0.tar.gz) = 29863 Index: devel/hs-hastache/Makefile =================================================================== --- devel/hs-hastache/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -PORTNAME= hastache -PORTVERSION= 0.6.1 -PORTREVISION= 2 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell implementation of Mustache templates - -LICENSE= BSD3CLAUSE - -USE_CABAL= blaze-builder ieee754 mtl syb text - -EXECUTABLE= mkReadme - -INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR} - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: devel/hs-hastache/distinfo =================================================================== --- devel/hs-hastache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499627841 -SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464 -SIZE (cabal/hastache-0.6.1.tar.gz) = 16452 Index: devel/hs-hastache/files/patch-hastache.cabal =================================================================== --- devel/hs-hastache/files/patch-hastache.cabal +++ /dev/null @@ -1,29 +0,0 @@ ---- hastache.cabal.orig 2014-12-23 10:40:08 UTC -+++ hastache.cabal -@@ -27,7 +27,7 @@ extra-source-files: - executable mkReadme - main-is: mkReadme.hs - build-depends: hastache, process, -- base >=4 && <4.9 -+ base >=4.4 && <4.10 - ,bytestring - ,mtl - ,transformers -@@ -46,7 +46,7 @@ library - Text.Hastache.Context - - build-depends: -- base >=4 && <4.9 -+ base >=4.4 && <4.10 - ,bytestring - ,mtl - ,transformers -@@ -69,7 +69,7 @@ test-suite test-hastache - - build-depends: - hastache -- ,base >=4 && <4.9 -+ ,base >=4.4 && <4.10 - ,directory - ,mtl - ,HUnit Index: devel/hs-hastache/pkg-descr =================================================================== --- devel/hs-hastache/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Haskell implementation of Mustache templates [1]. - -[1] http://mustache.github.com/ - -WWW: https://github.com/lymar/hastache Index: devel/hs-hinotify/Makefile =================================================================== --- devel/hs-hinotify/Makefile +++ devel/hs-hinotify/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hinotify -PORTVERSION= 0.3.9 +PORTVERSION= 0.3.10 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify -USE_CABAL= async +USE_CABAL= async hashable .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-hinotify/distinfo =================================================================== --- devel/hs-hinotify/distinfo +++ devel/hs-hinotify/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627841 -SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99 -SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021 +TIMESTAMP = 1523460966 +SHA256 (cabal/hinotify-0.3.10.tar.gz) = af2b7d5733ab52ca38f0d9aed1ec37304f1d6964caa0fb556b8215858c1d5d9d +SIZE (cabal/hinotify-0.3.10.tar.gz) = 9193 Index: devel/hs-hint/Makefile =================================================================== --- devel/hs-hint/Makefile +++ devel/hs-hint/Makefile @@ -14,5 +14,7 @@ USE_CABAL= exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \ mtl random utf8-string +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-hlint/Makefile =================================================================== --- devel/hs-hlint/Makefile +++ devel/hs-hlint/Makefile @@ -15,5 +15,7 @@ EXECUTABLE= hlint +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-hoogle/Makefile =================================================================== --- devel/hs-hoogle/Makefile +++ devel/hs-hoogle/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hoogle -PORTVERSION= 5.0.12 -PORTREVISION= 1 +PORTVERSION= 5.0.17.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -14,8 +13,8 @@ USE_CABAL= aeson cmdargs conduit conduit-extra connection extra \ haskell-src-exts http-conduit http-types js-flot js-jquery \ mmap network network-uri old-locale process-extras QuickCheck \ - resourcet tar text uniplate utf8-string vector wai wai-logger \ - warp warp-tls zlib + resourcet storable-tuple tar uniplate utf8-string vector wai \ + wai-logger warp warp-tls zlib EXECUTABLE= hoogle Index: devel/hs-hoogle/distinfo =================================================================== --- devel/hs-hoogle/distinfo +++ devel/hs-hoogle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627842 -SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308 -SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464 +TIMESTAMP = 1525080726 +SHA256 (cabal/hoogle-5.0.17.3.tar.gz) = 66bebaf75600fef1c5fc0613ccc55c137aaed4c8f69653cf903f4fb003b98f9c +SIZE (cabal/hoogle-5.0.17.3.tar.gz) = 86528 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-hslua-module-text/Makefile =================================================================== --- devel/hs-hslua-module-text/Makefile +++ devel/hs-hslua-module-text/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= hslua -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTNAME= hslua-module-text +PORTVERSION= 0.1.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Lua language interpreter embedding in Haskell +COMMENT= Lua module for text LICENSE= MIT +USE_CABAL= hslua + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-hslua-module-text/distinfo =================================================================== --- /dev/null +++ devel/hs-hslua-module-text/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524943044 +SHA256 (cabal/hslua-module-text-0.1.2.1.tar.gz) = aeb384f9743b76360f3779e44065fe297fb60f27519933f203b75bd8c2ba8e2d +SIZE (cabal/hslua-module-text-0.1.2.1.tar.gz) = 3594 Index: devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal =================================================================== --- /dev/null +++ devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal @@ -0,0 +1,18 @@ +--- hslua-module-text.cabal.orig 2018-04-28 19:25:33 UTC ++++ hslua-module-text.cabal +@@ -20,7 +20,7 @@ source-repository head + + library + exposed-modules: Foreign.Lua.Module.Text +- build-depends: base >= 4.7 && < 4.11 ++ build-depends: base >= 4.7 && < 4.12 + , hslua >= 0.9 && < 0.10 + , text >= 1 && < 1.3 + hs-source-dirs: src +@@ -37,4 +37,4 @@ test-suite test-hslua + , hslua-module-text + , tasty + , tasty-hunit +- , text +\ No newline at end of file ++ , text \ No newline at end of file Index: devel/hs-hslua-module-text/pkg-descr =================================================================== --- /dev/null +++ devel/hs-hslua-module-text/pkg-descr @@ -0,0 +1,3 @@ +UTF-8 aware subset of Lua's string module. + +WWW: https://github.com/hslua/hslua-module-test Index: devel/hs-hslua/Makefile =================================================================== --- devel/hs-hslua/Makefile +++ devel/hs-hslua/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hslua -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.9.5.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ LICENSE= MIT +USE_CABAL= exceptions + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-hslua/distinfo =================================================================== --- devel/hs-hslua/distinfo +++ devel/hs-hslua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627844 -SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b -SIZE (cabal/hslua-0.5.0.tar.gz) = 132155 +TIMESTAMP = 1524940935 +SHA256 (cabal/hslua-0.9.5.1.tar.gz) = 681ffb1775e948143c0dd4be3086259f2eda8a9f7b09ce94016150c57e9d74d0 +SIZE (cabal/hslua-0.9.5.1.tar.gz) = 228252 Index: devel/hs-hslua/files/patch-hslua.cabal =================================================================== --- /dev/null +++ devel/hs-hslua/files/patch-hslua.cabal @@ -0,0 +1,12 @@ +--- hslua.cabal.orig 2018-04-28 18:45:32 UTC ++++ hslua.cabal +@@ -77,8 +77,7 @@ library + build-depends: base >= 4.7 && < 5 + , bytestring >= 0.10.2 && < 0.11 + , containers >= 0.5 && < 0.6 +- , exceptions >= 0.8 && < 0.10 +- , fail >= 4.9 && < 5 ++ , exceptions >= 0.8 && < 0.11 + , mtl >= 2.2 && < 2.3 + , text + exposed-modules: Foreign.Lua \ No newline at end of file Index: devel/hs-hspec-core/Makefile =================================================================== --- devel/hs-hspec-core/Makefile +++ devel/hs-hspec-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec-core -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= MIT -USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.7.1 \ +USE_CABAL= ansi-terminal>=0.5 async>=2 clock hspec-expectations>=0.7.1 \ HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random setenv \ tf-random Index: devel/hs-hspec-core/distinfo =================================================================== --- devel/hs-hspec-core/distinfo +++ devel/hs-hspec-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627845 -SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf -SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871 +TIMESTAMP = 1523960255 +SHA256 (cabal/hspec-core-2.5.0.tar.gz) = f2e5e1b6142eccda9dd9a03212cad691ceba6f66c99e01098bdfdd9c55d708dd +SIZE (cabal/hspec-core-2.5.0.tar.gz) = 55084 Index: devel/hs-hspec-discover/Makefile =================================================================== --- devel/hs-hspec-discover/Makefile +++ devel/hs-hspec-discover/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec-discover -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hspec-discover/distinfo =================================================================== --- devel/hs-hspec-discover/distinfo +++ devel/hs-hspec-discover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627846 -SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47 -SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942 +TIMESTAMP = 1525007543 +SHA256 (cabal/hspec-discover-2.5.0.tar.gz) = 3e47c07c9e131c0327ac732b600986d99cfdd42a3b6b68502c01d986617a21e5 +SIZE (cabal/hspec-discover-2.5.0.tar.gz) = 6699 Index: devel/hs-hspec/Makefile =================================================================== --- devel/hs-hspec/Makefile +++ devel/hs-hspec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hspec -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hspec/distinfo =================================================================== --- devel/hs-hspec/distinfo +++ devel/hs-hspec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627845 -SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21 -SIZE (cabal/hspec-2.4.4.tar.gz) = 10634 +TIMESTAMP = 1525007159 +SHA256 (cabal/hspec-2.5.0.tar.gz) = abeda4a3282b5a1d80809fd17554bcc1593554832a6b11366c7ae3b6d01c779b +SIZE (cabal/hspec-2.5.0.tar.gz) = 9013 Index: devel/hs-io-streams-haproxy/Makefile =================================================================== --- devel/hs-io-streams-haproxy/Makefile +++ devel/hs-io-streams-haproxy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= io-streams-haproxy -PORTVERSION= 1.0.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-io-streams-haproxy/distinfo =================================================================== --- devel/hs-io-streams-haproxy/distinfo +++ devel/hs-io-streams-haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499716472 -SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f -SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892 +TIMESTAMP = 1524413753 +SHA256 (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 77814f8258b5c32707a13e0d30ab2e144e7ad073aee821d6def65554024ed086 +SIZE (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 9888 Index: devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal =================================================================== --- devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal +++ devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal @@ -1,11 +1,11 @@ ---- io-streams-haproxy.cabal.orig 2017-07-10 20:00:53 UTC +--- io-streams-haproxy.cabal.orig 2018-04-22 16:18:46 UTC +++ io-streams-haproxy.cabal -@@ -38,7 +38,7 @@ library - build-depends: base >= 4.5 && < 4.10, +@@ -35,7 +35,7 @@ library + other-modules: System.IO.Streams.Network.Internal.Address + c-sources: cbits/byteorder.c + +- build-depends: base >= 4.5 && < 4.11, ++ build-depends: base >= 4.5 && < 4.12, attoparsec >= 0.7 && < 0.14, bytestring >= 0.9 && < 0.11, -- io-streams >= 1.3 && < 1.4, -+ io-streams >= 1.3 && < 1.5, - network >= 2.3 && < 2.7, - transformers >= 0.3 && < 0.6 - default-language: Haskell2010 + io-streams >= 1.3 && < 1.6, \ No newline at end of file Index: devel/hs-io-streams/Makefile =================================================================== --- devel/hs-io-streams/Makefile +++ devel/hs-io-streams/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= io-streams -PORTVERSION= 1.4.0.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec network primitive text vector zlib-bindings +USE_CABAL= attoparsec network primitive vector zlib-bindings .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-io-streams/distinfo =================================================================== --- devel/hs-io-streams/distinfo +++ devel/hs-io-streams/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499694762 -SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e -SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422 +TIMESTAMP = 1523904656 +SHA256 (cabal/io-streams-1.5.0.1.tar.gz) = 5dcb3717933197a84f31be74abf545126b3d25eb0e0d64f722c480d3c46b2c8b +SIZE (cabal/io-streams-1.5.0.1.tar.gz) = 62763 Index: devel/hs-io-streams/files/patch-io-streams.cabal =================================================================== --- devel/hs-io-streams/files/patch-io-streams.cabal +++ devel/hs-io-streams/files/patch-io-streams.cabal @@ -1,4 +1,4 @@ ---- io-streams.cabal.orig 2017-07-10 15:08:37 UTC +--- io-streams.cabal.orig 2018-04-16 18:57:41 UTC +++ io-streams.cabal @@ -122,7 +122,6 @@ Library Build-depends: base >= 4 && <5, @@ -7,12 +7,4 @@ - bytestring-builder >= 0.10 && <0.11, network >= 2.3 && <2.7, primitive >= 0.2 && <0.7, - process >= 1.1 && <1.7, -@@ -205,7 +204,6 @@ Test-suite testsuite - Build-depends: base >= 4 && <5, - attoparsec >= 0.10 && <0.14, - bytestring >= 0.9 && <0.11, -- bytestring-builder >= 0.10 && <0.11, - deepseq >= 1.2 && <1.5, - directory >= 1.1 && <2, - filepath >= 1.2 && <2, + process >= 1.1 && <1.7, \ No newline at end of file Index: devel/hs-keys/Makefile =================================================================== --- devel/hs-keys/Makefile +++ devel/hs-keys/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= keys -PORTVERSION= 3.11 -PORTREVISION= 1 +PORTVERSION= 3.12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-keys/distinfo =================================================================== --- devel/hs-keys/distinfo +++ devel/hs-keys/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627846 -SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2 -SIZE (cabal/keys-3.11.tar.gz) = 8674 +TIMESTAMP = 1523890076 +SHA256 (cabal/keys-3.12.tar.gz) = d4bfa78ff9df50224f1722925ae148279377193d04277a7dad224a47b34d5e55 +SIZE (cabal/keys-3.12.tar.gz) = 13353 Index: devel/hs-kqueue/files/patch-kqueue.cabal =================================================================== --- /dev/null +++ devel/hs-kqueue/files/patch-kqueue.cabal @@ -0,0 +1,16 @@ +--- kqueue.cabal.orig 2018-04-29 14:33:28 UTC ++++ kqueue.cabal +@@ -21,11 +21,11 @@ Library + Hs-Source-Dirs: src + Exposed-modules: System.KQueue + System.KQueue.HighLevel +- Build-depends: base >= 4.0 && < 4.10 ++ Build-depends: base >= 4.0 && < 4.12 + , directory >= 1.0 && < 1.4 + , filepath >= 1.1 && < 1.5 + , mtl >= 1.1 && < 2.3 +- , time >= 1.1 && < 1.7 ++ , time >= 1.1 && < 1.9 + , unix >= 2.3 && < 2.8 + Build-tools: c2hs + GHC-Options: -Wall \ No newline at end of file Index: devel/hs-language-c/Makefile =================================================================== --- devel/hs-language-c/Makefile +++ devel/hs-language-c/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= language-c -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-language-c/distinfo =================================================================== --- devel/hs-language-c/distinfo +++ devel/hs-language-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513181967 -SHA256 (cabal/language-c-0.7.1.tar.gz) = a7447123f9b3bec9319ee2a22b22d97f03acd6566b4f6caf5b9a1f71e4f7a9ca -SIZE (cabal/language-c-0.7.1.tar.gz) = 181648 +TIMESTAMP = 1523449230 +SHA256 (cabal/language-c-0.7.2.tar.gz) = 63ad22ddd8e51747c8d64239029cf4afd3e7d4060c9b9478145479f5d4d549e5 +SIZE (cabal/language-c-0.7.2.tar.gz) = 121429 Index: devel/hs-language-javascript/Makefile =================================================================== --- devel/hs-language-javascript/Makefile +++ devel/hs-language-javascript/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= language-javascript -PORTVERSION= 0.6.0.10 -PORTREVISION= 1 +PORTVERSION= 0.6.0.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-language-javascript/distinfo =================================================================== --- devel/hs-language-javascript/distinfo +++ devel/hs-language-javascript/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627848 -SHA256 (cabal/language-javascript-0.6.0.10.tar.gz) = caf14c410bf4463fda497af2b9ea750eddff34e55bc1cfc696f2fb4a36983e54 -SIZE (cabal/language-javascript-0.6.0.10.tar.gz) = 101770 +TIMESTAMP = 1523905950 +SHA256 (cabal/language-javascript-0.6.0.11.tar.gz) = d4756e9bc9a180cb93701e964a3157a03d4db4c7cb5a7b6b196067e587cc6143 +SIZE (cabal/language-javascript-0.6.0.11.tar.gz) = 106881 Index: devel/hs-lens/Makefile =================================================================== --- devel/hs-lens/Makefile +++ devel/hs-lens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lens -PORTVERSION= 4.15.3 -PORTREVISION= 1 +PORTVERSION= 4.16.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +9,11 @@ LICENSE= BSD3CLAUSE -USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=4 \ +USE_CABAL= base-orphans>=0.3 bifunctors>=5 call-stack comonad>=4 \ contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \ free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \ parallel>=3.1.0.1 profunctors>=5 reflection>=2 \ - semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \ + semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 \ th-abstraction transformers-compat>=0.4 unordered-containers>=0.2.4 \ vector>=0.9 void>=0.5 Index: devel/hs-lens/distinfo =================================================================== --- devel/hs-lens/distinfo +++ devel/hs-lens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627850 -SHA256 (cabal/lens-4.15.3.tar.gz) = a2613bb987792da597b514c979636882931d46c596b37d5fbbcdb63bed30cd7e -SIZE (cabal/lens-4.15.3.tar.gz) = 985354 +TIMESTAMP = 1524407577 +SHA256 (cabal/lens-4.16.1.tar.gz) = f5bec97b1d5cf3d6487afebc79b927bd5a18f1fd594b104de36a35bf606ea4c6 +SIZE (cabal/lens-4.16.1.tar.gz) = 991132 Index: devel/hs-lifted-async/Makefile =================================================================== --- devel/hs-lifted-async/Makefile +++ devel/hs-lifted-async/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lifted-async -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 0.10.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-lifted-async/distinfo =================================================================== --- devel/hs-lifted-async/distinfo +++ devel/hs-lifted-async/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499608443 -SHA256 (cabal/lifted-async-0.9.3.tar.gz) = 97978307f34c8ab1d765724d723a13fede4112a94fe5fbf3494f00378961b461 -SIZE (cabal/lifted-async-0.9.3.tar.gz) = 10321 +TIMESTAMP = 1523785768 +SHA256 (cabal/lifted-async-0.10.0.1.tar.gz) = 0d925b16fffe6fb3db994165401aeb0752595d1feec3011eba5b8b2c8524c4b1 +SIZE (cabal/lifted-async-0.10.0.1.tar.gz) = 10129 Index: devel/hs-map-syntax/Makefile =================================================================== --- devel/hs-map-syntax/Makefile +++ devel/hs-map-syntax/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= map-syntax -PORTVERSION= 0.2.0.2 -PORTREVISION= 1 +PORTVERSION= 0.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-map-syntax/distinfo =================================================================== --- devel/hs-map-syntax/distinfo +++ devel/hs-map-syntax/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627850 -SHA256 (cabal/map-syntax-0.2.0.2.tar.gz) = b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a -SIZE (cabal/map-syntax-0.2.0.2.tar.gz) = 6944 +TIMESTAMP = 1523633771 +SHA256 (cabal/map-syntax-0.3.tar.gz) = 9330065755202de07809fb23605da43d0fd0e25d72915ce22b5c6994526c6d2c +SIZE (cabal/map-syntax-0.3.tar.gz) = 7104 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-microlens-th/Makefile =================================================================== --- devel/hs-microlens-th/Makefile +++ devel/hs-microlens-th/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microlens-th -PORTVERSION= 0.4.1.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= microlens +USE_CABAL= microlens th-abstraction .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-microlens-th/distinfo =================================================================== --- devel/hs-microlens-th/distinfo +++ devel/hs-microlens-th/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499789717 -SHA256 (cabal/microlens-th-0.4.1.1.tar.gz) = 5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b -SIZE (cabal/microlens-th-0.4.1.1.tar.gz) = 16406 +TIMESTAMP = 1523954941 +SHA256 (cabal/microlens-th-0.4.2.1.tar.gz) = ec57108e9ab54c085dd316b60ac156e6624078a46682a60ed2462005cae4fc42 +SIZE (cabal/microlens-th-0.4.2.1.tar.gz) = 20972 Index: devel/hs-microlens/Makefile =================================================================== --- devel/hs-microlens/Makefile +++ devel/hs-microlens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microlens -PORTVERSION= 0.4.8.0 -PORTREVISION= 1 +PORTVERSION= 0.4.9.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-microlens/distinfo =================================================================== --- devel/hs-microlens/distinfo +++ devel/hs-microlens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499703416 -SHA256 (cabal/microlens-0.4.8.0.tar.gz) = aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5 -SIZE (cabal/microlens-0.4.8.0.tar.gz) = 24766 +TIMESTAMP = 1523449015 +SHA256 (cabal/microlens-0.4.9.1.tar.gz) = a1401c6f92c142bafea4cf58a1d99cc34af285df808b97f5b64af4bb81fb5648 +SIZE (cabal/microlens-0.4.9.1.tar.gz) = 25185 Index: devel/hs-microstache/Makefile =================================================================== --- devel/hs-microstache/Makefile +++ devel/hs-microstache/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= microstache -PORTVERSION= 1 -PORTREVISION= 1 +PORTVERSION= 1.0.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson parsec semigroups text unordered-containers vector +USE_CABAL= aeson semigroups unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-microstache/distinfo =================================================================== --- devel/hs-microstache/distinfo +++ devel/hs-microstache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499618263 -SHA256 (cabal/microstache-1.tar.gz) = e8875bfeac9e54e84d7c91f1f448ee80ec07b9b3db28d5369131fbaa20517164 -SIZE (cabal/microstache-1.tar.gz) = 19859 +TIMESTAMP = 1524430537 +SHA256 (cabal/microstache-1.0.1.1.tar.gz) = 5de98542313eb75f84961366ff8a70ed632387ba6518215035b2dd1b32d6a120 +SIZE (cabal/microstache-1.0.1.1.tar.gz) = 20449 Index: devel/hs-microstache/files/patch-microstache.cabal =================================================================== --- /dev/null +++ devel/hs-microstache/files/patch-microstache.cabal @@ -0,0 +1,11 @@ +--- microstache.cabal.orig 2018-04-22 20:59:09 UTC ++++ microstache.cabal +@@ -40,7 +40,7 @@ source-repository head + + library + build-depends: +- aeson >=0.11 && < 1.3, ++ aeson >=0.11 && < 1.4, + base >=4.5 && < 5.0, + bytestring >=0.9.2.1 && < 0.11, + containers >=0.4.2.1 && < 0.6, \ No newline at end of file Index: devel/hs-monad-logger/Makefile =================================================================== --- devel/hs-monad-logger/Makefile +++ devel/hs-monad-logger/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= monad-logger -PORTVERSION= 0.3.24 +PORTVERSION= 0.3.28.5 PORTREVISION= 1 CATEGORIES= devel haskell @@ -12,7 +12,7 @@ USE_CABAL= blaze-builder conduit>=1.0 conduit-extra>=1.0 exceptions \ fast-logger>=2.0 lifted-base monad-control monad-loops \ - mtl resourcet>=0.4 stm stm-chans text transformers-base + mtl resourcet>=0.4 stm-chans transformers-base .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-monad-logger/distinfo =================================================================== --- devel/hs-monad-logger/distinfo +++ devel/hs-monad-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499595500 -SHA256 (cabal/monad-logger-0.3.24.tar.gz) = 05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4 -SIZE (cabal/monad-logger-0.3.24.tar.gz) = 9525 +TIMESTAMP = 1524399749 +SHA256 (cabal/monad-logger-0.3.28.5.tar.gz) = 225ed7cd2d0d375c0207d5d3b9faa12b339ca7dd51ca92f96d3eaf2d360027f1 +SIZE (cabal/monad-logger-0.3.28.5.tar.gz) = 10720 Index: devel/hs-monadplus/Makefile =================================================================== --- devel/hs-monadplus/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -PORTNAME= monadplus -PORTVERSION= 1.4.2 -PORTREVISION= 1 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell98 partial maps and filters over MonadPlus - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: devel/hs-monadplus/distinfo =================================================================== --- devel/hs-monadplus/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1500997085 -SHA256 (cabal/monadplus-1.4.2.tar.gz) = 366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595 -SIZE (cabal/monadplus-1.4.2.tar.gz) = 3671 Index: devel/hs-monadplus/pkg-descr =================================================================== --- devel/hs-monadplus/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Filtering and folding over arbitrary MonadPlus instances. This package -generalizes many common stream operations such as filter, catMaybes etc. - -WWW: http://hackage.haskell.org/package/monadplus - Index: devel/hs-mono-traversable/Makefile =================================================================== --- devel/hs-mono-traversable/Makefile +++ devel/hs-mono-traversable/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mono-traversable -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.8.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \ - semigroupoids>=3.0 semigroups>=0.10 split text>=0.11 \ + semigroupoids>=3.0 semigroups>=0.10 split \ unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \ vector-instances Index: devel/hs-mono-traversable/distinfo =================================================================== --- devel/hs-mono-traversable/distinfo +++ devel/hs-mono-traversable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627851 -SHA256 (cabal/mono-traversable-1.0.2.tar.gz) = aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633 -SIZE (cabal/mono-traversable-1.0.2.tar.gz) = 38239 +TIMESTAMP = 1523892095 +SHA256 (cabal/mono-traversable-1.0.8.1.tar.gz) = 991290797bd77ce2f2e23dd5dea32fb159c6cb9310615f64a0703ea4c6373935 +SIZE (cabal/mono-traversable-1.0.8.1.tar.gz) = 39037 Index: devel/hs-ncurses/Makefile =================================================================== --- devel/hs-ncurses/Makefile +++ devel/hs-ncurses/Makefile @@ -3,7 +3,7 @@ PORTNAME= ncurses PORTVERSION= 0.2.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,6 @@ LICENSE= GPLv3 USE_C2HS= yes -USE_CABAL= text USES= ncurses Index: devel/hs-newtype-generics/Makefile =================================================================== --- devel/hs-newtype-generics/Makefile +++ devel/hs-newtype-generics/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= newtype-generics -PORTVERSION= 0.5 -PORTREVISION= 1 +PORTVERSION= 0.5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-newtype-generics/distinfo =================================================================== --- devel/hs-newtype-generics/distinfo +++ devel/hs-newtype-generics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499700022 -SHA256 (cabal/newtype-generics-0.5.tar.gz) = dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c -SIZE (cabal/newtype-generics-0.5.tar.gz) = 4490 +TIMESTAMP = 1523473191 +SHA256 (cabal/newtype-generics-0.5.3.tar.gz) = f295f001a86bdbcf759d6b91b9e7ae27cd431ccf41d9b9d34ee1c926b88efe45 +SIZE (cabal/newtype-generics-0.5.3.tar.gz) = 6956 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-preprocessor-tools/Makefile =================================================================== --- devel/hs-preprocessor-tools/Makefile +++ devel/hs-preprocessor-tools/Makefile @@ -10,7 +10,9 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=1 parsec>=3 syb>=0 +USE_CABAL= mtl>=1 syb>=0 + +IGNORE= Doesn't build with recent GHC version .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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-process-extras/Makefile =================================================================== --- devel/hs-process-extras/Makefile +++ devel/hs-process-extras/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= process-extras -PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTVERSION= 0.7.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= data-default generic-deriving ListLike mtl text +USE_CABAL= data-default generic-deriving ListLike mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-process-extras/distinfo =================================================================== --- devel/hs-process-extras/distinfo +++ devel/hs-process-extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499719583 -SHA256 (cabal/process-extras-0.7.2.tar.gz) = e76c1031ec696dcd25b05f1b00611585a40050aa30548394d084a72267a8e958 -SIZE (cabal/process-extras-0.7.2.tar.gz) = 14267 +TIMESTAMP = 1523957985 +SHA256 (cabal/process-extras-0.7.4.tar.gz) = 293e75f849254ce0ce0d7fa659681917e07a557c602505a2f9e20777467e984e +SIZE (cabal/process-extras-0.7.4.tar.gz) = 14256 Index: devel/hs-profunctors/Makefile =================================================================== --- devel/hs-profunctors/Makefile +++ devel/hs-profunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= profunctors -PORTVERSION= 5.2 -PORTREVISION= 1 +PORTVERSION= 5.2.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-profunctors/distinfo =================================================================== --- devel/hs-profunctors/distinfo +++ devel/hs-profunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499595371 -SHA256 (cabal/profunctors-5.2.tar.gz) = 87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4 -SIZE (cabal/profunctors-5.2.tar.gz) = 23236 +TIMESTAMP = 1523817696 +SHA256 (cabal/profunctors-5.2.2.tar.gz) = e981e6a33ac99d38a947a749179bbea3c294ecf6bfde41660fe6d8d5a2e43768 +SIZE (cabal/profunctors-5.2.2.tar.gz) = 28155 Index: devel/hs-profunctors/files/patch-git_c0574c =================================================================== --- devel/hs-profunctors/files/patch-git_c0574c +++ /dev/null @@ -1,22 +0,0 @@ -From c0574c91a459083066d656bec39e67dfa02daf06 Mon Sep 17 00:00:00 2001 -From: Ryan Scott -Date: Mon, 10 Apr 2017 09:41:23 -0400 -Subject: [PATCH] Bump base-orphans upper version bounds - ---- - profunctors.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/profunctors.cabal b/profunctors.cabal -index 1233e734..8f94e27c 100644 ---- profunctors.cabal -+++ profunctors.cabal -@@ -30,7 +30,7 @@ source-repository head - library - build-depends: - base >= 4 && < 5, -- base-orphans >= 0.4 && < 0.6, -+ base-orphans >= 0.4 && < 0.7, - bifunctors >= 5.2 && < 6, - comonad >= 4 && < 6, - contravariant >= 1 && < 2, Index: devel/hs-project-template/Makefile =================================================================== --- devel/hs-project-template/Makefile +++ devel/hs-project-template/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= project-template -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.2.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \ - resourcet>=0.4.3 text>=0.11 + resourcet>=0.4.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-project-template/distinfo =================================================================== --- devel/hs-project-template/distinfo +++ devel/hs-project-template/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627854 -SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310 -SIZE (cabal/project-template-0.2.0.tar.gz) = 8251 +TIMESTAMP = 1524430893 +SHA256 (cabal/project-template-0.2.0.1.tar.gz) = eb52496fa7448f5fed445525c05327b31a45282fc1d0a772c7022a9809e7c9dc +SIZE (cabal/project-template-0.2.0.1.tar.gz) = 8321 Index: devel/hs-psqueues/Makefile =================================================================== --- devel/hs-psqueues/Makefile +++ devel/hs-psqueues/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= psqueues -PORTVERSION= 0.2.3.0 -PORTREVISION= 1 +PORTVERSION= 0.2.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-psqueues/distinfo =================================================================== --- devel/hs-psqueues/distinfo +++ devel/hs-psqueues/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499689628 -SHA256 (cabal/psqueues-0.2.3.0.tar.gz) = 25ed95de5de62831d3e1db47aabd0b589ddf71aeec2d53bc3104a9bb663743a7 -SIZE (cabal/psqueues-0.2.3.0.tar.gz) = 26646 +TIMESTAMP = 1523432363 +SHA256 (cabal/psqueues-0.2.6.0.tar.gz) = 9a6a10c99a64617bdab28331bed4a77cdd373283ebc2a6f73eda488462d06958 +SIZE (cabal/psqueues-0.2.6.0.tar.gz) = 27266 Index: devel/hs-readable/Makefile =================================================================== --- devel/hs-readable/Makefile +++ devel/hs-readable/Makefile @@ -2,7 +2,7 @@ PORTNAME= readable PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-reflection/Makefile =================================================================== --- devel/hs-reflection/Makefile +++ devel/hs-reflection/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= reflection -PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTVERSION= 2.1.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-reflection/distinfo =================================================================== --- devel/hs-reflection/distinfo +++ devel/hs-reflection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627855 -SHA256 (cabal/reflection-2.1.2.tar.gz) = a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39 -SIZE (cabal/reflection-2.1.2.tar.gz) = 14334 +TIMESTAMP = 1523900374 +SHA256 (cabal/reflection-2.1.3.tar.gz) = 88f81923abd7211e51de7071cd5800b30784e374c193de8cdd7b1c201f8de405 +SIZE (cabal/reflection-2.1.3.tar.gz) = 18085 Index: devel/hs-resource-pool/Makefile =================================================================== --- devel/hs-resource-pool/Makefile +++ devel/hs-resource-pool/Makefile @@ -2,7 +2,7 @@ PORTNAME= resource-pool PORTVERSION= 0.2.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable monad-control>=0.2.0.1 stm>=2.3 \ - transformers-base>=0.4 vector>=0.7 +USE_CABAL= hashable monad-control>=0.2.0.1 transformers-base>=0.4 \ + vector>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-resourcet/Makefile =================================================================== --- devel/hs-resourcet/Makefile +++ devel/hs-resourcet/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= resourcet -PORTVERSION= 1.1.9 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,8 @@ LICENSE= BSD3CLAUSE USE_CABAL= exceptions lifted-base mmorph monad-control mtl \ - transformers-base transformers-compat + primitive transformers-base transformers-compat \ + unliftio-core .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-resourcet/distinfo =================================================================== --- devel/hs-resourcet/distinfo +++ devel/hs-resourcet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499458469 -SHA256 (cabal/resourcet-1.1.9.tar.gz) = 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5 -SIZE (cabal/resourcet-1.1.9.tar.gz) = 15215 +TIMESTAMP = 1523696873 +SHA256 (cabal/resourcet-1.2.1.tar.gz) = e765c12a6ec0f70efc3c938750060bc17569b99578aa635fd4da0c4d06fcf267 +SIZE (cabal/resourcet-1.2.1.tar.gz) = 16459 Index: devel/hs-safe-exceptions/Makefile =================================================================== --- devel/hs-safe-exceptions/Makefile +++ devel/hs-safe-exceptions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= safe-exceptions -PORTVERSION= 0.1.6.0 -PORTREVISION= 1 +PORTVERSION= 0.1.7.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-safe-exceptions/distinfo =================================================================== --- devel/hs-safe-exceptions/distinfo +++ devel/hs-safe-exceptions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499717912 -SHA256 (cabal/safe-exceptions-0.1.6.0.tar.gz) = 71d47ce1049465b02d89231f2931e7a1d22b6960e85fca5281162e979cf08d1c -SIZE (cabal/safe-exceptions-0.1.6.0.tar.gz) = 13447 +TIMESTAMP = 1523650633 +SHA256 (cabal/safe-exceptions-0.1.7.0.tar.gz) = 18cddc587b52b6faa0287fb6ad6c964d1562571ea2c8ff57a194dd54b5fba069 +SIZE (cabal/safe-exceptions-0.1.7.0.tar.gz) = 13533 Index: devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal =================================================================== --- /dev/null +++ devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal @@ -0,0 +1,13 @@ +--- safe-exceptions.cabal.orig 2018-04-13 20:24:13 UTC ++++ safe-exceptions.cabal +@@ -16,9 +16,9 @@ cabal-version: >=1.10 + library + hs-source-dirs: src + exposed-modules: Control.Exception.Safe +- build-depends: base >= 4.7 && < 4.11 ++ build-depends: base >= 4.7 && < 4.12 + , deepseq >= 1.2 && < 1.5 +- , exceptions >= 0.8 && < 0.9 ++ , exceptions >= 0.8 && < 0.11 + , transformers >= 0.2 && < 0.6 + default-language: Haskell2010 Index: devel/hs-say/Makefile =================================================================== --- devel/hs-say/Makefile +++ devel/hs-say/Makefile @@ -2,7 +2,7 @@ PORTNAME= say PORTVERSION= 0.1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-scientific/Makefile =================================================================== --- devel/hs-scientific/Makefile +++ devel/hs-scientific/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= scientific -PORTVERSION= 0.3.5.1 -PORTREVISION= 1 +PORTVERSION= 0.3.5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.2 text>=0.8 integer-logarithms vector +USE_CABAL= hashable>=1.1.2 integer-logarithms vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-scientific/distinfo =================================================================== --- devel/hs-scientific/distinfo +++ devel/hs-scientific/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627855 -SHA256 (cabal/scientific-0.3.5.1.tar.gz) = 5ba6e682cbb6cd5c6444d1c6c35f3b396e316637a14456b18de58c9a33661ba6 -SIZE (cabal/scientific-0.3.5.1.tar.gz) = 20777 +TIMESTAMP = 1523636073 +SHA256 (cabal/scientific-0.3.5.3.tar.gz) = 12a6d13417c24e4b7f905d6cd8dcd1d9ae51f6f7ba3fda13057d521c8fc2c748 +SIZE (cabal/scientific-0.3.5.3.tar.gz) = 21013 Index: devel/hs-securemem/Makefile =================================================================== --- devel/hs-securemem/Makefile +++ devel/hs-securemem/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= securemem -PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTVERSION= 0.1.10 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= byteable>=0.1.1 memory>=0.7 +USE_CABAL= basement byteable>=0.1.1 foundation memory>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-securemem/distinfo =================================================================== --- devel/hs-securemem/distinfo +++ devel/hs-securemem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036 -SIZE (cabal/securemem-0.1.9.tar.gz) = 4180 +TIMESTAMP = 1523431880 +SHA256 (cabal/securemem-0.1.10.tar.gz) = 32895a4748508da58207b4867266601af6259b7109af80bbf5d2e9e598e016a6 +SIZE (cabal/securemem-0.1.10.tar.gz) = 3801 Index: devel/hs-setlocale/Makefile =================================================================== --- devel/hs-setlocale/Makefile +++ devel/hs-setlocale/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= setlocale -PORTVERSION= 1.0.0.5 -PORTREVISION= 1 +PORTVERSION= 1.0.0.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-setlocale/distinfo =================================================================== --- devel/hs-setlocale/distinfo +++ devel/hs-setlocale/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/setlocale-1.0.0.5.tar.gz) = 57438491475004eda12d7a73eea0ab1c5fb28774027626e5bbcb142fe57d9ff0 -SIZE (cabal/setlocale-1.0.0.5.tar.gz) = 2108 +TIMESTAMP = 1523637605 +SHA256 (cabal/setlocale-1.0.0.6.tar.gz) = 587af63153c1f3642de2c2f526b3a3c82c46ece3bd09ffd96a0eedbfd1c288e6 +SIZE (cabal/setlocale-1.0.0.6.tar.gz) = 2113 Index: devel/hs-shake/Makefile =================================================================== --- devel/hs-shake/Makefile +++ devel/hs-shake/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shake -PORTVERSION= 0.15.11 -PORTREVISION= 1 +PORTVERSION= 0.16.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= extra>=1.3 hashable>=1.1.2.3 js-flot js-jquery old-time \ - random unordered-containers>=0.2.1 utf8-string>=0.3 + primitive random unordered-containers>=0.2.1 utf8-string>=0.3 EXECUTABLE= shake Index: devel/hs-shake/distinfo =================================================================== --- devel/hs-shake/distinfo +++ devel/hs-shake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544643 -SHA256 (cabal/shake-0.15.11.tar.gz) = 05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb -SIZE (cabal/shake-0.15.11.tar.gz) = 513926 +TIMESTAMP = 1525012625 +SHA256 (cabal/shake-0.16.4.tar.gz) = b732a3a46ceb3b4545a78c3733e0a7904763e7cd3ee8bf4fe2e1e91f2c9b1436 +SIZE (cabal/shake-0.16.4.tar.gz) = 531091 Index: devel/hs-simple-reflect/Makefile =================================================================== --- devel/hs-simple-reflect/Makefile +++ devel/hs-simple-reflect/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= simple-reflect -PORTVERSION= 0.3.2 -PORTREVISION= 4 +PORTVERSION= 0.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-simple-reflect/distinfo =================================================================== --- devel/hs-simple-reflect/distinfo +++ devel/hs-simple-reflect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627856 -SHA256 (cabal/simple-reflect-0.3.2.tar.gz) = 38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6 -SIZE (cabal/simple-reflect-0.3.2.tar.gz) = 4492 +TIMESTAMP = 1523698837 +SHA256 (cabal/simple-reflect-0.3.3.tar.gz) = 07825ea04c135298008cf080133e3bfc8e04cbacd24719c46ac6a2ca4acfdb2b +SIZE (cabal/simple-reflect-0.3.3.tar.gz) = 4590 Index: devel/hs-split/Makefile =================================================================== --- devel/hs-split/Makefile +++ devel/hs-split/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= split -PORTVERSION= 0.2.3.2 -PORTREVISION= 1 +PORTVERSION= 0.2.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-split/distinfo =================================================================== --- devel/hs-split/distinfo +++ devel/hs-split/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447103 -SHA256 (cabal/split-0.2.3.2.tar.gz) = 4943eaad0dd473d44b4b97b8b9731c20f05ba86abb8a1fa07f8df819f09eb63a -SIZE (cabal/split-0.2.3.2.tar.gz) = 15779 +TIMESTAMP = 1523445494 +SHA256 (cabal/split-0.2.3.3.tar.gz) = 1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413 +SIZE (cabal/split-0.2.3.3.tar.gz) = 15681 Index: devel/hs-stm-chans/Makefile =================================================================== --- devel/hs-stm-chans/Makefile +++ devel/hs-stm-chans/Makefile @@ -2,7 +2,7 @@ PORTNAME= stm-chans PORTVERSION= 3.0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.4 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-stm/distinfo =================================================================== --- devel/hs-stm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1498678463 -SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384 -SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367 Index: devel/hs-stm/pkg-descr =================================================================== --- devel/hs-stm/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A modular composable concurrency abstraction. - -WWW: http://hackage.haskell.org/package/stm Index: devel/hs-storable-record/Makefile =================================================================== --- devel/hs-storable-record/Makefile +++ devel/hs-storable-record/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= activehs-base -PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTNAME= storable-record +PORTVERSION= 0.0.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Basic definitions for activehs +COMMENT= Elegant definition of Storable instances for records LICENSE= BSD3CLAUSE -USE_CABAL= QuickCheck>=2.4 +USE_CABAL= semigroups utility-ht .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-storable-record/distinfo =================================================================== --- /dev/null +++ devel/hs-storable-record/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525082358 +SHA256 (cabal/storable-record-0.0.4.tar.gz) = ceffb2f08d8abc37e338ad924b264c230d5e54ecccaf1c22802c3107ea0c5a42 +SIZE (cabal/storable-record-0.0.4.tar.gz) = 7362 Index: devel/hs-storable-record/pkg-descr =================================================================== --- /dev/null +++ devel/hs-storable-record/pkg-descr @@ -0,0 +1,6 @@ +With this package you can build a Storable instance of a record type from +Storable instances of its elements in an elegant way. It does not do any magic, +just a bit arithmetic to compute the right offsets, that would be otherwise +done manually or by a preprocessor like C2HS. + +WWW: http://code.haskell.org/~thielema/storable-record/ Index: devel/hs-storable-tuple/Makefile =================================================================== --- devel/hs-storable-tuple/Makefile +++ devel/hs-storable-tuple/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= activehs-base -PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTNAME= storable-tuple +PORTVERSION= 0.0.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Basic definitions for activehs +COMMENT= Storable instance for pairs and triples LICENSE= BSD3CLAUSE -USE_CABAL= QuickCheck>=2.4 +USE_CABAL= base-orphans storable-record utility-ht .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-storable-tuple/distinfo =================================================================== --- /dev/null +++ devel/hs-storable-tuple/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525081601 +SHA256 (cabal/storable-tuple-0.0.3.3.tar.gz) = dcfac049527a45c386c80a7c40ec211455b83d74311af88fa686063b5f87df35 +SIZE (cabal/storable-tuple-0.0.3.3.tar.gz) = 2383 Index: devel/hs-storable-tuple/pkg-descr =================================================================== --- /dev/null +++ devel/hs-storable-tuple/pkg-descr @@ -0,0 +1,6 @@ +Provides a Storable instance for pair and triple which should be binary +compatible with C99 and C++. The only purpose of this package is to provide +a standard location for this instance so that other packages needing this +instance can play nicely together. + +WWW: http://code.haskell.org/~thielema/storable-tuple/ Index: devel/hs-streaming-commons/Makefile =================================================================== --- devel/hs-streaming-commons/Makefile +++ devel/hs-streaming-commons/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= streaming-commons -PORTVERSION= 0.1.18 +PORTVERSION= 0.2.0.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= async blaze-builder network random stm text zlib +USE_CABAL= async blaze-builder network random zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-streaming-commons/distinfo =================================================================== --- devel/hs-streaming-commons/distinfo +++ devel/hs-streaming-commons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627857 -SHA256 (cabal/streaming-commons-0.1.18.tar.gz) = 27af2efb901a003c83fc6c71563eb70f45b4823516c299759d800a48d9f083cb -SIZE (cabal/streaming-commons-0.1.18.tar.gz) = 87832 +TIMESTAMP = 1523696417 +SHA256 (cabal/streaming-commons-0.2.0.0.tar.gz) = f4e2b8460325c133c83d04048e334fb502ba3627f41ffc85c05f81f1f38ace5f +SIZE (cabal/streaming-commons-0.2.0.0.tar.gz) = 86501 Index: devel/hs-syb-with-class/Makefile =================================================================== --- devel/hs-syb-with-class/Makefile +++ devel/hs-syb-with-class/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= syb-with-class -PORTVERSION= 0.6.1.7 -PORTREVISION= 1 +PORTVERSION= 0.6.1.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-syb-with-class/distinfo =================================================================== --- devel/hs-syb-with-class/distinfo +++ devel/hs-syb-with-class/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448315 -SHA256 (cabal/syb-with-class-0.6.1.7.tar.gz) = 5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb -SIZE (cabal/syb-with-class-0.6.1.7.tar.gz) = 12524 +TIMESTAMP = 1524154298 +SHA256 (cabal/syb-with-class-0.6.1.9.tar.gz) = 06a96de923d9e67e4399fab5ddcc792cefcc7e87d5c6b72a648ba6c0fedffbaa +SIZE (cabal/syb-with-class-0.6.1.9.tar.gz) = 12526 Index: devel/hs-system-fileio/Makefile =================================================================== --- devel/hs-system-fileio/Makefile +++ devel/hs-system-fileio/Makefile @@ -2,7 +2,7 @@ PORTNAME= system-fileio PORTVERSION= 0.3.16.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= system-filepath>=0.3.1 text>=0.7.1 +USE_CABAL= system-filepath>=0.3.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-system-filepath/Makefile =================================================================== --- devel/hs-system-filepath/Makefile +++ devel/hs-system-filepath/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= system-filepath -PORTVERSION= 0.4.13.4 -PORTREVISION= 2 +PORTVERSION= 0.4.14 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ LICENSE= MIT -USE_CABAL= text>=0.11.0.6 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-system-filepath/distinfo =================================================================== --- devel/hs-system-filepath/distinfo +++ devel/hs-system-filepath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627858 -SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb -SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590 +TIMESTAMP = 1523433190 +SHA256 (cabal/system-filepath-0.4.14.tar.gz) = 1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993 +SIZE (cabal/system-filepath-0.4.14.tar.gz) = 16663 Index: devel/hs-tagged/Makefile =================================================================== --- devel/hs-tagged/Makefile +++ devel/hs-tagged/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagged PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-tagged/files/patch-tagged.cabal =================================================================== --- devel/hs-tagged/files/patch-tagged.cabal +++ devel/hs-tagged/files/patch-tagged.cabal @@ -5,7 +5,7 @@ if impl(ghc>=7.6) exposed-modules: Data.Proxy.TH - build-depends: template-haskell >= 2.8 && < 2.12 -+ build-depends: template-haskell >= 2.8 && < 2.13 ++ build-depends: template-haskell >= 2.8 && < 2.14 if flag(deepseq) build-depends: deepseq >= 1.1 && < 1.5 Index: devel/hs-test-framework/Makefile =================================================================== --- devel/hs-test-framework/Makefile +++ devel/hs-test-framework/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= test-framework -PORTVERSION= 0.8.1.1 -PORTREVISION= 2 +PORTVERSION= 0.8.2.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-test-framework/distinfo =================================================================== --- devel/hs-test-framework/distinfo +++ devel/hs-test-framework/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627859 -SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273 -SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900 +TIMESTAMP = 1523960922 +SHA256 (cabal/test-framework-0.8.2.0.tar.gz) = f5aec7a15dbcb39e951bcf6502606fd99d751197b5510f41706899aa7e660ac2 +SIZE (cabal/test-framework-0.8.2.0.tar.gz) = 21317 Index: devel/hs-test-framework/files/patch-test-framework.cabal =================================================================== --- devel/hs-test-framework/files/patch-test-framework.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- test-framework.cabal.orig 2017-07-08 19:34:13 UTC -+++ test-framework.cabal -@@ -50,7 +50,7 @@ Library - base >= 4.3 && < 5, random >= 1.0, containers >= 0.1, - regex-posix >= 0.72, - old-locale >= 1.0, -- time >= 1.1.2 && < 1.6, -+ time >= 1.1.2 && < 1.7, - xml >= 1.3.5, hostname >= 1.0 - - Extensions: CPP 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= 9 +PORTREVISION= 10 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-short/Makefile =================================================================== --- devel/hs-text-short/Makefile +++ devel/hs-text-short/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= text-short -PORTVERSION= 0.1 -PORTREVISION= 1 +PORTVERSION= 0.1.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable semigroups text +USE_CABAL= hashable semigroups .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-text-short/distinfo =================================================================== --- devel/hs-text-short/distinfo +++ devel/hs-text-short/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546701 -SHA256 (cabal/text-short-0.1.tar.gz) = c06af3e53c345fa50df8e30589d854c84d212787eba648e6ded9b794e0df937e -SIZE (cabal/text-short-0.1.tar.gz) = 6048 +TIMESTAMP = 1523958157 +SHA256 (cabal/text-short-0.1.2.tar.gz) = b3f2b867d14c7c2586ea580028606b6662293ad080726d5241def937e5e31167 +SIZE (cabal/text-short-0.1.2.tar.gz) = 23454 Index: devel/hs-text/Makefile =================================================================== --- devel/hs-text/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PORTNAME= text -PORTVERSION= 1.2.2.2 -PORTREVISION= 1 -CATEGORIES= devel haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Efficient packed Unicode text type - -LICENSE= BSD3CLAUSE - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: devel/hs-text/distinfo =================================================================== --- devel/hs-text/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499546607 -SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9 -SIZE (cabal/text-1.2.2.2.tar.gz) = 151048 Index: devel/hs-text/pkg-descr =================================================================== --- devel/hs-text/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -An efficient packed, immutable Unicode text type (both strict and lazy), -with a powerful loop fusion optimization framework. - -The Text type represents Unicode character strings, in a time and -space-efficient manner. This package provides text processing -capabilities that are optimized for performance critical use, both in -terms of large data quantities and high speed. - -The Text type provides character-encoding, type-safe case conversion via -whole-string case conversion functions. It also provides a range of -functions for converting Text values to and from ByteStrings, using -several standard encodings. - -Efficient locale-sensitive support for text IO is also supported. - -WWW: https://github.com/bos/text Index: devel/hs-th-abstraction/Makefile =================================================================== --- devel/hs-th-abstraction/Makefile +++ devel/hs-th-abstraction/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= th-abstraction -PORTVERSION= 0.2.3.0 -PORTREVISION= 1 +PORTVERSION= 0.2.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-th-abstraction/distinfo =================================================================== --- devel/hs-th-abstraction/distinfo +++ devel/hs-th-abstraction/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499694293 -SHA256 (cabal/th-abstraction-0.2.3.0.tar.gz) = 954bf25a4d558242970b2085333b2fb8811d2a926354a5d237a2db9c0718de03 -SIZE (cabal/th-abstraction-0.2.3.0.tar.gz) = 22183 +TIMESTAMP = 1523446140 +SHA256 (cabal/th-abstraction-0.2.6.0.tar.gz) = e52e289a547d68f203d65f2e63ec2d87a3c613007d2fe873615c0969b981823c +SIZE (cabal/th-abstraction-0.2.6.0.tar.gz) = 23406 Index: devel/hs-th-abstraction/files/patch-th-abstraction.cabal =================================================================== --- /dev/null +++ devel/hs-th-abstraction/files/patch-th-abstraction.cabal @@ -0,0 +1,11 @@ +--- th-abstraction.cabal.orig 2018-04-11 11:32:45 UTC ++++ th-abstraction.cabal +@@ -28,7 +28,7 @@ library + other-modules: Language.Haskell.TH.Datatype.Internal + build-depends: base >=4.3 && <5, + ghc-prim, +- template-haskell >=2.5 && <2.13, ++ template-haskell >=2.5 && <2.14, + containers >=0.4 && <0.6 + hs-source-dirs: src + default-language: Haskell2010 \ No newline at end of file Index: devel/hs-th-expand-syns/Makefile =================================================================== --- devel/hs-th-expand-syns/Makefile +++ devel/hs-th-expand-syns/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= extra -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTNAME= th-expand-syns +PORTVERSION= 0.4.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Extra functions +COMMENT= Expands type synonyms in Template Haskell ASTs LICENSE= BSD3CLAUSE -USE_CABAL= clock +USE_CABAL= syb .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-th-expand-syns/distinfo =================================================================== --- /dev/null +++ devel/hs-th-expand-syns/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524931602 +SHA256 (cabal/th-expand-syns-0.4.4.0.tar.gz) = cc0f52d1364ace9ba56f51afd9106a5fe01ed3f5ae45c958c1b0f83be0a6f906 +SIZE (cabal/th-expand-syns-0.4.4.0.tar.gz) = 7572 Index: devel/hs-th-expand-syns/pkg-descr =================================================================== --- /dev/null +++ devel/hs-th-expand-syns/pkg-descr @@ -0,0 +1,3 @@ +Expands type synonyms in Template Haskell ASTs. + +WWW: https://github.com/DanielSchuessler/th-expand-syns Index: devel/hs-th-lift-instances/Makefile =================================================================== --- devel/hs-th-lift-instances/Makefile +++ devel/hs-th-lift-instances/Makefile @@ -2,7 +2,7 @@ PORTNAME= th-lift-instances PORTVERSION= 0.1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text th-lift vector +USE_CABAL= th-lift vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-th-lift/Makefile =================================================================== --- devel/hs-th-lift/Makefile +++ devel/hs-th-lift/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= th-lift -PORTVERSION= 0.7.7 -PORTREVISION= 1 +PORTVERSION= 0.7.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-th-lift/distinfo =================================================================== --- devel/hs-th-lift/distinfo +++ devel/hs-th-lift/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499621822 -SHA256 (cabal/th-lift-0.7.7.tar.gz) = 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5 -SIZE (cabal/th-lift-0.7.7.tar.gz) = 12399 +TIMESTAMP = 1523429375 +SHA256 (cabal/th-lift-0.7.8.tar.gz) = 2cf83385e848d9136a1d6e49ca845fd1d09935f2ff658c6f4e268d8ece02c12b +SIZE (cabal/th-lift-0.7.8.tar.gz) = 12399 Index: devel/hs-th-orphans/Makefile =================================================================== --- devel/hs-th-orphans/Makefile +++ devel/hs-th-orphans/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= StateVar -PORTVERSION= 1.1.0.4 -PORTREVISION= 1 +PORTNAME= th-orphans +PORTVERSION= 0.13.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= State variables +COMMENT= Orphan instances for TH datatypes LICENSE= BSD3CLAUSE -USE_CABAL= stm +USE_CABAL= th-lift th-lift-instances th-reify-many .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-th-orphans/distinfo =================================================================== --- /dev/null +++ devel/hs-th-orphans/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524930811 +SHA256 (cabal/th-orphans-0.13.5.tar.gz) = 95644d4b7914317e1dd31095947b8371f1a18be0c09e75f0e29203eb774a25ad +SIZE (cabal/th-orphans-0.13.5.tar.gz) = 6675 Index: devel/hs-th-orphans/pkg-descr =================================================================== --- /dev/null +++ devel/hs-th-orphans/pkg-descr @@ -0,0 +1,5 @@ +Orphan instances for TH datatypes. In particular, instances for Ord and Lift, +as well as a few missing Show / Eq. These instances used to live in +haskell-src-meta, and that's where the version number started. + +WWW: https://github.com/mgsloan/th-orphans/ Index: devel/hs-th-reify-many/Makefile =================================================================== --- devel/hs-th-reify-many/Makefile +++ devel/hs-th-reify-many/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= blaze-builder -PORTVERSION= 0.4.0.2 -PORTREVISION= 1 +PORTNAME= th-reify-many +PORTVERSION= 0.1.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Efficient buffered output +COMMENT= Recurseively reify template haskell datatype info LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.10 +USE_CABAL= safe th-expand-syns .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-th-reify-many/distinfo =================================================================== --- /dev/null +++ devel/hs-th-reify-many/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524931291 +SHA256 (cabal/th-reify-many-0.1.8.tar.gz) = cecaae187df911de515d08929e1394d6d6f7ce129795be8189a6b10d3734fe43 +SIZE (cabal/th-reify-many-0.1.8.tar.gz) = 5663 Index: devel/hs-th-reify-many/pkg-descr =================================================================== --- /dev/null +++ devel/hs-th-reify-many/pkg-descr @@ -0,0 +1,6 @@ +th-reify-many provides functions for recursively reifying top level declarations. +The main intended use case is for enumerating the names of datatypes reachable +from an initial datatype, and passing these names to some function which +generates instances. + +WWW: http://github.com/mgsloan/th-reify-many Index: devel/hs-threads/Makefile =================================================================== --- devel/hs-threads/Makefile +++ devel/hs-threads/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= threads -PORTVERSION= 0.5.1.4 +PORTVERSION= 0.5.1.6 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.1 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-threads/distinfo =================================================================== --- devel/hs-threads/distinfo +++ devel/hs-threads/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447395 -SHA256 (cabal/threads-0.5.1.4.tar.gz) = d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd -SIZE (cabal/threads-0.5.1.4.tar.gz) = 7395 +TIMESTAMP = 1523649637 +SHA256 (cabal/threads-0.5.1.6.tar.gz) = 139ac3c067fcbb392b5b9c2feaa98184b75ebe7f2e580726eea6ce812d94562e +SIZE (cabal/threads-0.5.1.6.tar.gz) = 7406 Index: devel/hs-threadscope/Makefile =================================================================== --- devel/hs-threadscope/Makefile +++ devel/hs-threadscope/Makefile @@ -2,7 +2,7 @@ PORTNAME= threadscope PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +10,13 @@ LICENSE= BSD3CLAUSE -USE_CABAL= cairo ghc-events glib gtk mtl pango text +USE_CABAL= cairo ghc-events glib gtk mtl pango EXECUTABLE= threadscope STANDALONE= yes +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-timezone-olson/Makefile =================================================================== --- devel/hs-timezone-olson/Makefile +++ devel/hs-timezone-olson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= timezone-olson -PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTVERSION= 0.1.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-timezone-olson/distinfo =================================================================== --- devel/hs-timezone-olson/distinfo +++ devel/hs-timezone-olson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450481 -SHA256 (cabal/timezone-olson-0.1.8.tar.gz) = b96b01015ae5191a56d6bbdbbc3d084f0afb9acd72d84c301792f07871dd3747 -SIZE (cabal/timezone-olson-0.1.8.tar.gz) = 11356 +TIMESTAMP = 1524157973 +SHA256 (cabal/timezone-olson-0.1.9.tar.gz) = 32230509029bcf9e1bd95b5ad7ee69b8b0250cffc4bb8f2df88a651b3af74b15 +SIZE (cabal/timezone-olson-0.1.9.tar.gz) = 11471 Index: devel/hs-transformers-base/Makefile =================================================================== --- devel/hs-transformers-base/Makefile +++ devel/hs-transformers-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= transformers-base PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= stm>=2.3 transformers-compat>=0.2 +USE_CABAL= transformers-compat>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-typed-process/Makefile =================================================================== --- devel/hs-typed-process/Makefile +++ devel/hs-typed-process/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= typed-process -PORTVERSION= 0.1.0.0 +PORTVERSION= 0.2.2.0 PORTREVISION= 1 CATEGORIES= devel haskell @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= async conduit conduit-extra exceptions stm +USE_CABAL= async exceptions .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-typed-process/distinfo =================================================================== --- devel/hs-typed-process/distinfo +++ devel/hs-typed-process/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720967 -SHA256 (cabal/typed-process-0.1.0.0.tar.gz) = de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8 -SIZE (cabal/typed-process-0.1.0.0.tar.gz) = 12886 +TIMESTAMP = 1523897812 +SHA256 (cabal/typed-process-0.2.2.0.tar.gz) = 42ed06889c15aa07577a0e8e3632659e343be95b77afa252b48b592ff7dbcf30 +SIZE (cabal/typed-process-0.2.2.0.tar.gz) = 13890 Index: devel/hs-unicode-show/Makefile =================================================================== --- devel/hs-unicode-show/Makefile +++ devel/hs-unicode-show/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= stm -PORTVERSION= 2.4.4.1 -PORTREVISION= 1 +PORTNAME= unicode-show +PORTVERSION= 0.1.0.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Software Transactional Memory +COMMENT= Print and show in unicode LICENSE= BSD3CLAUSE Index: devel/hs-unicode-show/distinfo =================================================================== --- /dev/null +++ devel/hs-unicode-show/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525760473 +SHA256 (cabal/unicode-show-0.1.0.2.tar.gz) = 7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943 +SIZE (cabal/unicode-show-0.1.0.2.tar.gz) = 4303 Index: devel/hs-unicode-show/pkg-descr =================================================================== --- /dev/null +++ devel/hs-unicode-show/pkg-descr @@ -0,0 +1,4 @@ +This package provides variants of show and print functions that does not +escape non-ascii characters. + +WWW: https://github.com/nushio3/unicode-show Index: devel/hs-unix-time/Makefile =================================================================== --- devel/hs-unix-time/Makefile +++ devel/hs-unix-time/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= unix-time -PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTVERSION= 0.3.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-unix-time/distinfo =================================================================== --- devel/hs-unix-time/distinfo +++ devel/hs-unix-time/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627862 -SHA256 (cabal/unix-time-0.3.7.tar.gz) = 1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1 -SIZE (cabal/unix-time-0.3.7.tar.gz) = 40549 +TIMESTAMP = 1523432893 +SHA256 (cabal/unix-time-0.3.8.tar.gz) = dca1bd332f4690f667570868c91c1270083428067e0e20b88a9d9516efa33a14 +SIZE (cabal/unix-time-0.3.8.tar.gz) = 40672 Index: devel/hs-unliftio-core/Makefile =================================================================== --- devel/hs-unliftio-core/Makefile +++ devel/hs-unliftio-core/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= PSQueue -PORTVERSION= 1.1 -PORTREVISION= 15 +PORTNAME= unliftio-core +PORTVERSION= 0.1.1.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Priority Search Queue +COMMENT= MonadUnliftIO typeclass for unlifting monads to IO LICENSE= BSD3CLAUSE Index: devel/hs-unliftio-core/distinfo =================================================================== --- /dev/null +++ devel/hs-unliftio-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523697342 +SHA256 (cabal/unliftio-core-0.1.1.0.tar.gz) = 7550b017d87af53ae3e0d3b8524e24a77faf739073f35e40663454a9e9752385 +SIZE (cabal/unliftio-core-0.1.1.0.tar.gz) = 3293 Index: devel/hs-unliftio-core/files/patch-unliftio-core.cabal =================================================================== --- /dev/null +++ devel/hs-unliftio-core/files/patch-unliftio-core.cabal @@ -0,0 +1,11 @@ +--- unliftio-core.cabal.orig 2018-04-14 09:20:34 UTC ++++ unliftio-core.cabal +@@ -26,7 +26,7 @@ library + hs-source-dirs: + src + build-depends: +- base >=4.5 && <4.11 ++ base >=4.5 && <4.12 + , transformers >=0.2 && <0.6 + exposed-modules: + Control.Monad.IO.Unlift \ No newline at end of file Index: devel/hs-unliftio-core/pkg-descr =================================================================== --- /dev/null +++ devel/hs-unliftio-core/pkg-descr @@ -0,0 +1,4 @@ +Provides the core MonadUnliftIO typeclass, instances for base +and transformers, and basic utility functions. + +WWW: https://github.com/fpco/unliftio \ No newline at end of file Index: devel/hs-unliftio/Makefile =================================================================== --- devel/hs-unliftio/Makefile +++ devel/hs-unliftio/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= boxes -PORTVERSION= 0.1.4 -PORTREVISION= 2 +PORTNAME= unliftio +PORTVERSION= 0.2.6.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= 2D text pretty-printing library +COMMENT= MonadUnliftIO typeclass for unlifting monads to IO LICENSE= BSD3CLAUSE -USE_CABAL= split>=0.2 +USE_CABAL= async unliftio-core .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-unliftio/distinfo =================================================================== --- /dev/null +++ devel/hs-unliftio/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523902179 +SHA256 (cabal/unliftio-0.2.6.0.tar.gz) = f87d5b6fa7f1bdb2d47e91c30411a3a878bc281a1259fc23abe146d1c4a4b366 +SIZE (cabal/unliftio-0.2.6.0.tar.gz) = 28311 Index: devel/hs-unliftio/pkg-descr =================================================================== --- /dev/null +++ devel/hs-unliftio/pkg-descr @@ -0,0 +1,4 @@ +Provides the core MonadUnliftIO typeclass, instances for base +and transformers, and basic utility functions. + +WWW: https://github.com/fpco/unliftio \ No newline at end of file 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-uuagc-cabal/Makefile =================================================================== --- devel/hs-uuagc-cabal/Makefile +++ devel/hs-uuagc-cabal/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uuagc-cabal -PORTVERSION= 1.0.6.0 -PORTREVISION= 2 +PORTVERSION= 1.1.0.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-uuagc-cabal/distinfo =================================================================== --- devel/hs-uuagc-cabal/distinfo +++ devel/hs-uuagc-cabal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627863 -SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b -SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781 +TIMESTAMP = 1523959204 +SHA256 (cabal/uuagc-cabal-1.1.0.0.tar.gz) = f2d3daccab5082165c6621852cc555f530adac90220f57dd13c724bd5acfbb2d +SIZE (cabal/uuagc-cabal-1.1.0.0.tar.gz) = 14924 Index: devel/hs-uuid-types/Makefile =================================================================== --- devel/hs-uuid-types/Makefile +++ devel/hs-uuid-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuid-types PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 text>=1 +USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-uuid/Makefile =================================================================== --- devel/hs-uuid/Makefile +++ devel/hs-uuid/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuid PORTVERSION= 1.3.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= cryptohash-md5 cryptohash-sha1 entropy network-info random \ - text uuid-types + uuid-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-uuid/files/patch-uuid.cabal =================================================================== --- /dev/null +++ devel/hs-uuid/files/patch-uuid.cabal @@ -0,0 +1,10 @@ +--- uuid.cabal.orig 2018-04-29 12:00:18 UTC ++++ uuid.cabal +@@ -37,7 +37,7 @@ Library + entropy >= 0.3.7 && < 0.4, + network-info == 0.2.*, + random >= 1.0.1 && < 1.2, +- time >= 1.1 && < 1.8, ++ time >= 1.1 && < 1.9, + text >= 1 && < 1.3, + uuid-types >= 1.0.2 && < 2 Index: devel/hs-uulib/Makefile =================================================================== --- devel/hs-uulib/Makefile +++ devel/hs-uulib/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= uulib -PORTVERSION= 0.9.22 -PORTREVISION= 1 +PORTVERSION= 0.9.23 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-uulib/distinfo =================================================================== --- devel/hs-uulib/distinfo +++ devel/hs-uulib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627863 -SHA256 (cabal/uulib-0.9.22.tar.gz) = cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad -SIZE (cabal/uulib-0.9.22.tar.gz) = 45487 +TIMESTAMP = 1523470473 +SHA256 (cabal/uulib-0.9.23.tar.gz) = c6fb906d2751c5a5c0839a4eaca62f2987ff8e0857146b8643cccff683e72fed +SIZE (cabal/uulib-0.9.23.tar.gz) = 45287 Index: devel/hs-uulib/files/patch-src_UU_PPrint.hs =================================================================== --- /dev/null +++ devel/hs-uulib/files/patch-src_UU_PPrint.hs @@ -0,0 +1,11 @@ +--- src/UU/PPrint.hs.orig 2018-04-11 18:54:44 UTC ++++ src/UU/PPrint.hs +@@ -60,7 +60,7 @@ module UU.PPrint + import System.IO (Handle,hPutStr,hPutChar,stdout) + + #if __GLASGOW_HASKELL__ >= 710 +-import Prelude hiding ((<$>)) ++import Prelude hiding ((<$>), (<>)) + #endif + + infixr 5 ,,<$>,<$$> \ No newline at end of file Index: devel/hs-vault/Makefile =================================================================== --- devel/hs-vault/Makefile +++ devel/hs-vault/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vault -PORTVERSION= 0.3.0.7 -PORTREVISION= 1 +PORTVERSION= 0.3.1.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1.2.5 unordered-containers>=0.2.3.0 +USE_CABAL= hashable>=1.1.2.5 semigroups unordered-containers>=0.2.3.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-vault/distinfo =================================================================== --- devel/hs-vault/distinfo +++ devel/hs-vault/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499458511 -SHA256 (cabal/vault-0.3.0.7.tar.gz) = 9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0 -SIZE (cabal/vault-0.3.0.7.tar.gz) = 5140 +TIMESTAMP = 1523431307 +SHA256 (cabal/vault-0.3.1.0.tar.gz) = d960a843c3dae1f6073f50e980dcdbbe2e46e9911273c9f122ba96494c4c979f +SIZE (cabal/vault-0.3.1.0.tar.gz) = 5199 Index: devel/hs-vector-binary-instances/Makefile =================================================================== --- devel/hs-vector-binary-instances/Makefile +++ devel/hs-vector-binary-instances/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vector-binary-instances -PORTVERSION= 0.2.3.5 -PORTREVISION= 1 +PORTVERSION= 0.2.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= cereal vector>=0.6 +USE_CABAL= vector>=0.6 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-vector-binary-instances/distinfo =================================================================== --- devel/hs-vector-binary-instances/distinfo +++ devel/hs-vector-binary-instances/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627864 -SHA256 (cabal/vector-binary-instances-0.2.3.5.tar.gz) = e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a -SIZE (cabal/vector-binary-instances-0.2.3.5.tar.gz) = 4133 +TIMESTAMP = 1523451213 +SHA256 (cabal/vector-binary-instances-0.2.4.tar.gz) = 2b2f783e414dcf2e7dc34ad14264e5af83e5cd4784d5a0a64e4b4571963443f8 +SIZE (cabal/vector-binary-instances-0.2.4.tar.gz) = 4146 Index: devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal =================================================================== --- /dev/null +++ devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal @@ -0,0 +1,10 @@ +--- vector-binary-instances.cabal.orig 2018-04-11 12:56:40 UTC ++++ vector-binary-instances.cabal +@@ -50,7 +50,7 @@ Library + + -- Packages needed in order to build this package. + Build-depends: +- base > 3 && < 4.11, ++ base > 3 && < 4.12, + vector >= 0.6 && < 0.13, + binary >= 0.5 && < 0.10 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: devel/hs-wl-pprint-text/Makefile =================================================================== --- devel/hs-wl-pprint-text/Makefile +++ devel/hs-wl-pprint-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wl-pprint-text -PORTVERSION= 1.1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= base-compat text +USE_CABAL= base-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-wl-pprint-text/distinfo =================================================================== --- devel/hs-wl-pprint-text/distinfo +++ devel/hs-wl-pprint-text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543226 -SHA256 (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd -SIZE (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 16575 +TIMESTAMP = 1525013982 +SHA256 (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 8bdeeaef7e1f55ba582cd4ea104dcd9346b461da09431f3b366b4522583e42ec +SIZE (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 16621 Index: devel/stack/Makefile =================================================================== --- devel/stack/Makefile +++ devel/stack/Makefile @@ -2,19 +2,18 @@ # $FreeBSD$ # To update this port first go to -# https://github.com/applicative-tech/stack-dependencies, change the +# https://github.com/arrowd/stack-dependencies, change the # version in the Makefile there, regenerate the stack-dependencies # tarball, commit Makefile changes, create a new tag (release) # matching the new stack version, and upload the tarball. Finally # bump the version here. PORTNAME= stack -PORTVERSION= 1.5.1 +PORTVERSION= 1.7.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= GH \ - https://github.com/applicative-tech/stack-dependencies/releases/download/v${PORTVERSION}/:deps + https://github.com/arrowd/stack-dependencies/releases/download/v${PORTVERSION}/:deps DISTFILES= stack-dependencies-${PORTVERSION}${EXTRACT_SUFX}:deps MAINTAINER= ports@FreeBSD.org @@ -27,12 +26,10 @@ hs-network>0:net/hs-network \ hs-old-locale>0:devel/hs-old-locale \ hs-old-time>0:devel/hs-old-time \ - hs-parsec>0:textproc/hs-parsec \ hs-random>0:devel/hs-random \ - hs-stm>0:devel/hs-stm \ - hs-text>0:devel/hs-text \ hs-zlib>0:archivers/hs-zlib \ - cabal:devel/hs-cabal-install + cabal:devel/hs-cabal-install \ + happy:devel/hs-happy LIB_DEPENDS= libgmp.so:math/gmp \ libffi.so:devel/libffi RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \ @@ -41,7 +38,7 @@ USES= gmake iconv:translit perl5 USE_GITHUB= yes -GH_ACCOUNT= applicative-tech +GH_ACCOUNT= arrowd GH_PROJECT= stack-dependencies MAKE_ENV= TARGET="${WRKSRC}" \ Index: devel/stack/distinfo =================================================================== --- devel/stack/distinfo +++ devel/stack/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1507494796 -SHA256 (stack-dependencies-1.5.1.tar.gz) = 2782fd7edba61645d070e54022dc81905bd283382de1282c851ebfa83d49f044 -SIZE (stack-dependencies-1.5.1.tar.gz) = 42063311 -SHA256 (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 0819916b46c3485bad4b8030d0af8e91cd1fecf5b99a1a61137a3d5a9caf730a -SIZE (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 999 +TIMESTAMP = 1524999031 +SHA256 (stack-dependencies-1.7.1.tar.gz) = 4320a4803c889603fd13469d6ce795642f218e5ae65c46616ed8ec3418d13240 +SIZE (stack-dependencies-1.7.1.tar.gz) = 155869633 +SHA256 (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 8487fb66e17df5960d7fea96e80eb33a7e9e08a839f80926a2144afc6bc4159e +SIZE (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 997 Index: dns/hs-dns/Makefile =================================================================== --- dns/hs-dns/Makefile +++ dns/hs-dns/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= dns -PORTVERSION= 2.0.10 -PORTREVISION= 1 +PORTVERSION= 3.0.2 CATEGORIES= dns haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec blaze-builder conduit>=1.1 conduit-extra>=1.1 \ - iproute>=1.2.4 mtl network>=2.3 random resourcet safe +USE_CABAL= attoparsec auto-update base64-bytestring blaze-builder \ + conduit>=1.1 conduit-extra>=1.1 cryptonite iproute>=1.2.4 \ + mtl network>=2.3 psqueues random resourcet safe .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: dns/hs-dns/distinfo =================================================================== --- dns/hs-dns/distinfo +++ dns/hs-dns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620675 -SHA256 (cabal/dns-2.0.10.tar.gz) = ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3 -SIZE (cabal/dns-2.0.10.tar.gz) = 24142 +TIMESTAMP = 1524597697 +SHA256 (cabal/dns-3.0.2.tar.gz) = f1a895a136e1b5a77ca0d00ff627993ee3fd2f4bbd7db7de80717668e53172a4 +SIZE (cabal/dns-3.0.2.tar.gz) = 37022 Index: dns/hs-dns/files/patch-dns.cabal =================================================================== --- dns/hs-dns/files/patch-dns.cabal +++ /dev/null @@ -1,34 +0,0 @@ ---- dns.cabal.orig 2017-07-11 15:30:47 UTC -+++ dns.cabal -@@ -30,7 +30,6 @@ Library - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers -@@ -45,7 +44,6 @@ Library - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers -@@ -67,7 +65,6 @@ Test-Suite network - Build-Depends: dns - , base - , bytestring -- , bytestring-builder - , hspec - - Test-Suite spec -@@ -82,7 +79,6 @@ Test-Suite spec - , attoparsec - , binary - , bytestring -- , bytestring-builder - , conduit >= 1.1 - , conduit-extra >= 1.1 - , containers Index: dns/hs-gnuidn/Makefile =================================================================== --- dns/hs-gnuidn/Makefile +++ dns/hs-gnuidn/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnuidn PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,6 @@ LICENSE= GPLv3 -USE_CABAL= text USE_C2HS= yes USES= pkgconfig Index: games/hs-scroll/Makefile =================================================================== --- games/hs-scroll/Makefile +++ games/hs-scroll/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= scroll -PORTVERSION= 1.20170122 -PORTREVISION= 1 +PORTVERSION= 1.20180421 CATEGORIES= games haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ PKGNAMEPREFIX= USE_CABAL= IfElse case-insensitive data-default monad-loops mtl \ - optparse-applicative ncurses random text vector + optparse-applicative ncurses random vector STANDALONE= yes EXECUTABLE= scroll Index: games/hs-scroll/distinfo =================================================================== --- games/hs-scroll/distinfo +++ games/hs-scroll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499620738 -SHA256 (cabal/scroll-1.20170122.tar.gz) = 89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38 -SIZE (cabal/scroll-1.20170122.tar.gz) = 266023 +TIMESTAMP = 1525090021 +SHA256 (cabal/scroll-1.20180421.tar.gz) = 9203353457c53550524d40216d069129389dbb94a7d8ba1a9153e794dcceff2a +SIZE (cabal/scroll-1.20180421.tar.gz) = 266900 Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -351,7 +351,6 @@ SUBDIR += hiptext SUBDIR += hobbes-icons-xpm SUBDIR += hppsmtools - SUBDIR += hs-HGL SUBDIR += hs-JuicyPixels SUBDIR += hs-cairo SUBDIR += hs-dia-base Index: graphics/hs-HGL/Makefile =================================================================== --- graphics/hs-HGL/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Giuseppe Pilichi aka Jacula Modyun -# $FreeBSD$ - -PORTNAME= HGL -PORTVERSION= 3.2.0.5 -PORTREVISION= 4 -CATEGORIES= graphics haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Simple Haskell graphics library based on X11 or Win32 - -LICENSE= BSD3CLAUSE - -USE_CABAL= X11 - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: graphics/hs-HGL/distinfo =================================================================== --- graphics/hs-HGL/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/HGL-3.2.0.5.tar.gz) = 8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d -SIZE (cabal/HGL-3.2.0.5.tar.gz) = 39012 Index: graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs =================================================================== --- graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs +++ /dev/null @@ -1,22 +0,0 @@ ---- Graphics/HGL/Internals/Draw.hs.orig 1991-05-09 14:40:52 UTC -+++ Graphics/HGL/Internals/Draw.hs -@@ -31,7 +31,7 @@ import Graphics.HGL.X11.Types(DC) - import Graphics.HGL.Win32.Types(DC) - #endif - import qualified Graphics.HGL.Internals.Utilities as Utils (bracket, bracket_) --import Control.Monad (liftM) -+import Control.Monad (liftM, ap) - - ---------------------------------------------------------------- - -- Graphics -@@ -61,6 +61,10 @@ instance Monad Draw where - - instance Functor Draw where fmap = liftM - -+instance Applicative Draw where -+ pure = return -+ (<*>) = ap -+ - -- | Wrap a drawing action in initialization and finalization actions. - bracket - :: Draw a -- ^ a pre-operation, whose value is passed to the Index: graphics/hs-HGL/pkg-descr =================================================================== --- graphics/hs-HGL/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -A simple graphics library, designed to give the programmer access to -most interesting parts of the Win32 Graphics Device Interface and X11 -library without exposing the programmer to the pain and anguish usually -associated with using these interfaces. The library also includes a -module Graphics.SOE providing the interface used in "The Haskell School -of Expression", by Paul Hudak. - -WWW: http://hackage.haskell.org/package/HGL Index: graphics/hs-JuicyPixels/Makefile =================================================================== --- graphics/hs-JuicyPixels/Makefile +++ graphics/hs-JuicyPixels/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= JuicyPixels -PORTVERSION= 3.2.8.2 -PORTREVISION= 1 +PORTVERSION= 3.2.9.5 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org Index: graphics/hs-JuicyPixels/distinfo =================================================================== --- graphics/hs-JuicyPixels/distinfo +++ graphics/hs-JuicyPixels/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538228 -SHA256 (cabal/JuicyPixels-3.2.8.2.tar.gz) = b74c89e57ea81f6f69470dce215beccb7ced270ce8529b4a97535879ea5478e8 -SIZE (cabal/JuicyPixels-3.2.8.2.tar.gz) = 125699 +TIMESTAMP = 1523462111 +SHA256 (cabal/JuicyPixels-3.2.9.5.tar.gz) = 849c6cf4a613f906f7e553a1baefe9c0dc61c13b41a5f5b9605cf80e328cc355 +SIZE (cabal/JuicyPixels-3.2.9.5.tar.gz) = 122952 Index: graphics/hs-cairo/Makefile =================================================================== --- graphics/hs-cairo/Makefile +++ graphics/hs-cairo/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cairo -PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTVERSION= 0.13.5.0 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= gtk2hs-buildtools mtl text utf8-string +USE_CABAL= gtk2hs-buildtools mtl utf8-string BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:graphics/cairo Index: graphics/hs-cairo/distinfo =================================================================== --- graphics/hs-cairo/distinfo +++ graphics/hs-cairo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538056 -SHA256 (cabal/cairo-0.13.3.1.tar.gz) = a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a -SIZE (cabal/cairo-0.13.3.1.tar.gz) = 45033 +TIMESTAMP = 1524402125 +SHA256 (cabal/cairo-0.13.5.0.tar.gz) = 420acd81e0b5578ad188bcdd38463135293c233221abb741cc4004d4c8a6bef3 +SIZE (cabal/cairo-0.13.5.0.tar.gz) = 46877 Index: graphics/hs-dia-base/Makefile =================================================================== --- graphics/hs-dia-base/Makefile +++ graphics/hs-dia-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= dia-base PORTVERSION= 0.1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org Index: graphics/hs-dia-base/files/patch-dia-base.cabal =================================================================== --- /dev/null +++ graphics/hs-dia-base/files/patch-dia-base.cabal @@ -0,0 +1,10 @@ +--- dia-base.cabal.orig 2018-04-11 15:42:07 UTC ++++ dia-base.cabal +@@ -27,7 +27,7 @@ library + Graphics.Diagrams + + Build-Depends: +- base >= 4.0 && < 4.10, ++ base >= 4.0 && < 4.12, + deepseq >= 1.1 && < 1.5 + Index: graphics/hs-graphviz/Makefile =================================================================== --- graphics/hs-graphviz/Makefile +++ graphics/hs-graphviz/Makefile @@ -11,7 +11,9 @@ LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= colour dlist fgl polyparse temporary text wl-pprint-text +USE_CABAL= colour dlist fgl polyparse temporary wl-pprint-text + +IGNORE= Doesn't build with recent GHC version BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libxdot.pc:graphics/graphviz Index: graphics/hs-svgcairo/Makefile =================================================================== --- graphics/hs-svgcairo/Makefile +++ graphics/hs-svgcairo/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgcairo PORTVERSION= 0.13.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USES= pkgconfig -USE_CABAL= cairo glib mtl text +USE_CABAL= cairo glib mtl USE_GNOME= librsvg2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" 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.2 +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 @@ -47,7 +45,7 @@ SUB_FILES= build.mk \ build.boot.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ - NCURSESINC="${NCURSESINC}" NCURSESLIB="${NCURSESLIB}" \ + NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" OPTIONS_GROUP= BOOTSTRAP @@ -90,14 +88,17 @@ .include .if empty(PORT_OPTIONS:MBOOT) -BOOT_GHC_VERSION= 7.10.2 +BOOT_GHC_VERSION= 8.4.2 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 +CONFIGURE_ARGS+= --enable-dtrace=0 +.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 +116,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 +190,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 \ @@ -232,14 +239,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 @@ -256,7 +263,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 @@ -264,12 +271,8 @@ # 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 + && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + && stat -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz Index: lang/ghc/bsd.hackage.mk =================================================================== --- lang/ghc/bsd.hackage.mk +++ lang/ghc/bsd.hackage.mk @@ -86,14 +86,15 @@ auto-update_port?= devel/hs-auto-update aws_port?= net/hs-aws base-compat_port?= devel/hs-base-compat +base-compat-batteries_port?= devel/hs-base-compat-batteries base-orphans_port?= devel/hs-base-orphans 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 -bio_port?= science/hs-bio # executable bits-atomic_port?= devel/hs-bits-atomic blaze-builder_port?= devel/hs-blaze-builder blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator @@ -101,11 +102,11 @@ blaze-markup_port?= textproc/hs-blaze-markup blaze-textual_port?= devel/hs-blaze-textual bloomfilter_port?= devel/hs-bloomfilter -BNFC_port?= devel/hs-BNFC # executable Boolean_port?= devel/hs-Boolean BoundedChan_port?= devel/hs-BoundedChan boxes_port?= devel/hs-boxes brainfuck_port?= lang/hs-brainfuck # executable +bsb-http-chunked_port?= net/hs-bsb-http-chunked bsd-sysctl_port?= devel/hs-bsd-sysctl byteable_port?= devel/hs-byteable byteorder_port?= devel/hs-byteorder @@ -137,6 +138,7 @@ clientsession_port?= security/hs-clientsession clock_port?= devel/hs-clock cmark_port?= textproc/hs-cmark +cmark-gfm_port?= textproc/hs-cmark-gfm cmdargs_port?= devel/hs-cmdargs code-page_port?= devel/hs-code-page colour_port?= devel/hs-colour @@ -173,6 +175,7 @@ cryptohash-conduit_port?= security/hs-cryptohash-conduit cryptohash-cryptoapi_port?= security/hs-cryptohash-cryptoapi cryptonite_port?= security/hs-cryptonite +cryptonite-conduit_port?= security/hs-cryptonite-conduit css-text_port?= www/hs-css-text csv_port?= textproc/hs-csv curl_port?= ftp/hs-curl # lib_depends @@ -210,6 +213,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 @@ -274,12 +278,12 @@ hashable_port?= devel/hs-hashable hashed-storage_port?= devel/hs-hashed-storage hashtables_port?= devel/hs-hashtables -haskell-lexer_port?= devel/hs-haskell-lexer +haskell-lexer_port?= devel/hs-haskell-lexer haskell-src_port?= devel/hs-haskell-src haskell-src-exts_port?= devel/hs-haskell-src-exts +haskell-src-meta_port?= devel/hs-haskell-src-meta haskell-xmpp_port?= net-im/hs-haskell-xmpp hasktags_port?= devel/hs-hasktags # executable -hastache_port?= devel/hs-hastache HaXml_port?= textproc/hs-HaXml # executable hedis_port?= databases/hs-hedis heist_port?= www/hs-heist @@ -302,6 +306,7 @@ hscolour_port?= print/hs-hscolour # executable hslogger_port?= devel/hs-hslogger hslua_port?= devel/hs-hslua +hslua-module-text_port?= devel/hs-hslua-module-text HsOpenSSL_port?= security/hs-HsOpenSSL hspec_port?= devel/hs-hspec # executable hspec-core_port?= devel/hs-hspec-core @@ -374,7 +379,6 @@ monad-par-extras_port?= devel/hs-monad-par-extras monad-unlift_port?= devel/hs-monad-unlift monadcryptorandom_port?= security/hs-monadcryptorandom -monadplus_port?= devel/hs-monadplus MonadRandom_port?= devel/hs-MonadRandom monads-tf_port?= devel/hs-monads-tf mono-traversable_port?= devel/hs-mono-traversable @@ -411,7 +415,6 @@ pandoc-types_port?= textproc/hs-pandoc-types pango_port?= x11-toolkits/hs-pango parallel_port?= devel/hs-parallel -parsec_port?= textproc/hs-parsec path-pieces_port?= www/hs-path-pieces pcap_port?= net/hs-pcap pcre-light_port?= devel/hs-pcre-light # lib_depends @@ -453,6 +456,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 @@ -482,6 +486,7 @@ simple-sendfile_port?= net/hs-simple-sendfile skein_port?= security/hs-skein skylighting_port?= textproc/hs-skylighting +skylighting-core_port?= textproc/hs-skylighting-core smallcheck_port?= devel/hs-smallcheck snap_port?= www/hs-snap # executable snap-core_port?= www/hs-snap-core @@ -493,6 +498,8 @@ stm_port?= devel/hs-stm stm-chans_port?= devel/hs-stm-chans STMonadTrans_port?= devel/hs-STMonadTrans +storable-record_port?= devel/hs-storable-record +storable-tuple_port?= devel/hs-storable-tuple Stream_port?= devel/hs-Stream streaming-commons_port?= devel/hs-streaming-commons strict_port?= devel/hs-strict @@ -512,13 +519,15 @@ test-framework-hunit_port?= devel/hs-test-framework-hunit test-framework-quickcheck2_port?= devel/hs-test-framework-quickcheck2 texmath_port?= textproc/hs-texmath # executable -text_port?= devel/hs-text text-icu_port?= devel/hs-text-icu # lib_depends text-short_port?= devel/hs-text-short tf-random_port?= devel/hs-tf-random th-abstraction_port?= devel/hs-th-abstraction +th-expand-syns_port?= devel/hs-th-expand-syns th-lift_port?= devel/hs-th-lift th-lift-instances_port?= devel/hs-th-lift-instances +th-orphans_port?= devel/hs-th-orphans +th-reify-many_port?= devel/hs-th-reify-many threads_port?= devel/hs-threads threadscope_port?= devel/hs-threadscope # executable time-compat_port?= devel/hs-time-compat @@ -534,14 +543,18 @@ typed-process_port?= devel/hs-typed-process unamb_port?= devel/hs-unamb unexceptionalio_port?= devel/hs-unexceptionalio +unicode-show_port?= devel/hs-unicode-show uniplate_port?= devel/hs-uniplate unix-compat_port?= devel/hs-unix-compat unix-time_port?= devel/hs-unix-time unlambda_port?= lang/hs-unlambda # executable +unliftio_port?= devel/hs-unliftio +unliftio-core_port?= devel/hs-unliftio-core unordered-containers_port?= devel/hs-unordered-containers uri_port?= textproc/hs-uri uri-bytestring_port?= textproc/hs-uri-bytestring uri-bytestring-aeson_port?= textproc/hs-uri-bytestring-aeson +uri-encode_port?= textproc/hs-uri-encode url_port?= www/hs-url utf8-light_port?= devel/hs-utf8-light utf8-string_port?= devel/hs-utf8-string 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.2 -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,9 @@ -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 = 1521746767 +SHA256 (ghc-8.4.2-src.tar.xz) = 01cc32f24a06bf3b2428351b6d7fec791e82d042426d29ad9e5a245b35f0047b +SIZE (ghc-8.4.2-src.tar.xz) = 11313140 +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 (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,15 @@ # 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. +@@ -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: mail/hs-email-validate/Makefile =================================================================== --- mail/hs-email-validate/Makefile +++ mail/hs-email-validate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= email-validate -PORTVERSION= 2.3 -PORTREVISION= 1 +PORTVERSION= 2.3.2.5 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org Index: mail/hs-email-validate/distinfo =================================================================== --- mail/hs-email-validate/distinfo +++ mail/hs-email-validate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623071 -SHA256 (cabal/email-validate-2.3.tar.gz) = c149b4a2d4d91c5263f9883944498446ac41258347bdf29908240fa536d6a6fe -SIZE (cabal/email-validate-2.3.tar.gz) = 9648 +TIMESTAMP = 1523785923 +SHA256 (cabal/email-validate-2.3.2.5.tar.gz) = 7b4ff4e89eccc073df2f51e9d20d507ba1a6d4f5746130c712844c7cf8674e4c +SIZE (cabal/email-validate-2.3.2.5.tar.gz) = 9693 Index: mail/hs-mime-mail/Makefile =================================================================== --- mail/hs-mime-mail/Makefile +++ mail/hs-mime-mail/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mime-mail -PORTVERSION= 0.4.13.1 -PORTREVISION= 1 +PORTVERSION= 0.4.14 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= MIT -USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \ - text>=0.7 +USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: mail/hs-mime-mail/distinfo =================================================================== --- mail/hs-mime-mail/distinfo +++ mail/hs-mime-mail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623071 -SHA256 (cabal/mime-mail-0.4.13.1.tar.gz) = 9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917 -SIZE (cabal/mime-mail-0.4.13.1.tar.gz) = 9538 +TIMESTAMP = 1523900845 +SHA256 (cabal/mime-mail-0.4.14.tar.gz) = 9632c3d54c9741fece0a3ea705d965485a1299ebe5798d2aa7cca2c8e4baaa3e +SIZE (cabal/mime-mail-0.4.14.tar.gz) = 9594 Index: mail/hs-mime-types/Makefile =================================================================== --- mail/hs-mime-types/Makefile +++ mail/hs-mime-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= mime-types PORTVERSION= 0.1.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= MIT -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: mail/hs-mime/Makefile =================================================================== --- mail/hs-mime/Makefile +++ mail/hs-mime/Makefile @@ -3,7 +3,7 @@ PORTNAME= mime PORTVERSION= 0.4.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.9 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-Agda/Makefile =================================================================== --- math/hs-Agda/Makefile +++ math/hs-Agda/Makefile @@ -11,8 +11,8 @@ USE_CABAL= EdisonCore boxes data-hash edit-distance equivalence \ geniplate-mirror gitrev hashable hashtables ieee754 \ - monadplus mtl murmur-hash parallel regex-tdfa strict \ - text unordered-containers zlib + mtl murmur-hash parallel regex-tdfa strict \ + unordered-containers zlib USE_ALEX= yes USE_HAPPY= yes @@ -26,5 +26,7 @@ SUB_FILES= pkg-install pkg-deinstall SUB_LIST= DATADIR=${DATADIR} +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-adjunctions/Makefile =================================================================== --- math/hs-adjunctions/Makefile +++ math/hs-adjunctions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= adjunctions -PORTVERSION= 4.3 -PORTREVISION= 1 +PORTVERSION= 4.4 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-adjunctions/distinfo =================================================================== --- math/hs-adjunctions/distinfo +++ math/hs-adjunctions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623373 -SHA256 (cabal/adjunctions-4.3.tar.gz) = b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc -SIZE (cabal/adjunctions-4.3.tar.gz) = 15651 +TIMESTAMP = 1523889909 +SHA256 (cabal/adjunctions-4.4.tar.gz) = 507c2ef55337ae61c805f8cbc1213dfd7d2b85187342675d662254b8d8a16ae9 +SIZE (cabal/adjunctions-4.4.tar.gz) = 19891 Index: math/hs-comonad/Makefile =================================================================== --- math/hs-comonad/Makefile +++ math/hs-comonad/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= comonad -PORTVERSION= 5.0.1 -PORTREVISION= 1 +PORTVERSION= 5.0.3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-comonad/distinfo =================================================================== --- math/hs-comonad/distinfo +++ math/hs-comonad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543660 -SHA256 (cabal/comonad-5.0.1.tar.gz) = 561ffd697d9d38467d0d426947e0bade25a05e3c507235eca29ec800ad3f463d -SIZE (cabal/comonad-5.0.1.tar.gz) = 18218 +TIMESTAMP = 1523787141 +SHA256 (cabal/comonad-5.0.3.tar.gz) = a7f4584d634051123c547f0d10f88eaf23d99229dbd01dfdcd98cddd41e54df6 +SIZE (cabal/comonad-5.0.3.tar.gz) = 17430 Index: math/hs-data-lens-template/files/patch-data-lens-template.cabal =================================================================== --- /dev/null +++ math/hs-data-lens-template/files/patch-data-lens-template.cabal @@ -0,0 +1,11 @@ +--- data-lens-template.cabal.orig 2018-04-24 19:52:13 UTC ++++ data-lens-template.cabal +@@ -22,7 +22,7 @@ library + build-depends: + data-lens >= 2.0 && < 2.12, + base >= 1.0 && < 5, +- template-haskell >= 2.11 && < 2.12 ++ template-haskell >= 2.11 && < 2.14 + + exposed-modules: + Data.Lens.Template \ No newline at end of file Index: math/hs-distributive/Makefile =================================================================== --- math/hs-distributive/Makefile +++ math/hs-distributive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= distributive -PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTVERSION= 0.5.3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-distributive/distinfo =================================================================== --- math/hs-distributive/distinfo +++ math/hs-distributive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537738 -SHA256 (cabal/distributive-0.5.2.tar.gz) = ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9 -SIZE (cabal/distributive-0.5.2.tar.gz) = 11824 +TIMESTAMP = 1523780948 +SHA256 (cabal/distributive-0.5.3.tar.gz) = 9173805b9c941bda1f37e5aeb68ae30f57a12df9b17bd2aa86db3b7d5236a678 +SIZE (cabal/distributive-0.5.3.tar.gz) = 10147 Index: math/hs-integer-logarithms/Makefile =================================================================== --- math/hs-integer-logarithms/Makefile +++ math/hs-integer-logarithms/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= integer-logarithms -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.2.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-integer-logarithms/distinfo =================================================================== --- math/hs-integer-logarithms/distinfo +++ math/hs-integer-logarithms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448646 -SHA256 (cabal/integer-logarithms-1.0.2.tar.gz) = 31069ccbff489baf6c4a93cb7475640aabea9366eb0b583236f10714a682b570 -SIZE (cabal/integer-logarithms-1.0.2.tar.gz) = 8854 +TIMESTAMP = 1523429156 +SHA256 (cabal/integer-logarithms-1.0.2.1.tar.gz) = 32ad4a482a60ec957d1af1268952e2a6b382b67438c14f74f6c2aef2e49b48f2 +SIZE (cabal/integer-logarithms-1.0.2.1.tar.gz) = 8781 Index: math/hs-kan-extensions/Makefile =================================================================== --- math/hs-kan-extensions/Makefile +++ math/hs-kan-extensions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kan-extensions -PORTVERSION= 5.0.2 -PORTREVISION= 1 +PORTVERSION= 5.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-kan-extensions/distinfo =================================================================== --- math/hs-kan-extensions/distinfo +++ math/hs-kan-extensions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623376 -SHA256 (cabal/kan-extensions-5.0.2.tar.gz) = 1c9ede8595424209944e59fd46c1d2edb654758be9a45c1c48a4d3cedf42482e -SIZE (cabal/kan-extensions-5.0.2.tar.gz) = 19957 +TIMESTAMP = 1523890567 +SHA256 (cabal/kan-extensions-5.1.tar.gz) = 193f8e58f267663d5da8e38045b000d0983ac08b84808de42af1a44963f63205 +SIZE (cabal/kan-extensions-5.1.tar.gz) = 22573 Index: math/hs-kan-extensions/files/patch-kan-extensions.cabal =================================================================== --- math/hs-kan-extensions/files/patch-kan-extensions.cabal +++ math/hs-kan-extensions/files/patch-kan-extensions.cabal @@ -1,10 +1,10 @@ ---- kan-extensions.cabal.orig 2017-07-09 21:09:48 UTC +--- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC +++ kan-extensions.cabal -@@ -47,7 +47,6 @@ library +@@ -57,7 +57,6 @@ library containers >= 0.4 && < 0.6, contravariant >= 1 && < 2, distributive >= 0.2.2 && < 1, - fail >= 4.9 && < 5, - free >= 4 && < 5, + free >= 4 && < 6, mtl >= 2.0.1 && < 2.3, - semigroupoids >= 4 && < 6, + profunctors >= 5 && < 6, \ No newline at end of file Index: math/hs-pointed/Makefile =================================================================== --- math/hs-pointed/Makefile +++ math/hs-pointed/Makefile @@ -2,7 +2,7 @@ PORTNAME= pointed PORTVERSION= 5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,9 +10,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= comonad data-default-class hashable \ - kan-extensions semigroupoids semigroups \ - stm tagged unordered-containers +USE_CABAL= comonad data-default-class hashable kan-extensions \ + semigroupoids semigroups tagged unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-semigroupoids/Makefile =================================================================== --- math/hs-semigroupoids/Makefile +++ math/hs-semigroupoids/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= semigroupoids -PORTVERSION= 5.2 -PORTREVISION= 1 +PORTVERSION= 5.2.2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-semigroupoids/distinfo =================================================================== --- math/hs-semigroupoids/distinfo +++ math/hs-semigroupoids/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499609808 -SHA256 (cabal/semigroupoids-5.2.tar.gz) = d957f8804ca0dc2b85ef68edcab92dba9cd5d61ea0dddc41c173dda6f97791bc -SIZE (cabal/semigroupoids-5.2.tar.gz) = 23371 +TIMESTAMP = 1523816690 +SHA256 (cabal/semigroupoids-5.2.2.tar.gz) = e4def54834cda65ac1e74e6f12a435410e19c1348e820434a30c491c8937299e +SIZE (cabal/semigroupoids-5.2.2.tar.gz) = 23800 Index: math/hs-semigroups/Makefile =================================================================== --- math/hs-semigroups/Makefile +++ math/hs-semigroups/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= semigroups -PORTVERSION= 0.18.3 -PORTREVISION= 1 +PORTVERSION= 0.18.4 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.1 text>=0.10 transformers-compat>=0.3 unordered-containers>=0.2 +USE_CABAL= hashable>=1.1 transformers-compat>=0.3 unordered-containers>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-semigroups/distinfo =================================================================== --- math/hs-semigroups/distinfo +++ math/hs-semigroups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594594 -SHA256 (cabal/semigroups-0.18.3.tar.gz) = 35297c986872406e2efe29620c623727369f8c578e2f9c22998d575996e5a9ca -SIZE (cabal/semigroups-0.18.3.tar.gz) = 18629 +TIMESTAMP = 1523428484 +SHA256 (cabal/semigroups-0.18.4.tar.gz) = 589e3042329a6bcffb5c0e85834143586db22eb7a2aae094d492cd004f685d27 +SIZE (cabal/semigroups-0.18.4.tar.gz) = 19869 Index: math/hs-vector-space/Makefile =================================================================== --- math/hs-vector-space/Makefile +++ math/hs-vector-space/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vector-space -PORTVERSION= 0.10.4 -PORTREVISION= 1 +PORTVERSION= 0.13 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-vector-space/distinfo =================================================================== --- math/hs-vector-space/distinfo +++ math/hs-vector-space/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623378 -SHA256 (cabal/vector-space-0.10.4.tar.gz) = b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2 -SIZE (cabal/vector-space-0.10.4.tar.gz) = 14249 +TIMESTAMP = 1524638503 +SHA256 (cabal/vector-space-0.13.tar.gz) = 0291d5778378acbbb1d6709ba57238f3d6ad551b8b2c6ca2b8177e68f748d617 +SIZE (cabal/vector-space-0.13.tar.gz) = 16121 Index: net-im/hs-haskell-xmpp/Makefile =================================================================== --- net-im/hs-haskell-xmpp/Makefile +++ net-im/hs-haskell-xmpp/Makefile @@ -2,7 +2,7 @@ PORTNAME= haskell-xmpp PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= HaXml>=1.23.3 html mtl>=1.0 network \ - polyparse random regex-compat stm utf8-string + polyparse random regex-compat utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -245,6 +245,7 @@ SUBDIR += howl SUBDIR += hping SUBDIR += hs-aws + SUBDIR += hs-bsb-http-chunked SUBDIR += hs-connection SUBDIR += hs-gsasl SUBDIR += hs-hoauth2 @@ -258,6 +259,7 @@ SUBDIR += hs-network-uri SUBDIR += hs-pcap SUBDIR += hs-publicsuffixlist + SUBDIR += hs-resolv SUBDIR += hs-sendfile SUBDIR += hs-simple-sendfile SUBDIR += hs-socks Index: net/hs-aws/Makefile =================================================================== --- net/hs-aws/Makefile +++ net/hs-aws/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= aws -PORTVERSION= 0.16 -PORTREVISION= 1 +PORTVERSION= 0.19 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -16,10 +15,12 @@ conduit-extra>=1.1 cryptohash>=0.11 data-default>=0.5.3 \ http-conduit>=2.1 http-types>=0.7 lifted-base>=0.1 \ monad-control>=0.3 mtl network resourcet>=1.1 safe>=0.3 \ - scientific>=0.3 tagged>=0.7 text>=0.11 unordered-containers>=0.2 \ + scientific>=0.3 tagged>=0.7 unordered-containers>=0.2 \ utf8-string>=0.3 vector>=0.10 xml-conduit>=1.2 FLAGS_DISABLE= examples +IGNORE= Doesn't build with recent hs-conduit and hs-resourcet + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: net/hs-aws/distinfo =================================================================== --- net/hs-aws/distinfo +++ net/hs-aws/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623590 -SHA256 (cabal/aws-0.16.tar.gz) = 84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c -SIZE (cabal/aws-0.16.tar.gz) = 99193 +TIMESTAMP = 1525086517 +SHA256 (cabal/aws-0.19.tar.gz) = b43b1215405a2c34b9e7ddac8a9f3cf80fff0f031b365a5c0e4e423f45b5777a +SIZE (cabal/aws-0.19.tar.gz) = 104207 Index: net/hs-aws/files/patch-aws.cabal =================================================================== --- net/hs-aws/files/patch-aws.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- aws.cabal.orig 2017-07-10 15:40:11 UTC -+++ aws.cabal -@@ -145,7 +145,7 @@ Library - unordered-containers >= 0.2, - utf8-string >= 0.3 && < 1.1, - vector >= 0.10, -- xml-conduit >= 1.2 && <1.5 -+ xml-conduit >= 1.2 && <1.6 - - if !impl(ghc >= 7.6) - Build-depends: ghc-prim Index: net/hs-bsb-http-chunked/Makefile =================================================================== --- net/hs-bsb-http-chunked/Makefile +++ net/hs-bsb-http-chunked/Makefile @@ -1,16 +1,13 @@ # $FreeBSD$ -PORTNAME= network-uri -PORTVERSION= 2.6.1.0 -PORTREVISION= 1 +PORTNAME= bsb-http-chunked +PORTVERSION= 0.0.0.2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= URI manipulation +COMMENT= Chunked HTTP transfer encoding for bytestring builders LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: net/hs-bsb-http-chunked/distinfo =================================================================== --- /dev/null +++ net/hs-bsb-http-chunked/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524928561 +SHA256 (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 28cb750979763c815fbf69a6dc510f837b7ccbe262adf0a28ad270966737d5f4 +SIZE (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 6503 Index: net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal =================================================================== --- /dev/null +++ net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal @@ -0,0 +1,9 @@ +--- bsb-http-chunked.cabal.orig 2018-04-28 15:19:50 UTC ++++ bsb-http-chunked.cabal +@@ -43,5 +43,4 @@ Library + Blaze.ByteString.Builder.Internal.Write + + build-depends: base >= 4.3 && < 4.12, +- bytestring >= 0.9 && < 0.11, +- bytestring-builder < 0.11 ++ bytestring >= 0.9 && < 0.11 \ No newline at end of file Index: net/hs-bsb-http-chunked/pkg-descr =================================================================== --- /dev/null +++ net/hs-bsb-http-chunked/pkg-descr @@ -0,0 +1,4 @@ +This library contains functions for encoding bytestring builders for +chunked HTTP/1.1 transfer. + +WWW: http://github.com/sjakobi/bsb-http-chunked Index: net/hs-hoauth2/Makefile =================================================================== --- net/hs-hoauth2/Makefile +++ net/hs-hoauth2/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hoauth2 -PORTVERSION= 0.5.9 -PORTREVISION= 1 +PORTVERSION= 1.7.1 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson http-conduit http-types text unordered-containers \ - wai warp +USE_CABAL= aeson http-conduit http-types microlens unordered-containers \ + uri-bytestring uri-bytestring-aeson wai warp FLAGS_DISABLE= test Index: net/hs-hoauth2/distinfo =================================================================== --- net/hs-hoauth2/distinfo +++ net/hs-hoauth2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501281503 -SHA256 (cabal/hoauth2-0.5.9.tar.gz) = ffa512787b4ef5a32260aa8659260fdd7e0fcafae7c2482275dd85e7a202b25e -SIZE (cabal/hoauth2-0.5.9.tar.gz) = 10864 +TIMESTAMP = 1525036387 +SHA256 (cabal/hoauth2-1.7.1.tar.gz) = bae84321fb0c90013677d6abe754774f05fbb3271ced0844df725ca4edb38216 +SIZE (cabal/hoauth2-1.7.1.tar.gz) = 18045 Index: net/hs-hoauth2/files/patch-hoauth2.cabal =================================================================== --- net/hs-hoauth2/files/patch-hoauth2.cabal +++ net/hs-hoauth2/files/patch-hoauth2.cabal @@ -1,83 +1,26 @@ ---- hoauth2.cabal.orig 2017-04-05 20:01:54 UTC +--- hoauth2.cabal.orig 2018-04-29 21:29:58 UTC +++ hoauth2.cabal -@@ -63,7 +63,7 @@ Library - bytestring >= 0.9 && < 0.11, - http-conduit >= 2.1 && < 2.3, - http-types >= 0.9 && < 0.10, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - unordered-containers >= 0.2.5 - - -@@ -87,7 +87,7 @@ Executable test-weibo - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -111,7 +111,7 @@ Executable test-google - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -135,7 +135,7 @@ Executable test-github - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -158,7 +158,7 @@ Executable test-douban - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 +@@ -77,12 +77,12 @@ Library + bytestring >= 0.9 && < 0.11, + http-conduit >= 2.1 && < 2.4, + http-types >= 0.11 && < 0.13, +- aeson >= 0.11 && < 1.3, ++ aeson >= 0.11 && < 1.4, + unordered-containers >= 0.2.5, + uri-bytestring >= 0.2.3.1 && < 0.4, + uri-bytestring-aeson >= 0.1 && < 0.2, + microlens >= 0.4.0 && < 0.5, +- exceptions >= 0.8.3 && < 0.10 ++ exceptions >= 0.8.3 && < 0.11 if impl(ghc >= 6.12.0) -@@ -181,7 +181,7 @@ Executable test-facebook - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -207,7 +207,7 @@ Executable test-fitbit + ghc-options: -Wall -fwarn-tabs -funbox-strict-fields +@@ -125,7 +125,7 @@ Executable demo-server wai >= 3.2 && < 3.3, warp >= 3.2 && < 3.3, containers >= 0.4 && < 0.6, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - -@@ -231,7 +231,7 @@ Executable test-stackexchange - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) -@@ -254,7 +254,7 @@ Executable test-dropbox - http-conduit >= 2.1 && < 2.3, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.11 && < 1.2, -+ aeson >= 0.11 && < 1.3, - hoauth2 - - if impl(ghc >= 6.12.0) +- aeson >= 0.11 && < 1.3, ++ aeson >= 0.11 && < 1.4, + microlens >= 0.4.0 && < 0.5, + unordered-containers >= 0.2.8 && < 0.2.9, + wai-extra >= 3.0.21.0 && < 3.0.22.0, \ No newline at end of file Index: net/hs-maccatcher/Makefile =================================================================== --- net/hs-maccatcher/Makefile +++ net/hs-maccatcher/Makefile @@ -2,7 +2,7 @@ PORTNAME= maccatcher PORTVERSION= 2.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: net/hs-network-protocol-xmpp/Makefile =================================================================== --- net/hs-network-protocol-xmpp/Makefile +++ net/hs-network-protocol-xmpp/Makefile @@ -2,7 +2,7 @@ PORTNAME= network-protocol-xmpp PORTVERSION= 0.4.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= GPLv3 USE_CABAL= gnuidn>=0.2 gnutls>=0.1.4 gsasl>=0.3 libxml-sax>=0.7 \ - monads-tf>=0.1 network>=2.2 text>=0.10 xml-types>=0.3 + monads-tf>=0.1 network>=2.2 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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-publicsuffixlist/Makefile =================================================================== --- net/hs-publicsuffixlist/Makefile +++ net/hs-publicsuffixlist/Makefile @@ -2,7 +2,7 @@ PORTNAME= publicsuffixlist PORTVERSION= 0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= cereal data-default text>=0.11 utf8-string +USE_CABAL= cereal data-default utf8-string .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: print/hs-hscolour/Makefile =================================================================== --- print/hs-hscolour/Makefile +++ print/hs-hscolour/Makefile @@ -3,7 +3,6 @@ PORTNAME= hscolour PORTVERSION= ${HSCOLOUR_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= print haskell Index: print/hs-hscolour/distinfo =================================================================== --- print/hs-hscolour/distinfo +++ print/hs-hscolour/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623755 -SHA256 (cabal/hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8 -SIZE (cabal/hscolour-1.24.1.tar.gz) = 28717 +TIMESTAMP = 1523651197 +SHA256 (cabal/hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d +SIZE (cabal/hscolour-1.24.4.tar.gz) = 28729 Index: science/Makefile =================================================================== --- science/Makefile +++ science/Makefile @@ -76,7 +76,6 @@ SUBDIR += hdf SUBDIR += hdf5 SUBDIR += hdf5-18 - SUBDIR += hs-bio SUBDIR += hypre SUBDIR += iboview SUBDIR += isaac-cfd Index: science/hs-bio/Makefile =================================================================== --- science/hs-bio/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Created by: Giuseppe Pilichi aka Jacula Modyun -# $FreeBSD$ - -PORTNAME= bio -PORTVERSION= 0.5.3 -PORTREVISION= 4 -CATEGORIES= science haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Bioinformatics library - -LICENSE= LGPL21 - -USE_CABAL= mtl old-time parallel parsec QuickCheck>=2 random tagsoup>=0.8 - -EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include Index: science/hs-bio/distinfo =================================================================== --- science/hs-bio/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/bio-0.5.3.tar.gz) = 42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed -SIZE (cabal/bio-0.5.3.tar.gz) = 103707 Index: science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs =================================================================== --- science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs +++ /dev/null @@ -1,7 +0,0 @@ ---- Bio/Alignment/Bowtie.hs.orig 2013-07-20 07:25:31 UTC -+++ Bio/Alignment/Bowtie.hs -@@ -1,3 +1,4 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| This module provides a data type to represent an alignment - produced by the Bowtie short-read alignment tool (see - ). Index: science/hs-bio/files/patch-bio.cabal =================================================================== --- science/hs-bio/files/patch-bio.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bio.cabal.orig 2011-12-15 12:56:28.000000000 +0100 -+++ ./bio.cabal 2011-12-17 11:02:26.000000000 +0100 -@@ -38,7 +38,7 @@ - Default: True - - Library -- Build-Depends: base>=4 && <5, binary >=0.4 && <0.5, tagsoup>=0.8, bytestring >= 0.9.1, -+ Build-Depends: base>=4 && <5, binary >=0.4, tagsoup>=0.8, bytestring >= 0.9.1, - containers, array, parallel, parsec, mtl, directory, QuickCheck >= 2 - - Exposed-modules: Bio.Sequence, Index: science/hs-bio/pkg-descr =================================================================== --- science/hs-bio/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -This is a collection of data structures and algorithms useful for -building bioinformatics-related tools and utilities. Current list of -features includes: a Sequence data type supporting protein and -nucleotide sequences and conversion between them. As of version 0.4, -different kinds of sequence have different types. Support for quality -data, reading and writing Fasta formatted files, reading TwoBit and phd -formats, and Roche/454 SFF files. Rudimentary (i.e. unoptimized) support -for doing alignments - including dynamic adjustment of scores based on -sequence quality. Also Blast output parsing. Partly implemented single -linkage clustering, and multiple alignment. Reading Gene Ontology (GO) -annotations (GOA) and definitions hierarchy. - -WWW: http://biohaskell.org/Libraries/Bio Index: security/Makefile =================================================================== --- security/Makefile +++ security/Makefile @@ -251,6 +251,7 @@ SUBDIR += hs-cryptohash-sha1 SUBDIR += hs-cryptohash-sha256 SUBDIR += hs-cryptonite + SUBDIR += hs-cryptonite-conduit SUBDIR += hs-digest SUBDIR += hs-ed25519 SUBDIR += hs-entropy Index: security/hs-HsOpenSSL/Makefile =================================================================== --- security/hs-HsOpenSSL/Makefile +++ security/hs-HsOpenSSL/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= HsOpenSSL -PORTVERSION= 0.11.4.9 -PORTREVISION= 1 +PORTVERSION= 0.11.4.13 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-HsOpenSSL/distinfo =================================================================== --- security/hs-HsOpenSSL/distinfo +++ security/hs-HsOpenSSL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450950 -SHA256 (cabal/HsOpenSSL-0.11.4.9.tar.gz) = ea0fe9bb2a6aa9afe5229dfdc44cae493c3fccf9daffa091d2d1aaa09087b378 -SIZE (cabal/HsOpenSSL-0.11.4.9.tar.gz) = 79689 +TIMESTAMP = 1524153978 +SHA256 (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 125cd16f3db36ed102fe8748e474eaca69dbc57ee8794e29863c69d0a47fff47 +SIZE (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 79832 Index: security/hs-certificate/Makefile =================================================================== --- security/hs-certificate/Makefile +++ security/hs-certificate/Makefile @@ -20,5 +20,7 @@ EXECUTABLE_FLAG_CABAL= cmdargs text>=0.11 cryptohash crypto-pubkey EXECUTABLE_FLAG_EXECUTABLE= certificate +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-crypto-conduit/files/patch-crypto-conduit.cabal =================================================================== --- security/hs-crypto-conduit/files/patch-crypto-conduit.cabal +++ security/hs-crypto-conduit/files/patch-crypto-conduit.cabal @@ -1,14 +1,15 @@ ---- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC +--- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC +++ crypto-conduit.cabal @@ -37,9 +37,9 @@ Library Build-depends: base >= 3 && < 5, bytestring >= 0.9, - cereal >= 0.3 && < 0.5, -+ cereal >= 0.3 && < 0.6, - conduit >= 1.0 && < 1.3, +- conduit >= 1.0 && < 1.3, - transformers >= 0.2 && < 0.5, ++ cereal >= 0.3 && < 0.6, ++ conduit >= 1.0 && < 1.4, + transformers >= 0.2 && < 0.6, resourcet if flag(conduit11) - Build-depends: conduit-extra >= 1.1 + Build-depends: conduit-extra >= 1.1 \ No newline at end of file Index: security/hs-cryptohash-md5/Makefile =================================================================== --- security/hs-cryptohash-md5/Makefile +++ security/hs-cryptohash-md5/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-md5 PORTVERSION= 0.11.100.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal =================================================================== --- /dev/null +++ security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal @@ -0,0 +1,11 @@ +--- cryptohash-md5.cabal.orig 2018-04-11 18:11:29 UTC ++++ cryptohash-md5.cabal +@@ -41,7 +41,7 @@ source-repository head + + library + default-language: Haskell2010 +- build-depends: base >= 4.5 && < 4.10 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + hs-source-dirs: src \ No newline at end of file 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= 2 +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-sha1/files/patch-cryptohash-sha1.cabal =================================================================== --- /dev/null +++ security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal @@ -0,0 +1,11 @@ +--- cryptohash-sha1.cabal.orig 2018-04-13 20:05:39 UTC ++++ cryptohash-sha1.cabal +@@ -41,7 +41,7 @@ source-repository head + + library + default-language: Haskell2010 +- build-depends: base >= 4.5 && < 4.10 ++ build-depends: base >= 4.5 && < 4.12 + , bytestring >= 0.9.2 && < 0.11 + + hs-source-dirs: src \ No newline at end of file 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-cryptonite-conduit/Makefile =================================================================== --- security/hs-cryptonite-conduit/Makefile +++ security/hs-cryptonite-conduit/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= cryptohash-md5 -PORTVERSION= 0.11.100.1 -PORTREVISION= 1 +PORTNAME= cryptonite-conduit +PORTVERSION= 0.2.2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= A practical incremental and one-pass, pure API to the MD5 hash algorithm +COMMENT= Cryptonite conduit LICENSE= BSD3CLAUSE +USE_CABAL= conduit conduit-extra cryptonite resourcet + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-cryptonite-conduit/distinfo =================================================================== --- /dev/null +++ security/hs-cryptonite-conduit/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525170379 +SHA256 (cabal/cryptonite-conduit-0.2.2.tar.gz) = 705d69ab3f79b7b8810c7b9e7da81a1c6686b6a4323b1e78150576a25a658dae +SIZE (cabal/cryptonite-conduit-0.2.2.tar.gz) = 5405 Index: security/hs-cryptonite-conduit/pkg-descr =================================================================== --- /dev/null +++ security/hs-cryptonite-conduit/pkg-descr @@ -0,0 +1,5 @@ +Conduit bridge for cryptonite. For now only provide a conduit version for +hash and hmac, but with contribution, this could provide cipher conduits too, +and probably other things. + +WWW: https://github.com/haskell-crypto/cryptonite-conduit 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: security/hs-monadcryptorandom/Makefile =================================================================== --- security/hs-monadcryptorandom/Makefile +++ security/hs-monadcryptorandom/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= monadcryptorandom -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2.1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-monadcryptorandom/distinfo =================================================================== --- security/hs-monadcryptorandom/distinfo +++ security/hs-monadcryptorandom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624172 -SHA256 (cabal/monadcryptorandom-0.7.1.tar.gz) = 85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7 -SIZE (cabal/monadcryptorandom-0.7.1.tar.gz) = 4851 +TIMESTAMP = 1524150252 +SHA256 (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 69453b6f8681033ff68a5afd410a336a37ff149de816439d5c49433d790a760d +SIZE (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 4851 Index: security/hs-nonce/Makefile =================================================================== --- security/hs-nonce/Makefile +++ security/hs-nonce/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= nonce -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.7 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 text>=0.9 +USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 \ + unliftio .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: security/hs-nonce/distinfo =================================================================== --- security/hs-nonce/distinfo +++ security/hs-nonce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537845 -SHA256 (cabal/nonce-1.0.4.tar.gz) = 51661ae3dda7263f1772d628f9a7c08a319dc221b3936ceabea3b2a50f086ef6 -SIZE (cabal/nonce-1.0.4.tar.gz) = 2788 +TIMESTAMP = 1523901488 +SHA256 (cabal/nonce-1.0.7.tar.gz) = 4b4f6232b2cb07a6de47a838b4dc35c346a745683866dbfc6ebb8682158037e1 +SIZE (cabal/nonce-1.0.7.tar.gz) = 2956 Index: security/hs-tls/Makefile =================================================================== --- security/hs-tls/Makefile +++ security/hs-tls/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= tls -PORTVERSION= 1.3.11 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-tls/distinfo =================================================================== --- security/hs-tls/distinfo +++ security/hs-tls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499542268 -SHA256 (cabal/tls-1.3.11.tar.gz) = 3f008eb942874f8114f9a332f9669c44d72825ba39ce0fad89f0f8dfa6fb2703 -SIZE (cabal/tls-1.3.11.tar.gz) = 94342 +TIMESTAMP = 1524684486 +SHA256 (cabal/tls-1.4.1.tar.gz) = bbead1afc0b808bd5cff7bddaeae84ade37f18bbe72bd78d45a2fa4ac41908f8 +SIZE (cabal/tls-1.4.1.tar.gz) = 92647 Index: security/hs-x509-store/Makefile =================================================================== --- security/hs-x509-store/Makefile +++ security/hs-x509-store/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-store -PORTVERSION= 1.6.2 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-x509-store/distinfo =================================================================== --- security/hs-x509-store/distinfo +++ security/hs-x509-store/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594984 -SHA256 (cabal/x509-store-1.6.2.tar.gz) = 49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b -SIZE (cabal/x509-store-1.6.2.tar.gz) = 4326 +TIMESTAMP = 1523784064 +SHA256 (cabal/x509-store-1.6.6.tar.gz) = 6a276f595cf91c9688129cad4c9c6be9c349ffc0de22300eeb3dfa6a2b6e7635 +SIZE (cabal/x509-store-1.6.6.tar.gz) = 10802 Index: security/hs-x509-system/Makefile =================================================================== --- security/hs-x509-system/Makefile +++ security/hs-x509-system/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-system -PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-x509-system/distinfo =================================================================== --- security/hs-x509-system/distinfo +++ security/hs-x509-system/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624174 -SHA256 (cabal/x509-system-1.6.4.tar.gz) = d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c -SIZE (cabal/x509-system-1.6.4.tar.gz) = 3443 +TIMESTAMP = 1524253699 +SHA256 (cabal/x509-system-1.6.6.tar.gz) = 40dcdaae3ec67f38c08d96d4365b901eb8ac0c590bd7972eb429d37d58aa4419 +SIZE (cabal/x509-system-1.6.6.tar.gz) = 3419 Index: security/hs-x509-validation/Makefile =================================================================== --- security/hs-x509-validation/Makefile +++ security/hs-x509-validation/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509-validation -PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTVERSION= 1.6.10 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-x509-validation/distinfo =================================================================== --- security/hs-x509-validation/distinfo +++ security/hs-x509-validation/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499594943 -SHA256 (cabal/x509-validation-1.6.5.tar.gz) = d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4 -SIZE (cabal/x509-validation-1.6.5.tar.gz) = 10370 +TIMESTAMP = 1524342266 +SHA256 (cabal/x509-validation-1.6.10.tar.gz) = 761c9d77322528259b690508e829cb360feb1fc542951a99f3af51ae980e45d7 +SIZE (cabal/x509-validation-1.6.10.tar.gz) = 19356 Index: security/hs-x509/Makefile =================================================================== --- security/hs-x509/Makefile +++ security/hs-x509/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= x509 -PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTVERSION= 1.7.3 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-x509/distinfo =================================================================== --- security/hs-x509/distinfo +++ security/hs-x509/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543706 -SHA256 (cabal/x509-1.6.5.tar.gz) = b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783 -SIZE (cabal/x509-1.6.5.tar.gz) = 16711 +TIMESTAMP = 1523638130 +SHA256 (cabal/x509-1.7.3.tar.gz) = 41740f949bb773dc721d342a85587a512658c81ee8cd38f102473b315e127356 +SIZE (cabal/x509-1.7.3.tar.gz) = 18386 Index: shells/hs-shelly/Makefile =================================================================== --- shells/hs-shelly/Makefile +++ shells/hs-shelly/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shelly -PORTVERSION= 1.6.8.3 -PORTREVISION= 1 +PORTVERSION= 1.7.2 CATEGORIES= shells haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= async enclosed-exceptions exceptions>=0.6 lifted-async \ lifted-base monad-control>=0.3.2 mtl>=2 system-fileio \ - system-filepath>=0.4.7 text transformers-base unix-compat + system-filepath>=0.4.7 transformers-base unix-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: shells/hs-shelly/distinfo =================================================================== --- shells/hs-shelly/distinfo +++ shells/hs-shelly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624201 -SHA256 (cabal/shelly-1.6.8.3.tar.gz) = 78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487 -SIZE (cabal/shelly-1.6.8.3.tar.gz) = 98086 +TIMESTAMP = 1524404401 +SHA256 (cabal/shelly-1.7.2.tar.gz) = 7662c746888a71f785fe00dde6940aeacdec6af700aec567493a99d8e31ef111 +SIZE (cabal/shelly-1.7.2.tar.gz) = 101946 Index: sysutils/hs-angel/Makefile =================================================================== --- sysutils/hs-angel/Makefile +++ sysutils/hs-angel/Makefile @@ -2,7 +2,7 @@ PORTNAME= angel PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \ - stm>=2.0 text>=0.11 unordered-containers>=0.1.4 + unordered-containers>=0.1.4 EXECUTABLE= angel Index: sysutils/hs-ekg-core/Makefile =================================================================== --- sysutils/hs-ekg-core/Makefile +++ sysutils/hs-ekg-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg-core -PORTVERSION= 0.1.1.1 -PORTREVISION= 1 +PORTVERSION= 0.1.1.4 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text unordered-containers +USE_CABAL= unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: sysutils/hs-ekg-core/distinfo =================================================================== --- sysutils/hs-ekg-core/distinfo +++ sysutils/hs-ekg-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538190 -SHA256 (cabal/ekg-core-0.1.1.1.tar.gz) = 54de3df4b1b027aa2f3760b64f6a8c8134f3275b6d95bf1cf1fc0e74282939d6 -SIZE (cabal/ekg-core-0.1.1.1.tar.gz) = 12426 +TIMESTAMP = 1523637800 +SHA256 (cabal/ekg-core-0.1.1.4.tar.gz) = 66d89acca05c1c91dc57a9c4b3f62d25ccd0c04bb2bfd46d5947f9b8cd8ee937 +SIZE (cabal/ekg-core-0.1.1.4.tar.gz) = 13252 Index: sysutils/hs-ekg-core/files/patch-ekg-core.cabal =================================================================== --- /dev/null +++ sysutils/hs-ekg-core/files/patch-ekg-core.cabal @@ -0,0 +1,11 @@ +--- ekg-core.cabal.orig 2018-04-13 16:45:53 UTC ++++ ekg-core.cabal +@@ -33,7 +33,7 @@ library + + build-depends: + ghc-prim < 0.6, +- base >= 4.5 && < 4.11, ++ base >= 4.5 && < 4.12, + containers >= 0.5 && < 0.6, + text < 1.3, + unordered-containers < 0.3 \ No newline at end of file Index: sysutils/hs-ekg-json/Makefile =================================================================== --- sysutils/hs-ekg-json/Makefile +++ sysutils/hs-ekg-json/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg-json -PORTVERSION= 0.1.0.5 -PORTREVISION= 1 +PORTVERSION= 0.1.0.6 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson ekg-core>=0.1 text unordered-containers +USE_CABAL= aeson ekg-core>=0.1 unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: sysutils/hs-ekg-json/distinfo =================================================================== --- sysutils/hs-ekg-json/distinfo +++ sysutils/hs-ekg-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546477 -SHA256 (cabal/ekg-json-0.1.0.5.tar.gz) = 0cd5ecae57a156a5c779acff70d0fa3b02c52cb05283c0effb62a2902ebe8556 -SIZE (cabal/ekg-json-0.1.0.5.tar.gz) = 3092 +TIMESTAMP = 1524430137 +SHA256 (cabal/ekg-json-0.1.0.6.tar.gz) = 1e6a80aa0a28bbf41c9c6364cbb5731160d14fa54145f27a82d0b3467a04dd47 +SIZE (cabal/ekg-json-0.1.0.6.tar.gz) = 3094 Index: sysutils/hs-ekg-json/files/patch-ekg-json.cabal =================================================================== --- /dev/null +++ sysutils/hs-ekg-json/files/patch-ekg-json.cabal @@ -0,0 +1,13 @@ +--- ekg-json.cabal.orig 2018-04-22 20:52:14 UTC ++++ ekg-json.cabal +@@ -20,8 +20,8 @@ library + exposed-modules: + System.Metrics.Json + build-depends: +- aeson >=0.4 && < 1.3, +- base >= 4.5 && < 4.11, ++ aeson >=0.4 && < 1.4, ++ base >= 4.5 && < 4.12, + ekg-core >= 0.1 && < 0.2, + text < 1.3, + unordered-containers < 0.3 \ No newline at end of file Index: sysutils/hs-ekg/Makefile =================================================================== --- sysutils/hs-ekg/Makefile +++ sysutils/hs-ekg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ekg -PORTVERSION= 0.4.0.13 -PORTREVISION= 1 +PORTVERSION= 0.4.0.15 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson ekg-core>=0.1 ekg-json>=0.1 network snap-core \ - snap-server text unordered-containers + snap-server unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: sysutils/hs-ekg/distinfo =================================================================== --- sysutils/hs-ekg/distinfo +++ sysutils/hs-ekg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624252 -SHA256 (cabal/ekg-0.4.0.13.tar.gz) = 44b1d5987e8d8061aaf05fd96f9072399ba16b07999caf5186e856c7e47bb48f -SIZE (cabal/ekg-0.4.0.13.tar.gz) = 171231 +TIMESTAMP = 1525008611 +SHA256 (cabal/ekg-0.4.0.15.tar.gz) = 482ae3be495cfe4f03332ad1c79ce8b5ad4f9c8eec824980c664808ae32c6dcc +SIZE (cabal/ekg-0.4.0.15.tar.gz) = 171305 Index: sysutils/hs-ekg/files/patch-ekg.cabal =================================================================== --- /dev/null +++ sysutils/hs-ekg/files/patch-ekg.cabal @@ -0,0 +1,11 @@ +--- ekg.cabal.orig 2018-04-29 13:38:25 UTC ++++ ekg.cabal +@@ -39,7 +39,7 @@ library + System.Remote.Snap + + build-depends: +- aeson >= 0.4 && < 1.3, ++ aeson >= 0.4 && < 1.4, + base >= 4.5 && < 4.12, + bytestring < 1.0, + ekg-core >= 0.1 && < 0.2, \ No newline at end of file Index: textproc/Makefile =================================================================== --- textproc/Makefile +++ textproc/Makefile @@ -259,6 +259,7 @@ SUBDIR += hs-case-insensitive SUBDIR += hs-cassava SUBDIR += hs-cmark + SUBDIR += hs-cmark-gfm SUBDIR += hs-csv SUBDIR += hs-doctemplates SUBDIR += hs-double-conversion @@ -279,7 +280,6 @@ SUBDIR += hs-pandoc SUBDIR += hs-pandoc-citeproc SUBDIR += hs-pandoc-types - SUBDIR += hs-parsec SUBDIR += hs-polyparse SUBDIR += hs-pretty-show SUBDIR += hs-regex-applicative @@ -293,6 +293,7 @@ SUBDIR += hs-rfc5051 SUBDIR += hs-scanner SUBDIR += hs-skylighting + SUBDIR += hs-skylighting-core SUBDIR += hs-stringsearch SUBDIR += hs-tagsoup SUBDIR += hs-tagstream-conduit @@ -300,6 +301,7 @@ SUBDIR += hs-uri SUBDIR += hs-uri-bytestring SUBDIR += hs-uri-bytestring-aeson + SUBDIR += hs-uri-encode SUBDIR += hs-xml SUBDIR += hs-xml-conduit SUBDIR += hs-xml-hamlet Index: textproc/cgrep/Makefile =================================================================== --- textproc/cgrep/Makefile +++ textproc/cgrep/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= cgrep -PORTVERSION= 6.4.3 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 6.6.25 CATEGORIES= textproc MAINTAINER= lwhsu@FreeBSD.org @@ -12,29 +10,12 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ghc:lang/ghc \ - hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \ - hs-cmdargs>=0.10:devel/hs-cmdargs \ - hs-dlist>=0.3:devel/hs-dlist \ - hs-regex-posix>=0.90:textproc/hs-regex-posix \ - hs-safe>=0.3:devel/hs-safe \ - hs-split>=0.2:devel/hs-split \ - hs-stm>=2.1:devel/hs-stm \ - hs-stringsearch>=0.3:textproc/hs-stringsearch \ - hs-unordered-containers>=0.1:devel/hs-unordered-containers +USE_CABAL= aeson ansi-terminal async cmdargs either exceptions regex-pcre \ + regex-posix safe split stringsearch unicode-show unix-compat \ + utf8-string yaml -USE_GITHUB= yes -GH_ACCOUNT= awgn - -USES= gmake - -do-build: - cd ${WRKSRC}/src && ${GMAKE} cgrep - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/cgrep ${STAGEDIR}${PREFIX}/bin/ - - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/cgreprc ${STAGEDIR}${DATADIR} +EXECUTABLE= cgrep +STANDALONE= yes +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/cgrep/distinfo =================================================================== --- textproc/cgrep/distinfo +++ textproc/cgrep/distinfo @@ -1,2 +1,3 @@ -SHA256 (awgn-cgrep-v6.4.3_GH0.tar.gz) = 65cd59f50de4e1865cd39d198da21beb76ba898d859d07718e6605f7ff33ae78 -SIZE (awgn-cgrep-v6.4.3_GH0.tar.gz) = 33419 +TIMESTAMP = 1525721128 +SHA256 (cabal/cgrep-6.6.25.tar.gz) = 9c5ef414859b13b207e1b0867428ce159927868c9b28446c28013d5996f05931 +SIZE (cabal/cgrep-6.6.25.tar.gz) = 34671 Index: textproc/cgrep/files/patch-src_Main.hs =================================================================== --- textproc/cgrep/files/patch-src_Main.hs +++ /dev/null @@ -1,32 +0,0 @@ -Backport of: -From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001 -From: ilovezfs -Date: Mon, 23 May 2016 03:53:52 -0700 -Subject: [PATCH] cgrep: fix isSymbolicLink collision - -System.Directory.isSymbolicLink collides with -System.PosixCompat.Files.isSymbolicLink (and with -System.Posix.Files.isSymbolicLink) - -This applies the solution proposed here: -https://github.com/haskell/directory/issues/52#issuecomment-220879392 ---- src/Main.hs.orig 2014-06-21 09:27:05 UTC -+++ src/Main.hs -@@ -37,7 +37,7 @@ import System.Console.CmdArgs - import System.Directory - import System.FilePath ((), takeFileName) - import System.Environment --import System.Posix.Files -+import System.Posix.Files as PosixFiles - import System.IO - import System.Exit - -@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir - status <- getFileStatus path - lstatus <- getSymbolicLinkStatus path - unless (cpath `Set.member` visited) $ -- if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts) -+ if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts) - then unless (filename `elem` prunedir) $ - putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited) - else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of Index: textproc/cgrep/pkg-plist =================================================================== --- textproc/cgrep/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/cgrep -%%DATADIR%%/cgreprc Index: textproc/hs-HStringTemplate/Makefile =================================================================== --- textproc/hs-HStringTemplate/Makefile +++ textproc/hs-HStringTemplate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= HStringTemplate -PORTVERSION= 0.8.6 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder mtl old-locale parsec syb text void +USE_CABAL= blaze-builder mtl old-locale syb void .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-HStringTemplate/distinfo =================================================================== --- textproc/hs-HStringTemplate/distinfo +++ textproc/hs-HStringTemplate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538746 -SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd -SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034 +TIMESTAMP = 1523960618 +SHA256 (cabal/HStringTemplate-0.8.7.tar.gz) = 4f4ea4aa2e45e7c45821b87b0105c201fbadebc2f2d00c211e728403a0af6b0e +SIZE (cabal/HStringTemplate-0.8.7.tar.gz) = 15903 Index: textproc/hs-HaXml/Makefile =================================================================== --- textproc/hs-HaXml/Makefile +++ textproc/hs-HaXml/Makefile @@ -16,5 +16,7 @@ EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \ MkOneOf Validate XsdToHaskell Xtract +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-attoparsec-enumerator/Makefile =================================================================== --- textproc/hs-attoparsec-enumerator/Makefile +++ textproc/hs-attoparsec-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-enumerator PORTVERSION= 0.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text +USE_CABAL= attoparsec>=0.10 enumerator>=0.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-attoparsec-iso8601/Makefile =================================================================== --- textproc/hs-attoparsec-iso8601/Makefile +++ textproc/hs-attoparsec-iso8601/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-iso8601 PORTVERSION= 1.0.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec base-compat text +USE_CABAL= attoparsec base-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal =================================================================== --- /dev/null +++ textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal @@ -0,0 +1,10 @@ +--- attoparsec-iso8601.cabal.orig 2018-04-29 20:25:05 UTC ++++ attoparsec-iso8601.cabal +@@ -37,7 +37,7 @@ library + build-depends: + attoparsec >= 0.13.0.1, + base >= 4.5 && < 5, +- base-compat >= 0.9.1 && < 0.10, ++ base-compat >= 0.9.1 && < 0.11, + text >= 1.1.1.0, + time >= 1.1.1.4 Index: textproc/hs-attoparsec/Makefile =================================================================== --- textproc/hs-attoparsec/Makefile +++ textproc/hs-attoparsec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= attoparsec -PORTVERSION= 0.13.1.0 -PORTREVISION= 1 +PORTVERSION= 0.13.2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= scientific text +USE_CABAL= scientific .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-attoparsec/distinfo =================================================================== --- textproc/hs-attoparsec/distinfo +++ textproc/hs-attoparsec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537691 -SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64 -SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512 +TIMESTAMP = 1523636401 +SHA256 (cabal/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848 +SIZE (cabal/attoparsec-0.13.2.2.tar.gz) = 159729 Index: textproc/hs-bencode/Makefile =================================================================== --- textproc/hs-bencode/Makefile +++ textproc/hs-bencode/Makefile @@ -2,7 +2,7 @@ PORTNAME= bencode PORTVERSION= 0.6.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-blaze-html/Makefile =================================================================== --- textproc/hs-blaze-html/Makefile +++ textproc/hs-blaze-html/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-html PORTVERSION= 0.9.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10 +USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-blaze-markup/Makefile =================================================================== --- textproc/hs-blaze-markup/Makefile +++ textproc/hs-blaze-markup/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-markup -PORTVERSION= 0.8.0.0 -PORTREVISION= 1 +PORTVERSION= 0.8.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2 text>=0.10 +USE_CABAL= blaze-builder>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-blaze-markup/distinfo =================================================================== --- textproc/hs-blaze-markup/distinfo +++ textproc/hs-blaze-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624825 -SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f -SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054 +TIMESTAMP = 1523696236 +SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146 +SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320 Index: textproc/hs-case-insensitive/Makefile =================================================================== --- textproc/hs-case-insensitive/Makefile +++ textproc/hs-case-insensitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= case-insensitive -PORTVERSION= 1.2.0.10 -PORTREVISION= 1 +PORTVERSION= 1.2.0.11 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.0 text>=0.3 +USE_CABAL= hashable>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-case-insensitive/distinfo =================================================================== --- textproc/hs-case-insensitive/distinfo +++ textproc/hs-case-insensitive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499445486 -SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c -SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630 +TIMESTAMP = 1523428332 +SHA256 (cabal/case-insensitive-1.2.0.11.tar.gz) = a7ce6d17e50caaa0f19ad8e67361499022860554c521b1e57993759da3eb37e3 +SIZE (cabal/case-insensitive-1.2.0.11.tar.gz) = 53581 Index: textproc/hs-cassava/Makefile =================================================================== --- textproc/hs-cassava/Makefile +++ textproc/hs-cassava/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cassava -PORTVERSION= 0.5.0.0 -PORTREVISION= 1 +PORTVERSION= 0.5.1.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec blaze-builder hashable Only text text-short \ +USE_CABAL= attoparsec blaze-builder hashable Only text-short \ unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: textproc/hs-cassava/distinfo =================================================================== --- textproc/hs-cassava/distinfo +++ textproc/hs-cassava/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538420 -SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9 -SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476 +TIMESTAMP = 1524429884 +SHA256 (cabal/cassava-0.5.1.0.tar.gz) = 762c8aaea2cdad61f52bad1b9f1f3b32764b4b6da03371aba6e5017f69614277 +SIZE (cabal/cassava-0.5.1.0.tar.gz) = 37603 Index: textproc/hs-cmark-gfm/Makefile =================================================================== --- textproc/hs-cmark-gfm/Makefile +++ textproc/hs-cmark-gfm/Makefile @@ -1,16 +1,13 @@ # $FreeBSD$ -PORTNAME= parsec -PORTVERSION= 3.1.11 -PORTREVISION= 1 +PORTNAME= cmark-gfm +PORTVERSION= 0.1.3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Monadic parser combinators +COMMENT= Fast, accurate GitHub Flavored Markdown parser and renderer LICENSE= BSD3CLAUSE -USE_CABAL= mtl text>=0.2 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-cmark-gfm/distinfo =================================================================== --- /dev/null +++ textproc/hs-cmark-gfm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524942342 +SHA256 (cabal/cmark-gfm-0.1.3.tar.gz) = 731cb392e4edfd18d0dae709904791610588e6770934e5112cbdd5e6f3d271ba +SIZE (cabal/cmark-gfm-0.1.3.tar.gz) = 198348 Index: textproc/hs-cmark-gfm/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-cmark-gfm/pkg-descr @@ -0,0 +1,6 @@ +This package provides Haskell bindings for libcmark-gfm, the reference parser +for GitHub Flavored Markdown, a fully specified variant of Markdown. It +includes sources for libcmark-gfm (0.28.0) and does not require prior +installation of the C library. + +WWW: https://github.com/kivikakk/cmark-gfm-hs Index: textproc/hs-cmark/Makefile =================================================================== --- textproc/hs-cmark/Makefile +++ textproc/hs-cmark/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cmark -PORTVERSION= 0.5.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=1.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-cmark/distinfo =================================================================== --- textproc/hs-cmark/distinfo +++ textproc/hs-cmark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448212 -SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d -SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811 +TIMESTAMP = 1523465640 +SHA256 (cabal/cmark-0.5.6.tar.gz) = 855c4b7aca6d4e9eb076beb6cc6f74e7578fae7aa3625fd3fca5e3b4901a32b0 +SIZE (cabal/cmark-0.5.6.tar.gz) = 170850 Index: textproc/hs-csv/Makefile =================================================================== --- textproc/hs-csv/Makefile +++ textproc/hs-csv/Makefile @@ -3,7 +3,7 @@ PORTNAME= csv PORTVERSION= 0.1.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ LICENSE= MIT -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-doctemplates/Makefile =================================================================== --- textproc/hs-doctemplates/Makefile +++ textproc/hs-doctemplates/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= doctemplates -PORTVERSION= 0.1.0.2 -PORTREVISION= 1 +PORTVERSION= 0.2.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \ - unordered-containers vector +USE_CABAL= aeson blaze-html blaze-markup scientific unordered-containers \ + vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-doctemplates/distinfo =================================================================== --- textproc/hs-doctemplates/distinfo +++ textproc/hs-doctemplates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720884 -SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b -SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924 +TIMESTAMP = 1524418494 +SHA256 (cabal/doctemplates-0.2.2.1.tar.gz) = 6b0cfb565fc7fa90d71ac56b83aedecf670678e6f1441278877fbf399e9bccbf +SIZE (cabal/doctemplates-0.2.2.1.tar.gz) = 6139 Index: textproc/hs-double-conversion/Makefile =================================================================== --- textproc/hs-double-conversion/Makefile +++ textproc/hs-double-conversion/Makefile @@ -2,7 +2,7 @@ PORTNAME= double-conversion PORTVERSION= 2.0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,12 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.11.0.8 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" - -.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal -.endif - .include Index: textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal =================================================================== --- textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal +++ /dev/null @@ -1,12 +0,0 @@ ---- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC -+++ double-conversion.cabal -@@ -71,7 +71,8 @@ library - double-conversion/src/fixed-dtoa.cc - double-conversion/src/strtod.cc - -- extra-libraries: stdc++ -+ cc-options: -std=c++11 -stdlib=libc++ -+ extra-libraries: cxxrt gcc_s - - include-dirs: - double-conversion/src Index: textproc/hs-feed/Makefile =================================================================== --- textproc/hs-feed/Makefile +++ textproc/hs-feed/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= feed -PORTVERSION= 0.3.12.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,9 @@ LICENSE= BSD3CLAUSE -USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \ - utf8-string xml>=1.2.6 +USE_CABAL= base-compat old-locale>=1.0 old-time>=1 safe \ + time-locale-compat>=0.1 utf8-string xml>=1.2.6 xml-conduit \ + xml-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-feed/distinfo =================================================================== --- textproc/hs-feed/distinfo +++ textproc/hs-feed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538656 -SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942 -SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415 +TIMESTAMP = 1523695585 +SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17 +SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936 Index: textproc/hs-feed/files/patch-feed.cabal =================================================================== --- /dev/null +++ textproc/hs-feed/files/patch-feed.cabal @@ -0,0 +1,31 @@ +--- feed.cabal.orig 2017-08-26 23:55:46 UTC ++++ feed.cabal +@@ -71,8 +71,8 @@ library + Data.Text.Util + Data.XML.Compat + build-depends: +- base >= 4 && < 4.11 +- , base-compat == 0.9.* ++ base >= 4 && < 4.12 ++ , base-compat == 0.10.* + , bytestring >= 0.9 && < 0.11 + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 +@@ -82,7 +82,7 @@ library + , time-locale-compat == 0.1.* + , utf8-string < 1.1 + , xml-types >= 0.3.6 && < 0.4 +- , xml-conduit >= 1.3 && < 1.6 ++ , xml-conduit >= 1.3 && < 1.9 + + test-suite tests + ghc-options: -Wall +@@ -104,7 +104,7 @@ test-suite tests + build-depends: + base >= 4 && < 4.11 + , HUnit >= 1.2 && < 1.7 +- , base-compat == 0.9.* ++ , base-compat == 0.10.* + , feed + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 \ No newline at end of file Index: textproc/hs-hexpat/Makefile =================================================================== --- textproc/hs-hexpat/Makefile +++ textproc/hs-hexpat/Makefile @@ -2,7 +2,7 @@ PORTNAME= hexpat PORTVERSION= 0.20.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 -USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3 +USE_CABAL= List>=0.4.2 utf8-string>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-highlighting-kate/Makefile =================================================================== --- textproc/hs-highlighting-kate/Makefile +++ textproc/hs-highlighting-kate/Makefile @@ -2,7 +2,7 @@ PORTNAME= highlighting-kate PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,8 @@ LICENSE= GPLv2 -USE_CABAL= blaze-html>=0.4.2 mtl parsec \ - regex-pcre-builtin>=0.94.4.8.8.35 utf8-string +USE_CABAL= blaze-html>=0.4.2 mtl regex-pcre-builtin>=0.94.4.8.8.35 \ + utf8-string FLAGS_DEFINE= EXECUTABLE Index: textproc/hs-hs-bibutils/Makefile =================================================================== --- textproc/hs-hs-bibutils/Makefile +++ textproc/hs-hs-bibutils/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hs-bibutils -PORTVERSION= 5.5 -PORTREVISION= 2 +PORTVERSION= 6.2.0.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-hs-bibutils/distinfo =================================================================== --- textproc/hs-hs-bibutils/distinfo +++ textproc/hs-hs-bibutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624830 -SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d -SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546 +TIMESTAMP = 1525094674 +SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630 +SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725 Index: textproc/hs-html-conduit/Makefile =================================================================== --- textproc/hs-html-conduit/Makefile +++ textproc/hs-html-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= html-conduit -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \ - tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3 + tagstream-conduit>=0.5.5.3 xml-conduit>=1.3 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-html-conduit/distinfo =================================================================== --- textproc/hs-html-conduit/distinfo +++ textproc/hs-html-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624831 -SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8 -SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125 +TIMESTAMP = 1524851689 +SHA256 (cabal/html-conduit-1.3.0.tar.gz) = 78bf09e175079bdd0f0dd363b3a4b2d32d095cc09413ca9d8069bc527809ee96 +SIZE (cabal/html-conduit-1.3.0.tar.gz) = 4458 Index: textproc/hs-html-conduit/files/patch-html-conduit.cabal =================================================================== --- textproc/hs-html-conduit/files/patch-html-conduit.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC -+++ html-conduit.cabal -@@ -22,7 +22,7 @@ Library - , resourcet >= 0.3 && < 1.2 - , conduit >= 1.0 && < 1.3 - , conduit-extra >= 1.1.1 -- , xml-conduit >= 1.3 && < 1.5 -+ , xml-conduit >= 1.3 && < 1.6 - , tagstream-conduit >= 0.5.5.3 && < 0.6 - , xml-types >= 0.3 && < 0.4 - Index: textproc/hs-hxt-regex-xmlschema/Makefile =================================================================== --- textproc/hs-hxt-regex-xmlschema/Makefile +++ textproc/hs-hxt-regex-xmlschema/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-regex-xmlschema PORTVERSION= 9.2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10 +USE_CABAL= hxt-charproperties>=9.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-hxt/Makefile =================================================================== --- textproc/hs-hxt/Makefile +++ textproc/hs-hxt/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt PORTVERSION= 9.3.1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +11,7 @@ LICENSE= MIT USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \ - hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \ - parsec>=2.1 + hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-lhs2tex/Makefile =================================================================== --- textproc/hs-lhs2tex/Makefile +++ textproc/hs-lhs2tex/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lhs2tex -PORTVERSION= 1.19 -PORTREVISION= 2 +PORTVERSION= 1.20 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-lhs2tex/distinfo =================================================================== --- textproc/hs-lhs2tex/distinfo +++ textproc/hs-lhs2tex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624833 -SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e -SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353 +TIMESTAMP = 1524639224 +SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a +SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326 Index: textproc/hs-lhs2tex/files/patch-Setup.hs =================================================================== --- textproc/hs-lhs2tex/files/patch-Setup.hs +++ textproc/hs-lhs2tex/files/patch-Setup.hs @@ -1,6 +1,6 @@ ---- Setup.hs.orig 2012-09-08 22:29:52.000000000 +0100 -+++ Setup.hs 2013-12-08 15:55:17.403235103 +0000 -@@ -205,7 +205,7 @@ +--- Setup.hs.orig 2017-09-29 08:44:16 UTC ++++ Setup.hs +@@ -210,7 +210,7 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc" let manDir = if isWindows then dataPref `joinFileName` "Documentation" @@ -9,7 +9,7 @@ createDirectoryIfMissing True docDir installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf") when (not isWindows) $ -@@ -213,7 +213,8 @@ +@@ -218,7 +218,8 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer installOrdinaryFile v ("lhs2TeX.1") (manDir `joinFileName` "lhs2TeX.1") -- polytable case (installPolyTable ebi) of Index: textproc/hs-lhs2tex/files/patch-src_Document.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_Document.lhs @@ -0,0 +1,10 @@ +--- src/Document.lhs.orig 2018-04-25 07:05:53 UTC ++++ src/Document.lhs +@@ -9,6 +9,7 @@ + + %endif + ++> import Prelude hiding ((<>)) + > infixr 5 {-"\enskip"-} <> -- same fixity as `|++|' + + The pretty printer generate documents of type |Doc|. Index: textproc/hs-lhs2tex/files/patch-src_Main.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_Main.lhs @@ -0,0 +1,11 @@ +--- src/Main.lhs.orig 2018-04-25 07:41:09 UTC ++++ src/Main.lhs +@@ -21,7 +21,7 @@ + > import Control.Monad.Error + > import Control.Monad.State ( MonadState(..), modify ) + > import Control.Monad.Trans +-> import Prelude hiding ( getContents ) ++> import Prelude hiding ( getContents, (<>) ) + > + > import Version + > import TeXCommands Index: textproc/hs-lhs2tex/files/patch-src_Math.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_Math.lhs @@ -0,0 +1,11 @@ +--- src/Math.lhs.orig 2018-04-25 07:40:44 UTC ++++ src/Math.lhs +@@ -7,7 +7,7 @@ + > module Math ( module Math, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) Index: textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs @@ -0,0 +1,11 @@ +--- src/MathPoly.lhs.orig 2018-04-25 07:08:26 UTC ++++ src/MathPoly.lhs +@@ -13,7 +13,7 @@ are subtle differences, and they will grow over time \ + > module MathPoly ( module MathPoly, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition, nub, insert, sort, transpose ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) Index: textproc/hs-lhs2tex/files/patch-src_NewCode.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_NewCode.lhs @@ -0,0 +1,10 @@ +--- src/NewCode.lhs.orig 2018-04-25 07:08:55 UTC ++++ src/NewCode.lhs +@@ -13,6 +13,7 @@ way that is compatible with the @poly@ or @math@ forma + > module NewCode ( module NewCode ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad ( (>=>) ) + > import Data.List ( partition ) + > Index: textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs @@ -0,0 +1,10 @@ +--- src/Typewriter.lhs.orig 2018-04-25 07:07:53 UTC ++++ src/Typewriter.lhs +@@ -7,6 +7,7 @@ + > module Typewriter ( module Typewriter ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad + > + > import Verbatim ( trim, expand ) Index: textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs =================================================================== --- /dev/null +++ textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs @@ -0,0 +1,10 @@ +--- src/Verbatim.lhs.orig 2018-04-25 07:07:15 UTC ++++ src/Verbatim.lhs +@@ -7,6 +7,7 @@ + > module Verbatim ( module Verbatim ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Arrow ( (>>>) ) + > import Data.Char + > import Data.List ( intersperse ) Index: textproc/hs-libxml-sax/Makefile =================================================================== --- textproc/hs-libxml-sax/Makefile +++ textproc/hs-libxml-sax/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxml-sax PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= MIT -USE_CABAL= text>=0.7 xml-types>=0.3 +USE_CABAL= xml-types>=0.3 USES= pkgconfig LIB_DEPENDS= libxml2.so:textproc/libxml2 Index: textproc/hs-pandoc-citeproc/Makefile =================================================================== --- textproc/hs-pandoc-citeproc/Makefile +++ textproc/hs-pandoc-citeproc/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandoc-citeproc -PORTVERSION= 0.10.5.1 -PORTREVISION= 1 +PORTVERSION= 0.14.3.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \ - mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \ - setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \ + mtl pandoc>=1.13 pandoc-types>=1.12.3 rfc5051 \ + setenv>=0.1 split syb tagsoup vector xml-conduit>=1.2 \ yaml>=0.8.8.7 EXECUTABLE= pandoc-citeproc Index: textproc/hs-pandoc-citeproc/distinfo =================================================================== --- textproc/hs-pandoc-citeproc/distinfo +++ textproc/hs-pandoc-citeproc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624836 -SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783 -SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993 +TIMESTAMP = 1525014746 +SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a +SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846 Index: textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal =================================================================== --- textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal +++ /dev/null @@ -1,38 +0,0 @@ ---- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC -+++ pandoc-citeproc.cabal -@@ -99,7 +99,7 @@ library - ghc-prof-options: -fprof-auto-exported - build-depends: containers, directory, mtl, - bytestring, filepath, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - tagsoup, - aeson >= 0.7 && < 1.3, -@@ -146,7 +146,7 @@ executable pandoc-citeproc - ghc-options: -funbox-strict-fields -Wall - ghc-prof-options: -fprof-auto-exported -rtsopts - build-depends: base >= 4, pandoc-citeproc, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - aeson, - aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, -@@ -169,7 +169,7 @@ executable test-citeproc - else - Buildable: False - build-depends: base >= 4, aeson, directory, text, mtl, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, -@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc - Prelude - Hs-Source-Dirs: tests, prelude, compat - build-depends: base >= 4, aeson, directory, text, -- pandoc-types >= 1.16 && < 1.18, mtl, -+ pandoc-types >= 1.16 && < 1.20, mtl, - pandoc >= 1.16 && < 2.1, filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.8.8.7 Index: textproc/hs-pandoc-types/Makefile =================================================================== --- textproc/hs-pandoc-types/Makefile +++ textproc/hs-pandoc-types/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= pandoc-types -PORTVERSION= 1.19 -PORTREVISION= 1 +PORTVERSION= 1.17.4.2 +PORTEPOCH= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-pandoc-types/distinfo =================================================================== --- textproc/hs-pandoc-types/distinfo +++ textproc/hs-pandoc-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543994 -SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf -SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942 +TIMESTAMP = 1524405363 +SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca +SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035 Index: textproc/hs-pandoc-types/files/patch-pandoc-types.cabal =================================================================== --- textproc/hs-pandoc-types/files/patch-pandoc-types.cabal +++ /dev/null @@ -1,24 +0,0 @@ ---- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC -+++ pandoc-types.cabal -@@ -48,10 +48,10 @@ Library - Other-modules: Paths_pandoc_types - Build-depends: base >= 4 && < 5, - containers >= 0.3, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - ghc-prim >= 0.2, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - QuickCheck >= 2 - if impl(ghc < 7.10) - Build-depends: deepseq-generics >= 0.1 && < 0.2 -@@ -65,7 +65,7 @@ test-suite test-pandoc-types - build-depends: base, - pandoc-types, - syb, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - containers >= 0.3, - bytestring >= 0.9 && < 0.11, - test-framework >= 0.3 && < 0.9, Index: textproc/hs-pandoc/Makefile =================================================================== --- textproc/hs-pandoc/Makefile +++ textproc/hs-pandoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pandoc -PORTVERSION= 1.19.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,14 +10,14 @@ LICENSE= GPLv2 -USE_CABAL= aeson base64-bytestring blaze-html \ - blaze-markup cmark data-default \ +USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \ + blaze-markup cmark cmark-gfm data-default \ deepseq-generics doctemplates extensible-exceptions \ - filemanip haddock-library highlighting-kate \ - hslua HTTP JuicyPixels mtl \ - network network-uri pandoc-types parsec \ + filemanip haddock-library \ + hslua hslua-module-text HTTP JuicyPixels mtl \ + network network-uri pandoc-types \ random scientific SHA skylighting syb tagsoup\ - temporary texmath text \ + temporary texmath \ unordered-containers vector xml \ yaml zip-archive zlib @@ -49,7 +48,7 @@ TRYPANDOC_DESC= Build trypandoc cgi executable TRYPANDOC_FLAG_ENABLE= trypandoc -TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \ +TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 \ http-types TRYPANDOC_FLAG_EXECUTABLE= trypandoc Index: textproc/hs-pandoc/distinfo =================================================================== --- textproc/hs-pandoc/distinfo +++ textproc/hs-pandoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624835 -SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801 -SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101 +TIMESTAMP = 1524940319 +SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569 +SIZE (cabal/pandoc-2.2.tar.gz) = 8995928 Index: textproc/hs-pandoc/files/patch-pandoc.cabal =================================================================== --- textproc/hs-pandoc/files/patch-pandoc.cabal +++ /dev/null @@ -1,83 +0,0 @@ ---- pandoc.cabal.orig 2017-01-31 15:02:20 UTC -+++ pandoc.cabal -@@ -253,7 +253,7 @@ Flag old-locale - - Library - Build-Depends: base >= 4.7 && <5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - containers >= 0.1 && < 0.6, - unordered-containers >= 0.2 && < 0.3, - array >= 0.3 && < 0.6, -@@ -270,12 +270,12 @@ Library - xml >= 1.3.12 && < 1.4, - random >= 1 && < 1.2, - extensible-exceptions >= 0.1 && < 0.2, -- pandoc-types >= 1.17 && < 1.18, -- aeson >= 0.7 && < 1.2, -+ pandoc-types >= 1.17 && < 1.20, -+ aeson >= 0.7 && < 1.3, - tagsoup >= 0.13.7 && < 0.15, - base64-bytestring >= 0.1 && < 1.1, - zlib >= 0.5 && < 0.7, -- skylighting >= 0.1.1.4 && < 0.2, -+ skylighting >= 0.1.1.4 && < 0.4, - data-default >= 0.4 && < 0.8, - temporary >= 1.1 && < 1.3, - blaze-html >= 0.5 && < 0.10, -@@ -283,7 +283,7 @@ Library - yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.13, -- hslua >= 0.3 && < 0.5, -+ hslua >= 0.3 && < 0.6, - binary >= 0.5 && < 0.9, - SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.5, -@@ -424,15 +424,15 @@ Library - - Executable pandoc - Build-Depends: pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - base >= 4.2 && <5, - directory >= 1.2 && < 1.4, - filepath >= 1.1 && < 1.5, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, - extensible-exceptions >= 0.1 && < 0.2, -- skylighting >= 0.1.1.3 && < 0.2, -- aeson >= 0.7.0.5 && < 1.2, -+ skylighting >= 0.1.1.3 && < 0.4, -+ aeson >= 0.7.0.5 && < 1.3, - yaml >= 0.8.8.2 && < 0.9, - containers >= 0.1 && < 0.6, - HTTP >= 4000.0.5 && < 4000.4 -@@ -498,15 +498,15 @@ Test-Suite test-pandoc - Hs-Source-Dirs: prelude - Other-Modules: Prelude - Build-Depends: base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.3, - directory >= 1 && < 1.4, - filepath >= 1.1 && < 1.5, - process >= 1 && < 1.5, -- skylighting >= 0.1.1.3 && < 0.2, -+ skylighting >= 0.1.1.3 && < 0.4, - Diff >= 0.2 && < 0.4, - test-framework >= 0.3 && < 0.9, - test-framework-hunit >= 0.2 && < 0.4, -@@ -553,7 +553,7 @@ benchmark benchmark-pandoc - Other-Modules: Prelude - Build-Depends: pandoc, - base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - criterion >= 1.0 && < 1.2 - Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind - Default-Language: Haskell98 Index: textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs =================================================================== --- textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC -+++ src/Text/Pandoc/Writers/Custom.hs -@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do - setForeignEncoding utf8 - lua <- Lua.newstate - Lua.openlibs lua -+#if MIN_VERSION_hslua(0,5,0) -+ status <- Lua.loadstring lua luaScript -+#else - status <- Lua.loadstring lua luaScript luaFile -+#endif - -- check for error in lua script (later we'll change the return type - -- to handle this more gracefully): - when (status /= 0) $ Index: textproc/hs-parsec/distinfo =================================================================== --- textproc/hs-parsec/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499618976 -SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e -SIZE (cabal/parsec-3.1.11.tar.gz) = 32412 Index: textproc/hs-parsec/pkg-descr =================================================================== --- textproc/hs-parsec/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Parsec is designed from scratch as an industrial-strength parser -library. It is simple, safe, well documented (on the package homepage), -has extensive libraries and good error messages, and is also fast. It -is defined as a monad transformer that can be stacked on arbitrary -monads, and it is also parametric in the input stream type. - -WWW: https://github.com/aslatter/parsec Index: textproc/hs-polyparse/Makefile =================================================================== --- textproc/hs-polyparse/Makefile +++ textproc/hs-polyparse/Makefile @@ -2,7 +2,7 @@ PORTNAME= polyparse PORTVERSION= 1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= LGPL21 -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-pretty-show/Makefile =================================================================== --- textproc/hs-pretty-show/Makefile +++ textproc/hs-pretty-show/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pretty-show -PORTVERSION= 1.6.13 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-pretty-show/distinfo =================================================================== --- textproc/hs-pretty-show/distinfo +++ textproc/hs-pretty-show/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720300 -SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd -SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057 +TIMESTAMP = 1523448613 +SHA256 (cabal/pretty-show-1.7.tar.gz) = 382b6ef4a78e4059611b5c86674ad72a6bfce821e8852da4f00b628cfbbc272f +SIZE (cabal/pretty-show-1.7.tar.gz) = 135621 Index: textproc/hs-regex-tdfa/Makefile =================================================================== --- textproc/hs-regex-tdfa/Makefile +++ textproc/hs-regex-tdfa/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= regex-tdfa -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= mtl parsec regex-base>=0.93.1 +USE_CABAL= mtl regex-base>=0.93.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-regex-tdfa/distinfo =================================================================== --- textproc/hs-regex-tdfa/distinfo +++ textproc/hs-regex-tdfa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624838 -SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39 -SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969 +TIMESTAMP = 1523955154 +SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9 +SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268 Index: textproc/hs-skylighting-core/Makefile =================================================================== --- textproc/hs-skylighting-core/Makefile +++ textproc/hs-skylighting-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -PORTNAME= skylighting -PORTVERSION= 0.3.3.1 -PORTREVISION= 1 +PORTNAME= skylighting-core +PORTVERSION= 0.7.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \ - pretty-show regex-pcre regex-pcre-builtin safe text utf8-string +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html case-insensitive colour hxt mtl \ + pretty-show regex-pcre regex-pcre-builtin safe utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-skylighting-core/distinfo =================================================================== --- /dev/null +++ textproc/hs-skylighting-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524848800 +SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e +SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965 Index: textproc/hs-skylighting-core/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-skylighting-core/pkg-descr @@ -0,0 +1,7 @@ +Skylighting is a syntax highlighting library with support for over one hundred +languages. It derives its tokenizers from XML syntax definitions used by KDE's +KSyntaxHighlighting framework, so any syntax supported by that framework can be +added. An optional command-line program is provided. Skylighting is intended to +be the successor to highlighting-kate. + +WWW: http://hackage.haskell.org/package/skylighting Index: textproc/hs-skylighting/Makefile =================================================================== --- textproc/hs-skylighting/Makefile +++ textproc/hs-skylighting/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= skylighting -PORTVERSION= 0.3.3.1 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \ - pretty-show regex-pcre regex-pcre-builtin safe text utf8-string +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html \ + case-insensitive colour hxt mtl pretty-show regex-pcre \ + regex-pcre-builtin safe skylighting-core utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-skylighting/distinfo =================================================================== --- textproc/hs-skylighting/distinfo +++ textproc/hs-skylighting/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499717353 -SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57 -SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631 +TIMESTAMP = 1524846475 +SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574 +SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234 Index: textproc/hs-tagsoup/Makefile =================================================================== --- textproc/hs-tagsoup/Makefile +++ textproc/hs-tagsoup/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tagsoup -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.14.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,6 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text - FLAGS_DEFINE= DOWNLOAD DOWNLOAD_DESC= Build with Download module Index: textproc/hs-tagsoup/distinfo =================================================================== --- textproc/hs-tagsoup/distinfo +++ textproc/hs-tagsoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624839 -SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb -SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031 +TIMESTAMP = 1523444247 +SHA256 (cabal/tagsoup-0.14.6.tar.gz) = 4b4ed4db1428e859389d628dd5755074f659a424ec49934ec53e44b0fc6a63fb +SIZE (cabal/tagsoup-0.14.6.tar.gz) = 43982 Index: textproc/hs-tagstream-conduit/Makefile =================================================================== --- textproc/hs-tagstream-conduit/Makefile +++ textproc/hs-tagstream-conduit/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagstream-conduit PORTVERSION= 0.5.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \ - conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \ + conduit-extra>=1.1.0 data-default>=0.5.0 resourcet \ xml-conduit>=1.1.0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: textproc/hs-texmath/Makefile =================================================================== --- textproc/hs-texmath/Makefile +++ textproc/hs-texmath/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= texmath -PORTVERSION= 0.9.4.1 -PORTREVISION= 1 +PORTVERSION= 0.10.1.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,7 @@ LICENSE= GPLv2 -USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \ - syb text xml +USE_CABAL= aeson mtl network network-uri pandoc-types split syb xml FLAGS_ENABLE= network-uri FLAGS_DISABLE= executable Index: textproc/hs-texmath/distinfo =================================================================== --- textproc/hs-texmath/distinfo +++ textproc/hs-texmath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624840 -SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04 -SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730 +TIMESTAMP = 1524845873 +SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821 +SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634 Index: textproc/hs-texmath/files/patch-texmath.cabal =================================================================== --- textproc/hs-texmath/files/patch-texmath.cabal +++ /dev/null @@ -1,20 +0,0 @@ ---- texmath.cabal.orig 2017-07-10 15:55:23 UTC -+++ texmath.cabal -@@ -87,7 +87,7 @@ Flag network-uri - - Library - Build-depends: xml, parsec >= 3, containers, -- pandoc-types >= 1.12.3.3 && < 1.18, mtl -+ pandoc-types >= 1.12.3.3 , mtl - if impl(ghc >= 6.10) - Build-depends: base >= 4.5 && < 5, syb - else -@@ -141,7 +141,7 @@ Executable texmath - if flag(executable) - Buildable: True - Build-Depends: base >= 4.5 && < 5, texmath, xml, -- pandoc-types >= 1.12.3.3 && < 1.18, -+ pandoc-types >= 1.12.3.3 , - split, aeson, bytestring, text - else - Buildable: False Index: textproc/hs-uri-bytestring-aeson/Makefile =================================================================== --- textproc/hs-uri-bytestring-aeson/Makefile +++ textproc/hs-uri-bytestring-aeson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring-aeson -PORTVERSION= 0.1.0.1 -PORTREVISION= 1 +PORTVERSION= 0.1.0.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson text uri-bytestring +USE_CABAL= aeson uri-bytestring .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-uri-bytestring-aeson/distinfo =================================================================== --- textproc/hs-uri-bytestring-aeson/distinfo +++ textproc/hs-uri-bytestring-aeson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499703625 -SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe -SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987 +TIMESTAMP = 1525011968 +SHA256 (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = d8bd5f0772e8f45a7530b8b4422102ab24a896ac75611a3c36a02a56dffcef0a +SIZE (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = 2003 Index: textproc/hs-uri-bytestring/Makefile =================================================================== --- textproc/hs-uri-bytestring/Makefile +++ textproc/hs-uri-bytestring/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring -PORTVERSION= 0.2.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.1.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-uri-bytestring/distinfo =================================================================== --- textproc/hs-uri-bytestring/distinfo +++ textproc/hs-uri-bytestring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499621831 -SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14 -SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514 +TIMESTAMP = 1524253203 +SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb +SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241 Index: textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal =================================================================== --- /dev/null +++ textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal @@ -0,0 +1,10 @@ +--- uri-bytestring.cabal.orig 2018-04-20 19:43:36 UTC ++++ uri-bytestring.cabal +@@ -41,7 +41,6 @@ library + + attoparsec >= 0.13.1.0 && < 0.14 + , base >= 4.6 && < 5 +- , fail >= 4.9 && < 5 + , bytestring >= 0.9.1 && < 0.11 + , blaze-builder >= 0.3.0.0 && < 0.5 + , template-haskell >= 2.9 && < 2.14 \ No newline at end of file Index: textproc/hs-uri-encode/Makefile =================================================================== --- textproc/hs-uri-encode/Makefile +++ textproc/hs-uri-encode/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= parsec -PORTVERSION= 3.1.11 -PORTREVISION= 1 +PORTNAME= uri-encode +PORTVERSION= 1.5.0.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Monadic parser combinators +COMMENT= URI encoding library LICENSE= BSD3CLAUSE -USE_CABAL= mtl text>=0.2 +USE_CABAL= network-uri utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-uri-encode/distinfo =================================================================== --- /dev/null +++ textproc/hs-uri-encode/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524855375 +SHA256 (cabal/uri-encode-1.5.0.5.tar.gz) = e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186 +SIZE (cabal/uri-encode-1.5.0.5.tar.gz) = 3447 Index: textproc/hs-uri-encode/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-uri-encode/pkg-descr @@ -0,0 +1,3 @@ +Unicode aware uri-encoding. + +WWW: https://github.com/silkapp/uri-encode Index: textproc/hs-uri/Makefile =================================================================== --- textproc/hs-uri/Makefile +++ textproc/hs-uri/Makefile @@ -2,7 +2,7 @@ PORTNAME= uri PORTVERSION= 0.1.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 safe utf8-string +USE_CABAL= safe utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-xml-conduit/Makefile =================================================================== --- textproc/hs-xml-conduit/Makefile +++ textproc/hs-xml-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-conduit -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.8.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \ blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \ data-default monad-control>=0.3 resourcet>=0.3 \ - text>=0.7 xml-types>=0.3.4 + xml-types>=0.3.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-xml-conduit/distinfo =================================================================== --- textproc/hs-xml-conduit/distinfo +++ textproc/hs-xml-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546442 -SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734 -SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603 +TIMESTAMP = 1523899098 +SHA256 (cabal/xml-conduit-1.8.0.tar.gz) = 0382bfd3627be4970b11228948274faef51ca9a2590a7723b5787a7205a52036 +SIZE (cabal/xml-conduit-1.8.0.tar.gz) = 39469 Index: textproc/hs-xml-hamlet/Makefile =================================================================== --- textproc/hs-xml-hamlet/Makefile +++ textproc/hs-xml-hamlet/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-hamlet -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0 +USE_CABAL= shakespeare>=1.0 xml-conduit>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-xml-hamlet/distinfo =================================================================== --- textproc/hs-xml-hamlet/distinfo +++ textproc/hs-xml-hamlet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624842 -SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb -SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149 +TIMESTAMP = 1524849871 +SHA256 (cabal/xml-hamlet-0.5.0.tar.gz) = 7bcec0aad83e72c2870efd3327553b3d78f6332cf01c12ad4b67c02f499015a3 +SIZE (cabal/xml-hamlet-0.5.0.tar.gz) = 9189 Index: textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal =================================================================== --- textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC -+++ xml-hamlet.cabal -@@ -19,7 +19,7 @@ Library - - Build-depends: base >= 4 && < 5 - , shakespeare >= 1.0 && < 2.2 -- , xml-conduit >= 1.0 && < 1.5 -+ , xml-conduit >= 1.0 && < 1.6 - , text >= 0.10 - , template-haskell - , parsec >= 2.0 && < 3.2 Index: textproc/hs-xml-types/Makefile =================================================================== --- textproc/hs-xml-types/Makefile +++ textproc/hs-xml-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= xml-types PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= MIT -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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: textproc/hs-xmlhtml/Makefile =================================================================== --- textproc/hs-xmlhtml/Makefile +++ textproc/hs-xmlhtml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xmlhtml -PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTVERSION= 0.2.5.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \ - unordered-containers +USE_CABAL= blaze-builder blaze-html blaze-markup unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-xmlhtml/distinfo =================================================================== --- textproc/hs-xmlhtml/distinfo +++ textproc/hs-xmlhtml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624843 -SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c -SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541 +TIMESTAMP = 1524404821 +SHA256 (cabal/xmlhtml-0.2.5.2.tar.gz) = 64818617644bfc7c3c9fe561435af9929ef60310627b0796c78b4b99240b5bdc +SIZE (cabal/xmlhtml-0.2.5.2.tar.gz) = 123829 Index: textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs =================================================================== --- textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs +++ /dev/null @@ -1,30 +0,0 @@ ---- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC -+++ src/Text/Blaze/Renderer/XmlHtml.hs -@@ -58,22 +58,20 @@ renderNodes = go [] - (Element (getText tag) attrs (go [] content []) :) - go attrs (CustomParent tag content) = - (Element (fromChoiceStringText tag) attrs (go [] content []) :) -- go attrs (Leaf tag _ _) = -+ go attrs (Leaf tag _ _ _) = - (Element (getText tag) attrs [] :) -- go attrs (CustomLeaf tag _) = -+ go attrs (CustomLeaf tag _ _) = - (Element (fromChoiceStringText tag) attrs [] :) - go attrs (AddAttribute key _ value content) = - go ((getText key, fromChoiceStringText value) : attrs) content - go attrs (AddCustomAttribute key value content) = - go ((fromChoiceStringText key, fromChoiceStringText value) : attrs) - content -- go _ (Content content) = fromChoiceString content --#if MIN_VERSION_blaze_markup(0,6,3) -- go _ (TBI.Comment comment) = -+ go _ (Content content _) = fromChoiceString content -+ go _ (TBI.Comment comment _) = - (X.Comment (fromChoiceStringText comment) :) --#endif - go attrs (Append h1 h2) = go attrs h1 . go attrs h2 -- go _ Empty = id -+ go _ (Empty _) = id - {-# NOINLINE go #-} - {-# INLINE renderNodes #-} - Index: textproc/hs-xmlhtml/files/patch-xmlhtml.cabal =================================================================== --- textproc/hs-xmlhtml/files/patch-xmlhtml.cabal +++ textproc/hs-xmlhtml/files/patch-xmlhtml.cabal @@ -1,15 +1,10 @@ ---- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC +--- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC +++ xmlhtml.cabal -@@ -820,9 +820,9 @@ Library - Text.XmlHtml.HTML.Render - - Build-depends: base >= 4 && < 5, -- blaze-builder >= 0.2 && < 0.5, -- blaze-html >= 0.5 && < 0.9, -- blaze-markup >= 0.5 && < 0.8, -+ blaze-builder >= 0.2 , -+ blaze-html >= 0.5 , -+ blaze-markup >= 0.5 , +@@ -826,7 +826,6 @@ Library + blaze-html >= 0.9 && < 0.10, + blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.11, +- bytestring-builder >= 0.10.4.0.2 && < 0.11, containers >= 0.3 && < 0.6, parsec >= 3.1.2 && < 3.2, + text >= 0.11 && < 1.3, \ No newline at end of file Index: textproc/hs-yaml/Makefile =================================================================== --- textproc/hs-yaml/Makefile +++ textproc/hs-yaml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yaml -PORTVERSION= 0.8.23.1 -PORTREVISION= 1 +PORTVERSION= 0.8.29 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,9 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \ - resourcet>=0.3 scientific text unordered-containers vector - -EXECUTABLE= json2yaml yaml2json + resourcet>=0.3 scientific unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-yaml/distinfo =================================================================== --- textproc/hs-yaml/distinfo +++ textproc/hs-yaml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546173 -SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b -SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569 +TIMESTAMP = 1524402297 +SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74 +SIZE (cabal/yaml-0.8.29.tar.gz) = 82660 Index: www/hs-DAV/Makefile =================================================================== --- www/hs-DAV/Makefile +++ www/hs-DAV/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= DAV -PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-DAV/distinfo =================================================================== --- www/hs-DAV/distinfo +++ www/hs-DAV/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625369 -SHA256 (cabal/DAV-1.3.1.tar.gz) = 5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009 -SIZE (cabal/DAV-1.3.1.tar.gz) = 20003 +TIMESTAMP = 1524938205 +SHA256 (cabal/DAV-1.3.2.tar.gz) = 613314357579b29e1d3fa8451b51e8b9a1307a2b33b65a3f2b2ef2bece025169 +SIZE (cabal/DAV-1.3.2.tar.gz) = 19992 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 Index: www/hs-activehs/Makefile =================================================================== --- www/hs-activehs/Makefile +++ www/hs-activehs/Makefile @@ -2,7 +2,7 @@ PORTNAME= activehs PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +14,7 @@ dia-base dia-functions exceptions haskell-src-exts \ highlighting-kate hint hoogle mtl pandoc pureMD5 \ QuickCheck simple-reflect snap-core snap-server split syb \ - text utf8-string + utf8-string STANDALONE= yes EXECUTABLE= activehs Index: www/hs-authenticate/Makefile =================================================================== --- www/hs-authenticate/Makefile +++ www/hs-authenticate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= authenticate -PORTVERSION= 1.3.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \ conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \ network>=2.6 network-uri>=2.6 resourcet \ - tagstream-conduit>=0.5.5 text unordered-containers \ + tagstream-conduit>=0.5.5 unordered-containers \ xml-conduit>=1.0 FLAGS_ENABLE= network-uri Index: www/hs-authenticate/distinfo =================================================================== --- www/hs-authenticate/distinfo +++ www/hs-authenticate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625370 -SHA256 (cabal/authenticate-1.3.3.2.tar.gz) = a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30 -SIZE (cabal/authenticate-1.3.3.2.tar.gz) = 8785 +TIMESTAMP = 1525184608 +SHA256 (cabal/authenticate-1.3.4.tar.gz) = 3fd566dbfdf75d81ad1bebd19facb9f01509ead6e27d9aed802404ecde932fb8 +SIZE (cabal/authenticate-1.3.4.tar.gz) = 8814 Index: www/hs-cgi/Makefile =================================================================== --- www/hs-cgi/Makefile +++ www/hs-cgi/Makefile @@ -3,7 +3,7 @@ PORTNAME= cgi PORTVERSION= 3001.3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www haskell @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \ - network-uri>=2.6 old-locale old-time parsec>=2.0 + network-uri>=2.6 old-locale old-time FLAGS_ENABLE= network-uri FLAGS_DISABLE= old-mtl Index: www/hs-cgi/files/patch-cgi.cabal =================================================================== --- /dev/null +++ www/hs-cgi/files/patch-cgi.cabal @@ -0,0 +1,16 @@ +--- cgi.cabal.orig 2018-04-22 18:05:14 UTC ++++ cgi.cabal +@@ -44,11 +44,11 @@ Library + + Build-depends: + parsec >= 2.0 && < 3.2, +- exceptions < 0.9, ++ exceptions < 0.11, + xhtml >= 3000.0.0 && < 3000.3, + bytestring < 0.11, + base >= 4.5 && < 5, +- time >= 1.5 && < 1.7, ++ time >= 1.5 && < 1.9, + containers < 0.6, + multipart >= 0.1.2 && < 0.2 + If flag(network-uri) \ No newline at end of file Index: www/hs-cookie/Makefile =================================================================== --- www/hs-cookie/Makefile +++ www/hs-cookie/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cookie -PORTVERSION= 0.4.2.1 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder data-default-class old-locale text +USE_CABAL= blaze-builder data-default-class old-locale .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-cookie/distinfo =================================================================== --- www/hs-cookie/distinfo +++ www/hs-cookie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625371 -SHA256 (cabal/cookie-0.4.2.1.tar.gz) = 06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4 -SIZE (cabal/cookie-0.4.2.1.tar.gz) = 5774 +TIMESTAMP = 1523784609 +SHA256 (cabal/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3 +SIZE (cabal/cookie-0.4.4.tar.gz) = 5996 Index: www/hs-css-text/Makefile =================================================================== --- www/hs-css-text/Makefile +++ www/hs-css-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= css-text -PORTVERSION= 0.1.2.2 -PORTREVISION= 1 +PORTVERSION= 0.1.3.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec>=0.10.2.0 text>=0.11 +USE_CABAL= attoparsec>=0.10.2.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-css-text/distinfo =================================================================== --- www/hs-css-text/distinfo +++ www/hs-css-text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625372 -SHA256 (cabal/css-text-0.1.2.2.tar.gz) = dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987 -SIZE (cabal/css-text-0.1.2.2.tar.gz) = 4033 +TIMESTAMP = 1523784892 +SHA256 (cabal/css-text-0.1.3.0.tar.gz) = 5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a +SIZE (cabal/css-text-0.1.3.0.tar.gz) = 4594 Index: www/hs-gitit/Makefile =================================================================== --- www/hs-gitit/Makefile +++ www/hs-gitit/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitit PORTVERSION= 0.12.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,12 +13,14 @@ USE_CABAL= ConfigFile HStringTemplate HTTP SHA aeson base64-bytestring \ blaze-html feed filestore happstack-server highlighting-kate \ hoauth2 hslogger http-client-tls http-conduit json mtl \ - old-locale old-time pandoc pandoc-types parsec random \ - recaptcha safe split syb tagsoup text uri url utf8-string \ + old-locale old-time pandoc pandoc-types random \ + recaptcha safe split syb tagsoup uri url utf8-string \ uuid xml xss-sanitize zlib EXECUTABLE= expireGititCache gitit +IGNORE= Doesn't build with newest packages + FLAGS_DEFINE= PLUGINS FLAGS_DEFAULT= PLUGINS Index: www/hs-happstack-server/Makefile =================================================================== --- www/hs-happstack-server/Makefile +++ www/hs-happstack-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= happstack-server -PORTVERSION= 7.4.6.4 -PORTREVISION= 1 +PORTVERSION= 7.5.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,9 +11,9 @@ USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \ extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \ - mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \ - syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \ - time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib + mtl>=2 network>=2.6 network-uri>=2.6 semigroups sendfile>=0.7.1 \ + syb system-filepath>=0.3.1 threads>=0.5 time-compat \ + transformers-base>=0.4 utf8-string>=0.3.4 zlib FLAGS_ENABLE= network-uri template_haskell Index: www/hs-happstack-server/distinfo =================================================================== --- www/hs-happstack-server/distinfo +++ www/hs-happstack-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538462 -SHA256 (cabal/happstack-server-7.4.6.4.tar.gz) = b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9 -SIZE (cabal/happstack-server-7.4.6.4.tar.gz) = 81123 +TIMESTAMP = 1524594391 +SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1 +SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810 Index: www/hs-happstack/Makefile =================================================================== --- www/hs-happstack/Makefile +++ www/hs-happstack/Makefile @@ -12,5 +12,7 @@ USE_CABAL= happstack-server>=7.0 +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-heist/Makefile =================================================================== --- www/hs-heist/Makefile +++ www/hs-heist/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= heist -PORTVERSION= 1.0.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= aeson attoparsec blaze-builder blaze-html directory-tree \ dlist hashable lifted-base map-syntax monad-control mtl \ - random text transformers-base unordered-containers vector \ + random transformers-base unordered-containers vector \ xmlhtml .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: www/hs-heist/distinfo =================================================================== --- www/hs-heist/distinfo +++ www/hs-heist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625374 -SHA256 (cabal/heist-1.0.1.0.tar.gz) = fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb -SIZE (cabal/heist-1.0.1.0.tar.gz) = 71050 +TIMESTAMP = 1524939588 +SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96 +SIZE (cabal/heist-1.1.tar.gz) = 71239 Index: www/hs-heist/files/patch-heist.cabal =================================================================== --- www/hs-heist/files/patch-heist.cabal +++ /dev/null @@ -1,29 +0,0 @@ ---- heist.cabal.orig 2016-10-28 08:41:35 UTC -+++ heist.cabal -@@ -151,14 +151,14 @@ Library - Heist.Interpreted.Internal - - build-depends: -- aeson >= 0.6 && < 1.1, -+ aeson >= 0.6 && < 1.3, - attoparsec >= 0.10 && < 0.14, - base >= 4 && < 5, - blaze-builder >= 0.2 && < 0.5, -- blaze-html >= 0.4 && < 0.9, -+ blaze-html >= 0.4 && < 0.10, - bytestring >= 0.9 && < 0.11, - containers >= 0.2 && < 0.6, -- directory >= 1.1 && < 1.3, -+ directory >= 1.1 && < 1.4, - directory-tree >= 0.10 && < 0.13, - dlist >= 0.5 && < 0.9, - filepath >= 1.3 && < 1.5, -@@ -174,7 +174,7 @@ Library - transformers >= 0.3 && < 0.6, - transformers-base >= 0.4 && < 0.5, - unordered-containers >= 0.1.4 && < 0.3, -- vector >= 0.9 && < 0.12, -+ vector >= 0.9 && < 0.13, - xmlhtml >= 0.2.3.5 && < 0.3 - - if impl(ghc >= 6.12.0) Index: www/hs-hjsmin/Makefile =================================================================== --- www/hs-hjsmin/Makefile +++ www/hs-hjsmin/Makefile @@ -2,7 +2,7 @@ PORTNAME= hjsmin PORTVERSION= 0.2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \ - optparse-applicative>=0.7 text>=0.8 + optparse-applicative>=0.7 EXECUTABLE= hjsmin Index: www/hs-http-api-data/Makefile =================================================================== --- www/hs-http-api-data/Makefile +++ www/hs-http-api-data/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-api-data -PORTVERSION= 0.3.7.1 -PORTREVISION= 1 +PORTVERSION= 0.3.8.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ LICENSE= GPLv3 USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \ - text time-locale-compat unordered-containers \ - uri-bytestring uuid-types + time-locale-compat unordered-containers uri-bytestring \ + uuid-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-http-api-data/distinfo =================================================================== --- www/hs-http-api-data/distinfo +++ www/hs-http-api-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625375 -SHA256 (cabal/http-api-data-0.3.7.1.tar.gz) = 8c633e95113c8ab655f4ba67e51e41a2c9035f0122ea68bfbb876b37277075fd -SIZE (cabal/http-api-data-0.3.7.1.tar.gz) = 18907 +TIMESTAMP = 1524685052 +SHA256 (cabal/http-api-data-0.3.8.1.tar.gz) = 6eeaba4b29a00407cb20b865825b17b8d884c26b09c5bbe7b6e673b4522106b3 +SIZE (cabal/http-api-data-0.3.8.1.tar.gz) = 19427 Index: www/hs-http-client/Makefile =================================================================== --- www/hs-http-client/Makefile +++ www/hs-http-client/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-client -PORTVERSION= 0.5.7.0 -PORTREVISION= 1 +PORTVERSION= 0.5.12.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,8 +11,8 @@ USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \ cookie data-default-class exceptions>=0.4 http-types>=0.8 \ - mime-types network>=2.6 network-uri>=2.6 random \ - streaming-commons>=0.1.0.2 text>=0.11 + memory mime-types network>=2.6 network-uri>=2.6 random \ + streaming-commons>=0.1.0.2 FLAGS_ENABLE= network-uri Index: www/hs-http-client/distinfo =================================================================== --- www/hs-http-client/distinfo +++ www/hs-http-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625375 -SHA256 (cabal/http-client-0.5.7.0.tar.gz) = e241eac22c55cd851de534b9d84149702a8b3990d10afc282bd6955df550ffa3 -SIZE (cabal/http-client-0.5.7.0.tar.gz) = 86010 +TIMESTAMP = 1524400718 +SHA256 (cabal/http-client-0.5.12.1.tar.gz) = 4b5116324d217f0498d258d37135a52f3e69103d3a951b0999618b263c9bd63e +SIZE (cabal/http-client-0.5.12.1.tar.gz) = 87578 Index: www/hs-http-conduit/Makefile =================================================================== --- www/hs-http-conduit/Makefile +++ www/hs-http-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-conduit -PORTVERSION= 2.2.3.1 -PORTREVISION= 1 +PORTVERSION= 2.3.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-http-conduit/distinfo =================================================================== --- www/hs-http-conduit/distinfo +++ www/hs-http-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-conduit-2.2.3.1.tar.gz) = 53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e -SIZE (cabal/http-conduit-2.2.3.1.tar.gz) = 37632 +TIMESTAMP = 1524934706 +SHA256 (cabal/http-conduit-2.3.1.tar.gz) = 8251c3f0ab2a42b998bda4aaf2805e8c3325f0084462502661ce964f671f7859 +SIZE (cabal/http-conduit-2.3.1.tar.gz) = 27332 Index: www/hs-http-reverse-proxy/Makefile =================================================================== --- www/hs-http-reverse-proxy/Makefile +++ www/hs-http-reverse-proxy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-reverse-proxy -PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTVERSION= 0.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \ conduit-extra data-default-class http-client>=0.3 \ http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \ - network resourcet streaming-commons text>=0.11 wai>=3.0 \ + network resourcet streaming-commons wai>=3.0 unliftio \ wai-logger word8>=0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: www/hs-http-reverse-proxy/distinfo =================================================================== --- www/hs-http-reverse-proxy/distinfo +++ www/hs-http-reverse-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-reverse-proxy-0.4.4.tar.gz) = 1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978 -SIZE (cabal/http-reverse-proxy-0.4.4.tar.gz) = 10394 +TIMESTAMP = 1524852143 +SHA256 (cabal/http-reverse-proxy-0.6.0.tar.gz) = fb1c913111478384c4f23647810b8c3c01c79e9276a08a1ea46215e4a42dd1a8 +SIZE (cabal/http-reverse-proxy-0.6.0.tar.gz) = 10538 Index: www/hs-http-server/Makefile =================================================================== --- www/hs-http-server/Makefile +++ www/hs-http-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= http-server PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \ - text>=1.0 url>=2.0 utf8-string>=0.3.4 + url>=2.0 utf8-string>=0.3.4 INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} Index: www/hs-http-types/Makefile =================================================================== --- www/hs-http-types/Makefile +++ www/hs-http-types/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-types -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.12.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2 +USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-http-types/distinfo =================================================================== --- www/hs-http-types/distinfo +++ www/hs-http-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625376 -SHA256 (cabal/http-types-0.9.1.tar.gz) = 7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550 -SIZE (cabal/http-types-0.9.1.tar.gz) = 12284 +TIMESTAMP = 1523783338 +SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3 +SIZE (cabal/http-types-0.12.1.tar.gz) = 13189 Index: www/hs-http2/Makefile =================================================================== --- www/hs-http2/Makefile +++ www/hs-http2/Makefile @@ -2,7 +2,7 @@ PORTNAME= http2 PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson aeson-pretty case-insensitive hex mwc-random psqueues \ - stm text unordered-containers vector word8 + unordered-containers vector word8 FLAGS_DISABLE= devel Index: www/hs-multipart/Makefile =================================================================== --- www/hs-multipart/Makefile +++ www/hs-multipart/Makefile @@ -2,7 +2,7 @@ PORTNAME= multipart PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=2.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-path-pieces/Makefile =================================================================== --- www/hs-path-pieces/Makefile +++ www/hs-path-pieces/Makefile @@ -2,7 +2,7 @@ PORTNAME= path-pieces PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.5 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-shakespeare/Makefile =================================================================== --- www/hs-shakespeare/Makefile +++ www/hs-shakespeare/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shakespeare -PORTVERSION= 2.0.13 -PORTREVISION= 1 +PORTVERSION= 2.0.15 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= MIT -USE_CABAL= aeson blaze-html blaze-markup exceptions parsec text +USE_CABAL= aeson blaze-html blaze-markup exceptions .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-shakespeare/distinfo =================================================================== --- www/hs-shakespeare/distinfo +++ www/hs-shakespeare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543938 -SHA256 (cabal/shakespeare-2.0.13.tar.gz) = a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e -SIZE (cabal/shakespeare-2.0.13.tar.gz) = 65054 +TIMESTAMP = 1524400477 +SHA256 (cabal/shakespeare-2.0.15.tar.gz) = 4354c6eebbfa89103c8090aae3bc7be5fceae6a0e327acf8adc4f3fd535864ee +SIZE (cabal/shakespeare-2.0.15.tar.gz) = 65369 Index: www/hs-snap-core/Makefile =================================================================== --- www/hs-snap-core/Makefile +++ www/hs-snap-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-core -PORTVERSION= 1.0.2.1 -PORTREVISION= 1 +PORTVERSION= 1.0.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= attoparsec case-insensitive hashable HUnit io-streams \ lifted-base monad-control mtl network-uri old-locale \ - random readable regex-posix text time-locale-compat \ + random readable regex-posix time-locale-compat \ transformers-base unix-compat unordered-containers \ vector Index: www/hs-snap-core/distinfo =================================================================== --- www/hs-snap-core/distinfo +++ www/hs-snap-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544248 -SHA256 (cabal/snap-core-1.0.2.1.tar.gz) = de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d -SIZE (cabal/snap-core-1.0.2.1.tar.gz) = 142939 +TIMESTAMP = 1524419838 +SHA256 (cabal/snap-core-1.0.3.2.tar.gz) = 4c4398476fe882122ce8adc03f69509588d071fc011f50162cd69706093dd88c +SIZE (cabal/snap-core-1.0.3.2.tar.gz) = 149530 Index: www/hs-snap-server/Makefile =================================================================== --- www/hs-snap-server/Makefile +++ www/hs-snap-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-server -PORTVERSION= 1.0.2.2 -PORTREVISION= 1 +PORTVERSION= 1.1.0.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= attoparsec blaze-builder case-insensitive clock io-streams \ io-streams-haproxy lifted-base mtl network old-locale snap-core \ - text unix-compat vector + unix-compat vector FLAGS_DEFINE= OPENSSL Index: www/hs-snap-server/distinfo =================================================================== --- www/hs-snap-server/distinfo +++ www/hs-snap-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499544292 -SHA256 (cabal/snap-server-1.0.2.2.tar.gz) = 27de5fb962e88fbc4285015c2e7f7abf0e06dac64e8f9737ad6ece6074fa837f -SIZE (cabal/snap-server-1.0.2.2.tar.gz) = 74372 +TIMESTAMP = 1524853220 +SHA256 (cabal/snap-server-1.1.0.0.tar.gz) = 249ea390a4e54899b310c0dd13b91af007a2b685bd0d9769c3e208dd914d7c6f +SIZE (cabal/snap-server-1.1.0.0.tar.gz) = 74090 Index: www/hs-snap/Makefile =================================================================== --- www/hs-snap/Makefile +++ www/hs-snap/Makefile @@ -2,7 +2,7 @@ PORTNAME= snap PORTVERSION= 1.0.0.1 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,8 +13,10 @@ USE_CABAL= aeson attoparsec cereal clientsession configurator \ directory-tree dlist hashable heist lens lifted-base \ map-syntax monad-control mtl mwc-random pwstore-fast \ - snap-core snap-server stm text transformers-base \ + snap-core snap-server transformers-base \ unordered-containers xmlhtml +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-wai-app-static/Makefile =================================================================== --- www/hs-wai-app-static/Makefile +++ www/hs-wai-app-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-app-static -PORTVERSION= 3.1.6.1 -PORTREVISION= 1 +PORTVERSION= 3.1.6.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ blaze-markup>=0.5.1 byteable cryptohash>=0.11 \ cryptohash-conduit file-embed>=0.0.3.1 http-date \ http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \ - text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ + unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ wai-extra>=3.0 warp>=3.0.11 zlib>=0.5 EXECUTABLE= warp Index: www/hs-wai-app-static/distinfo =================================================================== --- www/hs-wai-app-static/distinfo +++ www/hs-wai-app-static/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625380 -SHA256 (cabal/wai-app-static-3.1.6.1.tar.gz) = b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668 -SIZE (cabal/wai-app-static-3.1.6.1.tar.gz) = 22686 +TIMESTAMP = 1525035879 +SHA256 (cabal/wai-app-static-3.1.6.2.tar.gz) = d0b0a566be61ef4c8f800922a71dbc4de64287f8f73782b1461cd5d294c1dc3e +SIZE (cabal/wai-app-static-3.1.6.2.tar.gz) = 22509 Index: www/hs-wai-extra/Makefile =================================================================== --- www/hs-wai-extra/Makefile +++ www/hs-wai-extra/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-extra -PORTVERSION= 3.0.20.0 -PORTREVISION= 1 +PORTVERSION= 3.0.22.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ case-insensitive cookie data-default-class \ fast-logger http-types iproute lifted-base \ network old-locale resourcet streaming-commons \ - stringsearch text unix-compat vault void \ + stringsearch unix-compat vault void \ wai wai-logger word8 zlib .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: www/hs-wai-extra/distinfo =================================================================== --- www/hs-wai-extra/distinfo +++ www/hs-wai-extra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625381 -SHA256 (cabal/wai-extra-3.0.20.0.tar.gz) = ad63ca529e812f5edec84e197a58433095a1376a127f8e9416235028bf021971 -SIZE (cabal/wai-extra-3.0.20.0.tar.gz) = 60542 +TIMESTAMP = 1524842206 +SHA256 (cabal/wai-extra-3.0.22.1.tar.gz) = 7e7c9075455015b90e079d7c1d16110f2fb27e33ff66620d84248c3a9805722f +SIZE (cabal/wai-extra-3.0.22.1.tar.gz) = 61594 Index: www/hs-wai-logger/Makefile =================================================================== --- www/hs-wai-logger/Makefile +++ www/hs-wai-logger/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-logger -PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTVERSION= 2.3.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-wai-logger/distinfo =================================================================== --- www/hs-wai-logger/distinfo +++ www/hs-wai-logger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625381 -SHA256 (cabal/wai-logger-2.3.0.tar.gz) = 90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0 -SIZE (cabal/wai-logger-2.3.0.tar.gz) = 5379 +TIMESTAMP = 1524842605 +SHA256 (cabal/wai-logger-2.3.2.tar.gz) = 8dd4ff875d9ac2c115f5d45cc4375635a6c3e55a75c632ff3781d1fb086eb470 +SIZE (cabal/wai-logger-2.3.2.tar.gz) = 5386 Index: www/hs-wai/Makefile =================================================================== --- www/hs-wai/Makefile +++ www/hs-wai/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai -PORTVERSION= 3.2.1.1 -PORTREVISION= 1 +PORTVERSION= 3.2.1.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= MIT USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \ - text>=0.7 vault>=0.3 + vault>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-wai/distinfo =================================================================== --- www/hs-wai/distinfo +++ www/hs-wai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625379 -SHA256 (cabal/wai-3.2.1.1.tar.gz) = 5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21 -SIZE (cabal/wai-3.2.1.1.tar.gz) = 10039 +TIMESTAMP = 1524252958 +SHA256 (cabal/wai-3.2.1.2.tar.gz) = 282351461f19fbac26aa0a7896d7ab583b4abef522fcd9aba944f1848e58234b +SIZE (cabal/wai-3.2.1.2.tar.gz) = 9938 Index: www/hs-wai/files/patch-wai.cabal =================================================================== --- www/hs-wai/files/patch-wai.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- wai.cabal.orig 2017-07-09 19:57:56 UTC -+++ wai.cabal -@@ -21,7 +21,6 @@ Source-repository head - Library - Build-Depends: base >= 4 && < 5 - , bytestring >= 0.10 -- , bytestring-builder >= 0.10.4.0 && < 0.11 - , blaze-builder >= 0.2.1.4 && < 0.5 - , network >= 2.2.1.5 - , http-types >= 0.7 Index: www/hs-warp/Makefile =================================================================== --- www/hs-warp/Makefile +++ www/hs-warp/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= warp -PORTVERSION= 3.2.13 -PORTREVISION= 1 +PORTVERSION= 3.2.22 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +9,11 @@ LICENSE= MIT -USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \ +USE_CABAL= auto-update>=0.1.1 bsb-http-chunked case-insensitive>=0.2 \ hashable http-date http-types>=0.8.5 http2>=1.0.2 \ iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \ - stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \ - vault>=0.3 wai>=3.0 word8 + streaming-commons>=0.1.10 unix-compat>=0.2 vault>=0.3 \ + wai>=3.0 word8 FLAGS_ENABLE= allow-sendfilefd FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder Index: www/hs-warp/distinfo =================================================================== --- www/hs-warp/distinfo +++ www/hs-warp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625382 -SHA256 (cabal/warp-3.2.13.tar.gz) = 92395bf42d012e5c4deaea7f9e1fc2271a63c5380b4c5bc1cf16b7c53aa2c424 -SIZE (cabal/warp-3.2.13.tar.gz) = 78441 +TIMESTAMP = 1524927920 +SHA256 (cabal/warp-3.2.22.tar.gz) = 645b230c32050da227e4c2486a0ae6b6866706f563d2ba5e3761f581855f590e +SIZE (cabal/warp-3.2.22.tar.gz) = 77658 Index: www/hs-warp/files/patch-warp.cabal =================================================================== --- www/hs-warp/files/patch-warp.cabal +++ /dev/null @@ -1,18 +0,0 @@ ---- warp.cabal.orig 2015-08-18 02:00:41 UTC -+++ warp.cabal -@@ -36,7 +36,6 @@ Library - , auto-update >= 0.1.1 && < 0.2 - , blaze-builder >= 0.4 - , bytestring >= 0.9.1.4 -- , bytestring-builder - , case-insensitive >= 0.2 - , containers - , ghc-prim -@@ -134,7 +133,6 @@ Test-Suite spec - , auto-update - , blaze-builder >= 0.4 - , bytestring >= 0.9.1.4 -- , bytestring-builder - , case-insensitive >= 0.2 - , ghc-prim - , HTTP Index: www/hs-webkit/Makefile =================================================================== --- www/hs-webkit/Makefile +++ www/hs-webkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= webkit PORTVERSION= 0.14.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ USES= pkgconfig USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \ - pango>=0.13.0.0 text>=1.0.0.0 + pango>=0.13.0.0 LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: www/hs-xss-sanitize/Makefile =================================================================== --- www/hs-xss-sanitize/Makefile +++ www/hs-xss-sanitize/Makefile @@ -2,7 +2,7 @@ PORTNAME= xss-sanitize PORTVERSION= 0.3.5.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \ - network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3 + network-uri>=2.6 tagsoup>=0.12.2 utf8-string>=0.3 FLAGS_ENABLE= network-uri Index: www/hs-yesod-auth-hashdb/Makefile =================================================================== --- www/hs-yesod-auth-hashdb/Makefile +++ www/hs-yesod-auth-hashdb/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth-hashdb -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= MIT -USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \ +USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 \ yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \ yesod-persistent>=1.2 Index: www/hs-yesod-auth-hashdb/distinfo =================================================================== --- www/hs-yesod-auth-hashdb/distinfo +++ www/hs-yesod-auth-hashdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625384 -SHA256 (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8 -SIZE (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 15615 +TIMESTAMP = 1525187444 +SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c +SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493 Index: www/hs-yesod-auth/Makefile =================================================================== --- www/hs-yesod-auth/Makefile +++ www/hs-yesod-auth/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth -PORTVERSION= 1.4.17.2 -PORTREVISION= 1 +PORTVERSION= 1.6.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -17,7 +16,7 @@ http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \ network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \ persistent-template>=2.1 random>=1.0.0.2 resourcet safe \ - shakespeare text>=0.7 unordered-containers wai>=1.4 \ + shakespeare unordered-containers wai>=1.4 \ yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4 FLAGS_ENABLE= network-uri Index: www/hs-yesod-auth/distinfo =================================================================== --- www/hs-yesod-auth/distinfo +++ www/hs-yesod-auth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625384 -SHA256 (cabal/yesod-auth-1.4.17.2.tar.gz) = 63a4273faed4bb7ddf3b196e30ae54bcc4b228e388f11cca71d5005c9ea19983 -SIZE (cabal/yesod-auth-1.4.17.2.tar.gz) = 50569 +TIMESTAMP = 1525183168 +SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8 +SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951 Index: www/hs-yesod-bin/Makefile =================================================================== --- www/hs-yesod-bin/Makefile +++ www/hs-yesod-bin/Makefile @@ -2,7 +2,7 @@ PORTNAME= yesod-bin PORTVERSION= 1.5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -15,9 +15,9 @@ data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \ http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \ http-types>=0.7 lifted-base network \ - optparse-applicative>=0.11 parsec>=2.1 \ + optparse-applicative>=0.11 \ project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \ - split>=0.2 streaming-commons tar>=0.4 text>=0.11 \ + split>=0.2 streaming-commons tar>=0.4 \ transformers-compat typed-process unix-compat>=0.2 unordered-containers \ wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \ zlib>=0.5 @@ -25,5 +25,7 @@ EXECUTABLE= yesod STANDALONE= yes +IGNORE= Doesn't build with recent Cabal + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-yesod-core/Makefile =================================================================== --- www/hs-yesod-core/Makefile +++ www/hs-yesod-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-core -PORTVERSION= 1.4.35 -PORTREVISION= 1 +PORTVERSION= 1.6.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -15,9 +14,9 @@ clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \ data-default deepseq-generics exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \ lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \ - mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \ + mwc-random old-locale>=1.0.0.2 path-pieces>=0.1.2 \ primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \ - shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \ + shakespeare>=2.0 transformers-base>=0.4 unix-compat unliftio \ unordered-containers>=0.2 vector>=0.9 wai>=3.0 \ wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8 Index: www/hs-yesod-core/distinfo =================================================================== --- www/hs-yesod-core/distinfo +++ www/hs-yesod-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625385 -SHA256 (cabal/yesod-core-1.4.35.tar.gz) = 7e5d0bead1a415aeb8a1d5c62930506c81b8e5209f179d7f19c5627e45bb5cf1 -SIZE (cabal/yesod-core-1.4.35.tar.gz) = 93503 +TIMESTAMP = 1525033997 +SHA256 (cabal/yesod-core-1.6.4.tar.gz) = 8d7e42b70f18ee7a154d351df0bd3b6b025598f593598817ae88d6bb22092727 +SIZE (cabal/yesod-core-1.6.4.tar.gz) = 94604 Index: www/hs-yesod-form/Makefile =================================================================== --- www/hs-yesod-form/Makefile +++ www/hs-yesod-form/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-form -PORTVERSION= 1.4.12 -PORTREVISION= 1 +PORTVERSION= 1.6.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \ network>=2.6 network-uri>=2.6 persistent resourcet semigroups \ - shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \ + shakespeare>=2.0 wai>=1.3 xss-sanitize>=0.3.0.1 \ yesod-core>=1.4 yesod-persistent>=1.4 FLAGS_ENABLE= network-uri Index: www/hs-yesod-form/distinfo =================================================================== --- www/hs-yesod-form/distinfo +++ www/hs-yesod-form/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-form-1.4.12.tar.gz) = 731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51 -SIZE (cabal/yesod-form-1.4.12.tar.gz) = 31515 +TIMESTAMP = 1525181435 +SHA256 (cabal/yesod-form-1.6.1.tar.gz) = b8ff14eafff4bb6c2b01b235e8ebeafe9802f545979c1c1227076b06edd3f616 +SIZE (cabal/yesod-form-1.6.1.tar.gz) = 32873 Index: www/hs-yesod-persistent/Makefile =================================================================== --- www/hs-yesod-persistent/Makefile +++ www/hs-yesod-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-persistent -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-yesod-persistent/distinfo =================================================================== --- www/hs-yesod-persistent/distinfo +++ www/hs-yesod-persistent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-persistent-1.4.2.tar.gz) = d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056 -SIZE (cabal/yesod-persistent-1.4.2.tar.gz) = 4887 +TIMESTAMP = 1525180776 +SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd +SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935 Index: www/hs-yesod-persistent/files/patch-yesod-persistent.cabal =================================================================== --- www/hs-yesod-persistent/files/patch-yesod-persistent.cabal +++ /dev/null @@ -1,13 +0,0 @@ ---- yesod-persistent.cabal.orig 2017-07-10 15:13:02 UTC -+++ yesod-persistent.cabal -@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md - library - build-depends: base >= 4 && < 5 - , yesod-core >= 1.4.0 && < 1.5 -- , persistent >= 2.1 && < 2.7 -- , persistent-template >= 2.1 && < 2.7 -+ , persistent >= 2.1 && < 2.8 -+ , persistent-template >= 2.1 && < 2.8 - , transformers >= 0.2.2 - , blaze-builder - , conduit Index: www/hs-yesod-static/Makefile =================================================================== --- www/hs-yesod-static/Makefile +++ www/hs-yesod-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-static -PORTVERSION= 1.5.3 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,11 +11,11 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \ blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \ - cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \ - data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \ - http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \ - text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \ - wai-app-static>=3.1 yesod-core>=1.4 + cryptohash>=0.11 cryptohash-conduit>=0.1 cryptonite-conduit \ + css-text>=0.1.2 data-default file-embed>=0.0.4.1 hashable>=1.1 \ + hjsmin http-types>=0.7 mime-types>=0.1 old-time>=1.0 \ + resourcet>=0.4 unix-compat>=0.2 unordered-containers>=0.2 \ + wai>=1.3 wai-app-static>=3.1 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: www/hs-yesod-static/distinfo =================================================================== --- www/hs-yesod-static/distinfo +++ www/hs-yesod-static/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625386 -SHA256 (cabal/yesod-static-1.5.3.tar.gz) = b486aea2b24bc0497ace32b6318da3737d7f8ea8434327608eafdf1eb25d5d65 -SIZE (cabal/yesod-static-1.5.3.tar.gz) = 25521 +TIMESTAMP = 1525169575 +SHA256 (cabal/yesod-static-1.6.0.tar.gz) = bd0bf5924bb9c27fe24047816018158e92fc687053c190221af2f03bac94880e +SIZE (cabal/yesod-static-1.6.0.tar.gz) = 25416 Index: www/hs-yesod-test/Makefile =================================================================== --- www/hs-yesod-test/Makefile +++ www/hs-yesod-test/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-test -PORTVERSION= 1.5.7 -PORTREVISION= 1 +PORTVERSION= 1.6.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \ blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \ hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \ - monad-control network>=2.2 persistent>=1.0 pretty-show text wai>=3.0 \ + monad-control network>=2.2 persistent>=1.0 pretty-show wai>=3.0 \ wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: www/hs-yesod-test/distinfo =================================================================== --- www/hs-yesod-test/distinfo +++ www/hs-yesod-test/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625387 -SHA256 (cabal/yesod-test-1.5.7.tar.gz) = 426b2aaf777b4c18aee150ed5bbe7ab95c987e622609b0cff1242f9ec0850113 -SIZE (cabal/yesod-test-1.5.7.tar.gz) = 19365 +TIMESTAMP = 1525176699 +SHA256 (cabal/yesod-test-1.6.4.tar.gz) = cffa1639237646836be0ead1bc0b1787a3fccb384cbb7e77dcbcf54c1ed3b95b +SIZE (cabal/yesod-test-1.6.4.tar.gz) = 21745 Index: www/hs-yesod/Makefile =================================================================== --- www/hs-yesod/Makefile +++ www/hs-yesod/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \ data-default fast-logger monad-control>=0.3 monad-logger \ - safe shakespeare>=2.0 streaming-commons text \ + safe shakespeare>=2.0 streaming-commons \ unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \ warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \ yesod-form>=1.3 yesod-persistent>=1.4 Index: www/hs-yesod/distinfo =================================================================== --- www/hs-yesod/distinfo +++ www/hs-yesod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625383 -SHA256 (cabal/yesod-1.4.5.tar.gz) = 267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9 -SIZE (cabal/yesod-1.4.5.tar.gz) = 9105 +TIMESTAMP = 1525179938 +SHA256 (cabal/yesod-1.6.0.tar.gz) = 8a242ffe1df10bc2c5dffb6e255ad21b11e96a9c4794bac20504b67f973da773 +SIZE (cabal/yesod-1.6.0.tar.gz) = 9072 Index: x11-toolkits/hs-GLURaw/Makefile =================================================================== --- x11-toolkits/hs-GLURaw/Makefile +++ x11-toolkits/hs-GLURaw/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= GLURaw -PORTVERSION= 2.0.0.3 -PORTREVISION= 1 +PORTVERSION= 2.0.0.4 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org Index: x11-toolkits/hs-GLURaw/distinfo =================================================================== --- x11-toolkits/hs-GLURaw/distinfo +++ x11-toolkits/hs-GLURaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538016 -SHA256 (cabal/GLURaw-2.0.0.3.tar.gz) = 582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee -SIZE (cabal/GLURaw-2.0.0.3.tar.gz) = 10515 +TIMESTAMP = 1523908514 +SHA256 (cabal/GLURaw-2.0.0.4.tar.gz) = b863fd5cb26b1a37afb66ef8a81c0335bc073d33b0a67ec5190dfc62cb885dc4 +SIZE (cabal/GLURaw-2.0.0.4.tar.gz) = 10557 Index: x11-toolkits/hs-OpenGL/Makefile =================================================================== --- x11-toolkits/hs-OpenGL/Makefile +++ x11-toolkits/hs-OpenGL/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= OpenGL -PORTVERSION= 3.0.2.0 -PORTREVISION= 1 +PORTVERSION= 3.0.2.1 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell @@ -12,8 +11,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 \ - text>=0.1 +USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: x11-toolkits/hs-OpenGL/distinfo =================================================================== --- x11-toolkits/hs-OpenGL/distinfo +++ x11-toolkits/hs-OpenGL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499613084 -SHA256 (cabal/OpenGL-3.0.2.0.tar.gz) = faa99459724d614d2cf2d2b83c7bda4898ee71752a253bf4699c096822450efb -SIZE (cabal/OpenGL-3.0.2.0.tar.gz) = 130658 +TIMESTAMP = 1524406154 +SHA256 (cabal/OpenGL-3.0.2.1.tar.gz) = 7acb891b911de8bb6933afeaa7f8c5291cc986da5557c922c0fc1717c5a559bf +SIZE (cabal/OpenGL-3.0.2.1.tar.gz) = 130703 Index: x11-toolkits/hs-OpenGLRaw/Makefile =================================================================== --- x11-toolkits/hs-OpenGLRaw/Makefile +++ x11-toolkits/hs-OpenGLRaw/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= OpenGLRaw -PORTVERSION= 3.2.4.0 -PORTREVISION= 1 +PORTVERSION= 3.3.0.0 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= fixed half text +USE_CABAL= fixed half USE_GL= gl glut .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: x11-toolkits/hs-OpenGLRaw/distinfo =================================================================== --- x11-toolkits/hs-OpenGLRaw/distinfo +++ x11-toolkits/hs-OpenGLRaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444850 -SHA256 (cabal/OpenGLRaw-3.2.4.0.tar.gz) = e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e -SIZE (cabal/OpenGLRaw-3.2.4.0.tar.gz) = 799693 +TIMESTAMP = 1523444916 +SHA256 (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 17889867ae2bd67b98bc7d74f5df3b82abc4f01807c4d24d2efde84d9423b290 +SIZE (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 857906 Index: x11-toolkits/hs-gtk/Makefile =================================================================== --- x11-toolkits/hs-gtk/Makefile +++ x11-toolkits/hs-gtk/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gtk -PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTVERSION= 0.14.9 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +11,7 @@ USES= pkgconfig USE_CABAL= cairo>=0.13.0.0 gio>=0.13.0 glib>=0.13.0.0 mtl \ - pango>=0.13.0.0 text>=0.11.0.6 + pango>=0.13.0.0 USE_GNOME= gtk20 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: x11-toolkits/hs-gtk/distinfo =================================================================== --- x11-toolkits/hs-gtk/distinfo +++ x11-toolkits/hs-gtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625639 -SHA256 (cabal/gtk-0.14.6.tar.gz) = 707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327 -SIZE (cabal/gtk-0.14.6.tar.gz) = 679274 +TIMESTAMP = 1524938622 +SHA256 (cabal/gtk-0.14.9.tar.gz) = bff7cdc93d66a3be9db038018c1315445411846beaa519f48107a8c7ab371fce +SIZE (cabal/gtk-0.14.9.tar.gz) = 677659 Index: x11-toolkits/hs-gtksourceview2/Makefile =================================================================== --- x11-toolkits/hs-gtksourceview2/Makefile +++ x11-toolkits/hs-gtksourceview2/Makefile @@ -2,7 +2,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl text +USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl USE_GNOME= gtksourceview2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: x11-toolkits/hs-pango/Makefile =================================================================== --- x11-toolkits/hs-pango/Makefile +++ x11-toolkits/hs-pango/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pango -PORTVERSION= 0.13.3.1 -PORTREVISION= 1 +PORTVERSION= 0.13.5.0 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text>=0.11.0.6 +USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl USE_GNOME= pango .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: x11-toolkits/hs-pango/distinfo =================================================================== --- x11-toolkits/hs-pango/distinfo +++ x11-toolkits/hs-pango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625640 -SHA256 (cabal/pango-0.13.3.1.tar.gz) = 306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb -SIZE (cabal/pango-0.13.3.1.tar.gz) = 52564 +TIMESTAMP = 1524851066 +SHA256 (cabal/pango-0.13.5.0.tar.gz) = bf59b9273134e5d1c9c648a253e5a766cd1ef51afc2216175bce21a15b6d49e8 +SIZE (cabal/pango-0.13.5.0.tar.gz) = 52797 Index: x11-toolkits/hs-wx/Makefile =================================================================== --- x11-toolkits/hs-wx/Makefile +++ x11-toolkits/hs-wx/Makefile @@ -2,14 +2,14 @@ PORTNAME= wx PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= wxHaskell USES= dos2unix -USE_CABAL= stm wxcore>=0.91 +USE_CABAL= wxcore>=0.91 DOS2UNIX_FILES= src/Graphics/UI/WX/Window.hs USE_WX= 3.0 Index: x11-toolkits/hs-wxc/Makefile =================================================================== --- x11-toolkits/hs-wxc/Makefile +++ x11-toolkits/hs-wxc/Makefile @@ -16,6 +16,8 @@ IGNORE_DOCS= yes +IGNORE= Doesn't build with recent GHC version + post-patch:: @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \ s|/sbin/ldconfig -n|/sbin/ldconfig -m| ; \ Index: x11-toolkits/hs-wxcore/Makefile =================================================================== --- x11-toolkits/hs-wxcore/Makefile +++ x11-toolkits/hs-wxcore/Makefile @@ -2,13 +2,13 @@ PORTNAME= wxcore PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= wxHaskell core -USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91 +USE_CABAL= wxc>=0.91 wxdirect>=0.91 USES= dos2unix pkgconfig DOS2UNIX_GLOB= *.hs Index: x11-toolkits/hs-wxdirect/Makefile =================================================================== --- x11-toolkits/hs-wxdirect/Makefile +++ x11-toolkits/hs-wxdirect/Makefile @@ -2,7 +2,7 @@ PORTNAME= wxdirect PORTVERSION= 0.92.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE USES= dos2unix -USE_CABAL= parsec>=2.1.0 strict +USE_CABAL= strict EXECUTABLE= wxdirect Index: x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal =================================================================== --- /dev/null +++ x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal @@ -0,0 +1,11 @@ +--- wxdirect.cabal.orig 2018-04-16 18:38:04 UTC ++++ wxdirect.cabal +@@ -53,7 +53,7 @@ executable wxdirect + strict, + time >= 1.0, + filepath < 1.5, +- process >= 1.1 && < 1.5 ++ process >= 1.1 && < 1.7 + + if flag(splitBase) + build-depends: \ No newline at end of file Index: x11-wm/hs-xmonad/Makefile =================================================================== --- x11-wm/hs-xmonad/Makefile +++ x11-wm/hs-xmonad/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmonad PORTVERSION= 0.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= extensible-exceptions mtl setlocale utf8-string X11 +USE_CABAL= extensible-exceptions mtl semigroups setlocale utf8-string X11 USE_XORG= x11 MAN1PAGES= xmonad.1 @@ -21,6 +21,8 @@ FLAGS_DISABLE= testing +#IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: x11-wm/hs-xmonad/files/patch-8.4.1-support =================================================================== --- /dev/null +++ x11-wm/hs-xmonad/files/patch-8.4.1-support @@ -0,0 +1,61 @@ +--- src/XMonad/Core.hs.orig 2017-02-09 02:46:45 UTC ++++ src/XMonad/Core.hs +@@ -39,6 +39,7 @@ import qualified Control.Exception.Extensible as E + import Control.Applicative + import Control.Monad.State + import Control.Monad.Reader ++import Data.Semigroup + import Data.Default + import System.FilePath + import System.IO +@@ -56,7 +57,7 @@ import Graphics.X11.Xlib.Extras (getWindowAttributes, + import Data.Typeable + import Data.List ((\\)) + import Data.Maybe (isJust,fromMaybe) +-import Data.Monoid ++import Data.Monoid hiding ((<>)) + + import qualified Data.Map as M + import qualified Data.Set as S +@@ -151,6 +152,9 @@ instance Applicative X where + pure = return + (<*>) = ap + ++instance Semigroup a => Semigroup (X a) where ++ (<>) = liftM2 (<>) ++ + instance (Monoid a) => Monoid (X a) where + mempty = return mempty + mappend = liftM2 mappend +@@ -164,6 +168,9 @@ newtype Query a = Query (ReaderT Window X a) + + runQuery :: Query a -> Window -> X a + runQuery (Query m) w = runReaderT m w ++ ++instance Semigroup a => Semigroup (Query a) where ++ (<>) = liftM2 (<>) + + instance Monoid a => Monoid (Query a) where + mempty = return mempty +--- xmonad.cabal.orig 2017-02-10 22:07:40 UTC ++++ xmonad.cabal +@@ -32,7 +32,8 @@ tested-with: + GHC==7.6.3, + GHC==7.8.4, + GHC==7.10.3, +- GHC==8.0.1 ++ GHC==8.0.1, ++ GHC==8.2.2 + + data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html + +@@ -78,7 +79,8 @@ library + process, + unix, + utf8-string >= 0.3 && < 1.1, +- X11>=1.8 && < 1.9 ++ X11>=1.8 && < 1.9, ++ semigroups + + if true + ghc-options: -funbox-strict-fields -Wall \ No newline at end of file Index: x11/hs-xmobar/Makefile =================================================================== --- x11/hs-xmobar/Makefile +++ x11/hs-xmobar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xmobar -PORTVERSION= 0.24.5 +PORTVERSION= 0.26 PORTREVISION= 1 CATEGORIES= x11 haskell @@ -11,8 +11,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 parsec>=3.1 regex-compat stm>=2.3 \ - X11>=1.6.1 +USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 regex-compat X11>=1.6.1 USE_XORG= xpm EXECUTABLE= xmobar Index: x11/hs-xmobar/distinfo =================================================================== --- x11/hs-xmobar/distinfo +++ x11/hs-xmobar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625449 -SHA256 (cabal/xmobar-0.24.5.tar.gz) = 393aab8d86d09f218f5255bb8811ba12a4ca2f4eb64411c38b9713c58574bf69 -SIZE (cabal/xmobar-0.24.5.tar.gz) = 100658 +TIMESTAMP = 1524245719 +SHA256 (cabal/xmobar-0.26.tar.gz) = ff7dd9af151e0336d35fa4741a76fe8a95762649c11877442449b321f106e4a5 +SIZE (cabal/xmobar-0.26.tar.gz) = 101557