Index: archivers/hs-tar/Makefile =================================================================== --- archivers/hs-tar/Makefile +++ archivers/hs-tar/Makefile @@ -2,7 +2,7 @@ PORTNAME= tar PORTVERSION= 0.5.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org Index: archivers/hs-tar/files/patch-tar.cabal =================================================================== --- /dev/null +++ archivers/hs-tar/files/patch-tar.cabal @@ -0,0 +1,11 @@ +--- tar.cabal.orig 2018-03-09 15:46:26 UTC ++++ tar.cabal +@@ -41,7 +41,7 @@ library + build-depends: base == 4.*, + filepath < 1.5, + array < 0.6, +- containers >= 0.2 && < 0.6, ++ containers >= 0.2 && < 0.7, + deepseq >= 1.1 && < 1.5 + + if flag(old-time) 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.2.4 -PORTREVISION= 1 +PORTVERSION= 0.4 CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org Index: archivers/hs-zip-archive/distinfo =================================================================== --- archivers/hs-zip-archive/distinfo +++ archivers/hs-zip-archive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523638345 -SHA256 (cabal/zip-archive-0.3.2.4.tar.gz) = 20612ed34d8d14deef120440c75f951a5c92c9f39f0de1b82ebac6d5923b3785 -SIZE (cabal/zip-archive-0.3.2.4.tar.gz) = 18370 +TIMESTAMP = 1546094995 +SHA256 (cabal/zip-archive-0.4.tar.gz) = 5fbea91d95ae1b1ec73aed8a8c67c8bae89bc3b6f7d9da898f07209e4a4ada19 +SIZE (cabal/zip-archive-0.4.tar.gz) = 20859 Index: audio/hs-libmpd/Makefile =================================================================== --- audio/hs-libmpd/Makefile +++ audio/hs-libmpd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libmpd -PORTVERSION= 0.9.0.8 -PORTREVISION= 1 +PORTVERSION= 0.9.0.9 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org Index: audio/hs-libmpd/distinfo =================================================================== --- audio/hs-libmpd/distinfo +++ audio/hs-libmpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524150587 -SHA256 (cabal/libmpd-0.9.0.8.tar.gz) = 582b0a405e39148d3a5046e8ad00c9e217688e60c70393eb36cd651e1991ed4e -SIZE (cabal/libmpd-0.9.0.8.tar.gz) = 38932 +TIMESTAMP = 1545836737 +SHA256 (cabal/libmpd-0.9.0.9.tar.gz) = 5b867ee675de1f490e58f5cb3903e1ea7e430ebca4b6d86e6b9c2c1c87a861a4 +SIZE (cabal/libmpd-0.9.0.9.tar.gz) = 38960 Index: benchmarks/Makefile =================================================================== --- benchmarks/Makefile +++ benchmarks/Makefile @@ -28,6 +28,7 @@ SUBDIR += himenobench SUBDIR += hpl SUBDIR += hs-criterion + SUBDIR += hs-criterion-measurement SUBDIR += httperf SUBDIR += imb SUBDIR += interbench Index: benchmarks/hs-criterion-measurement/Makefile =================================================================== --- /dev/null +++ benchmarks/hs-criterion-measurement/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= criterion-measurement +PORTVERSION= 0.1.1.0 +CATEGORIES= benchmarks haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Criterion measurement functionality and associated types + +LICENSE= BSD3CLAUSE + +USE_CABAL= aeson base-compat vector + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include Index: benchmarks/hs-criterion-measurement/distinfo =================================================================== --- /dev/null +++ benchmarks/hs-criterion-measurement/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546179688 +SHA256 (cabal/criterion-measurement-0.1.1.0.tar.gz) = f5f87769386a927dbf487d2f256fc6804f2902078e86dcf113e35178a582ab56 +SIZE (cabal/criterion-measurement-0.1.1.0.tar.gz) = 16423 Index: benchmarks/hs-criterion-measurement/pkg-descr =================================================================== --- /dev/null +++ benchmarks/hs-criterion-measurement/pkg-descr @@ -0,0 +1,4 @@ +Measurement-related functionality extracted from Criterion, with minimal +dependencies. The rationale for this is to enable alternative analysis front-ends. + +WWW: https://github.com/bos/criterion \ No newline at end of file Index: benchmarks/hs-criterion/Makefile =================================================================== --- benchmarks/hs-criterion/Makefile +++ benchmarks/hs-criterion/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= criterion -PORTVERSION= 1.4.1.0 -PORTREVISION= 1 +PORTVERSION= 1.5.3.0 CATEGORIES= benchmarks haskell MAINTAINER= haskell@FreeBSD.org @@ -12,9 +11,10 @@ LICENSE= BSD3CLAUSE 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 + cassava code-page criterion-measurement 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 = 1525009665 -SHA256 (cabal/criterion-1.4.1.0.tar.gz) = c49306676aa7927c3ca3c1807b081d1e86771eb8da99c8391f9c4dacb24a826c -SIZE (cabal/criterion-1.4.1.0.tar.gz) = 130976 +TIMESTAMP = 1546158685 +SHA256 (cabal/criterion-1.5.3.0.tar.gz) = b602a99439de710778b8d8ad4a3799caf872db4c8c793bfd13b725aa936c049f +SIZE (cabal/criterion-1.5.3.0.tar.gz) = 118552 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.1 -PORTREVISION= 1 +PORTVERSION= 0.3.9 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org Index: converters/hs-aeson-compat/distinfo =================================================================== --- converters/hs-aeson-compat/distinfo +++ converters/hs-aeson-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524342688 -SHA256 (cabal/aeson-compat-0.3.7.1.tar.gz) = 59740dc1e37b08e60abb47f38b87de5b9805611a1b468cd18294d5982a1dcacb -SIZE (cabal/aeson-compat-0.3.7.1.tar.gz) = 6913 +TIMESTAMP = 1545681160 +SHA256 (cabal/aeson-compat-0.3.9.tar.gz) = e043941ba761c13a3854fc087521b864b56b2df874154e42aedb67b2a77f23c8 +SIZE (cabal/aeson-compat-0.3.9.tar.gz) = 7441 Index: converters/hs-aeson-compat/files/patch-aeson-compat.cabal =================================================================== --- converters/hs-aeson-compat/files/patch-aeson-compat.cabal +++ /dev/null @@ -1,21 +0,0 @@ ---- aeson-compat.cabal.orig 2017-07-24 12:29:50 UTC -+++ aeson-compat.cabal -@@ -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.11 - , hashable >=1.2 && <1.3 - , scientific >=0.3 && <0.4 - , text >=1.2 && <1.3 Index: converters/hs-sandi/Makefile =================================================================== --- converters/hs-sandi/Makefile +++ converters/hs-sandi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sandi -PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTVERSION= 0.4.3 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org @@ -14,5 +13,9 @@ USE_CABAL= conduit exceptions stringsearch +post-extract: + ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs + ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: converters/hs-sandi/distinfo =================================================================== --- converters/hs-sandi/distinfo +++ converters/hs-sandi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524431120 -SHA256 (cabal/sandi-0.4.2.tar.gz) = 2bc1fc4f8e71009adc9f38304f63684f2795c31077670214147f261bd2bc7337 -SIZE (cabal/sandi-0.4.2.tar.gz) = 19198 +TIMESTAMP = 1545835387 +SHA256 (cabal/sandi-0.4.3.tar.gz) = 76dc1332023b49635d9ae2fa7f3d0618f05fbe6dfdfe54416d19c16993fd214a +SIZE (cabal/sandi-0.4.3.tar.gz) = 19237 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.8.1.2 -PORTREVISION= 1 +PORTVERSION= 2.9.1 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org Index: databases/hs-persistent-sqlite/distinfo =================================================================== --- databases/hs-persistent-sqlite/distinfo +++ databases/hs-persistent-sqlite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525169028 -SHA256 (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2f7157f3830370f60c7c36490ea49b7c52caf0f2a7349f86cf47970189f9ad0c -SIZE (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2044695 +TIMESTAMP = 1546102088 +SHA256 (cabal/persistent-sqlite-2.9.1.tar.gz) = 52407dd8195f36462e0dce9cea75176b9eaa3f0adf2feef6ca3ff01f422905d2 +SIZE (cabal/persistent-sqlite-2.9.1.tar.gz) = 2169017 Index: databases/hs-persistent-template/Makefile =================================================================== --- databases/hs-persistent-template/Makefile +++ databases/hs-persistent-template/Makefile @@ -2,7 +2,7 @@ PORTNAME= persistent-template PORTVERSION= 2.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org 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,6 +1,6 @@ ---- persistent-template.cabal.orig 2018-05-01 13:03:22 UTC +--- persistent-template.cabal.orig 2018-03-08 15:56:53 UTC +++ persistent-template.cabal -@@ -23,7 +23,7 @@ library +@@ -23,13 +23,13 @@ library , text >= 0.5 , transformers >= 0.2 && < 0.6 , containers @@ -9,3 +9,10 @@ , aeson-compat >= 0.3.2.0 && < 0.4 , monad-logger , unordered-containers + , tagged + , path-pieces +- , http-api-data >= 0.2 && < 0.4 ++ , http-api-data >= 0.2 && < 0.5 + , ghc-prim + exposed-modules: Database.Persist.TH + ghc-options: -Wall Index: databases/hs-persistent/Makefile =================================================================== --- databases/hs-persistent/Makefile +++ databases/hs-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= persistent -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.9.0 CATEGORIES= databases haskell MAINTAINER= haskell@FreeBSD.org Index: databases/hs-persistent/distinfo =================================================================== --- databases/hs-persistent/distinfo +++ databases/hs-persistent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524929752 -SHA256 (cabal/persistent-2.8.2.tar.gz) = 696bb279259e307778dc7fbd49565c48a66429f14e793a41a13cfae0968c1ec0 -SIZE (cabal/persistent-2.8.2.tar.gz) = 58648 +TIMESTAMP = 1546018609 +SHA256 (cabal/persistent-2.9.0.tar.gz) = e7865ceb4aa1e93ca8c65c789f92c8046a39ecf41283682bcace33e89b77f261 +SIZE (cabal/persistent-2.9.0.tar.gz) = 60901 Index: databases/hs-persistent/files/patch-persistent.cabal =================================================================== --- /dev/null +++ databases/hs-persistent/files/patch-persistent.cabal @@ -0,0 +1,11 @@ +--- persistent.cabal.orig 2018-10-14 06:53:03 UTC ++++ persistent.cabal +@@ -33,7 +33,7 @@ library + , resourcet >= 1.1.10 + , resource-pool >= 0.2.2.0 + , path-pieces >= 0.1 +- , http-api-data >= 0.2 && < 0.4 ++ , http-api-data >= 0.2 && < 0.5 + , aeson >= 0.5 + , monad-logger >= 0.3.28 + , base64-bytestring Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -972,6 +972,7 @@ SUBDIR += hs-basement SUBDIR += hs-basic-prelude SUBDIR += hs-bifunctors + SUBDIR += hs-bitarrays SUBDIR += hs-bits-atomic SUBDIR += hs-blaze-builder SUBDIR += hs-blaze-textual Index: devel/hs-Glob/Makefile =================================================================== --- devel/hs-Glob/Makefile +++ devel/hs-Glob/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= Glob -PORTVERSION= 0.8.0 -PORTREVISION= 3 +PORTVERSION= 0.10.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-Glob/distinfo =================================================================== --- devel/hs-Glob/distinfo +++ devel/hs-Glob/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499452388 -SHA256 (cabal/Glob-0.8.0.tar.gz) = 38f011be0e7818ab1e76880882b15217cd7d5be56a3dab631c14d614e2b2e896 -SIZE (cabal/Glob-0.8.0.tar.gz) = 23943 +TIMESTAMP = 1545559590 +SHA256 (cabal/Glob-0.10.0.tar.gz) = 473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 +SIZE (cabal/Glob-0.10.0.tar.gz) = 29500 Index: devel/hs-ListLike/Makefile =================================================================== --- devel/hs-ListLike/Makefile +++ devel/hs-ListLike/Makefile @@ -2,7 +2,7 @@ PORTNAME= ListLike PORTVERSION= 4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-ListLike/files/patch-ListLike.cabal =================================================================== --- /dev/null +++ devel/hs-ListLike/files/patch-ListLike.cabal @@ -0,0 +1,11 @@ +--- ListLike.cabal.orig 2018-01-17 03:21:02 UTC ++++ ListLike.cabal +@@ -50,7 +50,7 @@ Library + Data.ListLike.FMList + -- Other-Modules: Data.ConfigFile.Lexer + Build-Depends: base >= 4.6 && < 5 +- ,containers >= 0.3 && < 0.6 ++ ,containers >= 0.3 && < 0.7 + ,bytestring >= 0.9.1 && < 0.11 + ,array >= 0.3 && < 0.6 + ,text >= 0.11 && < 1.3 Index: devel/hs-MissingH/Makefile =================================================================== --- devel/hs-MissingH/Makefile +++ devel/hs-MissingH/Makefile @@ -11,6 +11,8 @@ LICENSE= BSD3CLAUSE +BROKEN= Doesn't compile with newest GHC + USE_CABAL= hslogger HUnit mtl network old-time random regex-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-StateVar/Makefile =================================================================== --- devel/hs-StateVar/Makefile +++ devel/hs-StateVar/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= StateVar -PORTVERSION= 1.1.0.4 -PORTREVISION= 3 +PORTVERSION= 1.1.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-StateVar/distinfo =================================================================== --- devel/hs-StateVar/distinfo +++ devel/hs-StateVar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499443877 -SHA256 (cabal/StateVar-1.1.0.4.tar.gz) = 7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7 -SIZE (cabal/StateVar-1.1.0.4.tar.gz) = 4587 +TIMESTAMP = 1545490750 +SHA256 (cabal/StateVar-1.1.1.1.tar.gz) = eb6436516ab2d5e3d3e070b5a1595c4dceea760a58a9cc8d23dad5f6008f2223 +SIZE (cabal/StateVar-1.1.1.1.tar.gz) = 4762 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= 3 +PORTREVISION= 4 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 @@ -5,7 +5,7 @@ Build-Depends: - base >= 4.0 && < 4.10, - QuickCheck >= 2.4 && < 2.9 -+ base >= 4.0 && < 4.12, ++ base >= 4.0 && < 4.13, + QuickCheck >= 2.4 && < 2.11 Index: devel/hs-async/Makefile =================================================================== --- devel/hs-async/Makefile +++ devel/hs-async/Makefile @@ -2,7 +2,7 @@ PORTNAME= async PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-async/files/patch-async.cabal =================================================================== --- /dev/null +++ devel/hs-async/files/patch-async.cabal @@ -0,0 +1,11 @@ +--- async.cabal.orig 2018-02-04 16:37:42 UTC ++++ async.cabal +@@ -50,7 +50,7 @@ library + if impl(ghc>=7.1) + other-extensions: Trustworthy + exposed-modules: Control.Concurrent.Async +- build-depends: base >= 4.3 && < 4.12, hashable >= 1.1.1.0 && < 1.3, stm >= 2.2 && < 2.5 ++ build-depends: base >= 4.3 && < 4.13, hashable >= 1.1.1.0 && < 1.3, stm >= 2.2 && < 2.6 + + test-suite test-async + default-language: Haskell2010 Index: devel/hs-atomic-primops/Makefile =================================================================== --- devel/hs-atomic-primops/Makefile +++ devel/hs-atomic-primops/Makefile @@ -2,7 +2,7 @@ PORTNAME= atomic-primops PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-atomic-primops/files/patch-atomic-primops.cabal =================================================================== --- /dev/null +++ devel/hs-atomic-primops/files/patch-atomic-primops.cabal @@ -0,0 +1,11 @@ +--- atomic-primops.cabal.orig 2018-03-09 00:46:22 UTC ++++ atomic-primops.cabal +@@ -49,7 +49,7 @@ Library + + -- casMutVar# had a bug in GHC 7.2, thus we require GHC 7.4 or greater + -- (base 4.5 or greater). We also need the "Any" kind. +- build-depends: base >= 4.6.0.0 && < 4.12, ghc-prim, primitive ++ build-depends: base >= 4.6.0.0 && < 4.13, ghc-prim, primitive + + -- TODO: Try to push support back to 7.0, but make it default to an implementation + -- other than Unboxed. 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.10.1 -PORTREVISION= 1 +PORTVERSION= 0.10.5 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 = 1525011068 -SHA256 (cabal/base-compat-0.10.1.tar.gz) = b2ec2193d4a76a92c0ddcd69bb1b5879d50c98dd38422b0d86f85aea3112bb6d -SIZE (cabal/base-compat-0.10.1.tar.gz) = 31954 +TIMESTAMP = 1545832489 +SHA256 (cabal/base-compat-0.10.5.tar.gz) = 990aea21568956d44ab018c5dbfbaea014b9a0d5295d29ca7550149419a6fb41 +SIZE (cabal/base-compat-0.10.5.tar.gz) = 33158 Index: devel/hs-base-orphans/Makefile =================================================================== --- devel/hs-base-orphans/Makefile +++ devel/hs-base-orphans/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= base-orphans -PORTVERSION= 0.6 -PORTREVISION= 3 +PORTVERSION= 0.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-base-orphans/distinfo =================================================================== --- devel/hs-base-orphans/distinfo +++ devel/hs-base-orphans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444442 -SHA256 (cabal/base-orphans-0.6.tar.gz) = c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e -SIZE (cabal/base-orphans-0.6.tar.gz) = 18087 +TIMESTAMP = 1545676672 +SHA256 (cabal/base-orphans-0.8.tar.gz) = aceec656bfb4222ad3035c3d87d80130b42b595b72888f9ab59c6dbb7ed24817 +SIZE (cabal/base-orphans-0.8.tar.gz) = 19606 Index: devel/hs-basement/Makefile =================================================================== --- devel/hs-basement/Makefile +++ devel/hs-basement/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= basement -PORTVERSION= 0.0.7 -PORTREVISION= 1 +PORTVERSION= 0.0.8 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-basement/distinfo =================================================================== --- devel/hs-basement/distinfo +++ devel/hs-basement/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523131438 -SHA256 (cabal/basement-0.0.7.tar.gz) = b501b9b378f35b80c60321031dbbf9ed7af46c66353f072e00f00abdd2244f70 -SIZE (cabal/basement-0.0.7.tar.gz) = 133178 +TIMESTAMP = 1545492262 +SHA256 (cabal/basement-0.0.8.tar.gz) = c7f41b97f2b0a71804c3c7d760047dc9adc9734e789084ca1198c4764ce192a4 +SIZE (cabal/basement-0.0.8.tar.gz) = 134739 Index: devel/hs-bifunctors/Makefile =================================================================== --- devel/hs-bifunctors/Makefile +++ devel/hs-bifunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bifunctors -PORTVERSION= 5.5.2 -PORTREVISION= 1 +PORTVERSION= 5.5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-bifunctors/distinfo =================================================================== --- devel/hs-bifunctors/distinfo +++ devel/hs-bifunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523787744 -SHA256 (cabal/bifunctors-5.5.2.tar.gz) = 332bb2ea19e77dac55282daff8046d89f69514ced5b987779d887e53b5d7cb11 -SIZE (cabal/bifunctors-5.5.2.tar.gz) = 37983 +TIMESTAMP = 1545676170 +SHA256 (cabal/bifunctors-5.5.3.tar.gz) = d434528fd2ea765bace57c4ade0bc9fa32ba2c425f563b33a4b60f625ecfc9ca +SIZE (cabal/bifunctors-5.5.3.tar.gz) = 40366 Index: devel/hs-bifunctors/files/patch-bifunctors.cabal =================================================================== --- devel/hs-bifunctors/files/patch-bifunctors.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 Index: devel/hs-bitarray/Makefile =================================================================== --- devel/hs-bitarray/Makefile +++ devel/hs-bitarray/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PORTNAME= old-locale -PORTVERSION= 1.0.0.7 -PORTREVISION= 4 +PORTNAME= bitarray +PORTVERSION= 0.0.1.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Locale library +COMMENT= Mutable and immutable bit arrays LICENSE= BSD3CLAUSE Index: devel/hs-bitarray/distinfo =================================================================== --- /dev/null +++ devel/hs-bitarray/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546106508 +SHA256 (cabal/bitarray-0.0.1.1.tar.gz) = b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802 +SIZE (cabal/bitarray-0.0.1.1.tar.gz) = 3701 Index: devel/hs-bitarray/pkg-descr =================================================================== --- /dev/null +++ devel/hs-bitarray/pkg-descr @@ -0,0 +1,3 @@ +Mutable and immutable bit arrays. + +WWW: https://github.com/bos/math-functions \ No newline at end of file Index: devel/hs-bytestring-show/Makefile =================================================================== --- devel/hs-bytestring-show/Makefile +++ devel/hs-bytestring-show/Makefile @@ -2,7 +2,7 @@ PORTNAME= bytestring-show PORTVERSION= 0.3.5.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-bytestring-show/files/patch-bytestring-show.cabal =================================================================== --- devel/hs-bytestring-show/files/patch-bytestring-show.cabal +++ devel/hs-bytestring-show/files/patch-bytestring-show.cabal @@ -5,7 +5,7 @@ library - build-depends: base < 5, binary < 0.8, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6 -+ build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6 ++ build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.7 exposed-modules: Text.Show.ByteString Index: devel/hs-c2hs/Makefile =================================================================== --- devel/hs-c2hs/Makefile +++ devel/hs-c2hs/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= c2hs -PORTVERSION= 0.28.3 -PORTREVISION= 3 +PORTVERSION= 0.28.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-c2hs/distinfo =================================================================== --- devel/hs-c2hs/distinfo +++ devel/hs-c2hs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513181196 -SHA256 (cabal/c2hs-0.28.3.tar.gz) = 80cc6db945ee7c0328043b4e69213b2a1cb0806fb35c8362f9dea4a2c312f1cc -SIZE (cabal/c2hs-0.28.3.tar.gz) = 253559 +TIMESTAMP = 1545846841 +SHA256 (cabal/c2hs-0.28.6.tar.gz) = 91dd121ac565009f2fc215c50f3365ed66705071a698a545e869041b5d7ff4da +SIZE (cabal/c2hs-0.28.6.tar.gz) = 204988 Index: devel/hs-cabal-install/Makefile =================================================================== --- devel/hs-cabal-install/Makefile +++ devel/hs-cabal-install/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cabal-install -PORTVERSION= 2.2.0.0 -PORTREVISION= 2 +PORTVERSION= 2.4.0.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ 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 + random resolv tar zip-archive 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 = 1523277454 -SHA256 (cabal/cabal-install-2.2.0.0.tar.gz) = c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9 -SIZE (cabal/cabal-install-2.2.0.0.tar.gz) = 662421 +TIMESTAMP = 1546095159 +SHA256 (cabal/cabal-install-2.4.0.0.tar.gz) = 1329e9564b736b0cfba76d396204d95569f080e7c54fe355b6d9618e3aa0bef6 +SIZE (cabal/cabal-install-2.4.0.0.tar.gz) = 614491 Index: devel/hs-cabal-install/files/patch-cabal-install.cabal =================================================================== --- /dev/null +++ devel/hs-cabal-install/files/patch-cabal-install.cabal @@ -0,0 +1,11 @@ +--- cabal-install.cabal.orig 1970-01-01 00:00:00 UTC ++++ cabal-install.cabal +@@ -325,7 +325,7 @@ executable cabal + zlib >= 0.5.3 && < 0.7, + hackage-security >= 0.5.2.2 && < 0.6, + text >= 1.2.3 && < 1.3, +- zip-archive >= 0.3.2.5 && < 0.4, ++ zip-archive >= 0.3.2.5 && < 0.5, + parsec >= 3.1.13.0 && < 3.2 + + if flag(native-dns) 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.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.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 = 1525092204 -SHA256 (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 39ef2567a3542ebf91f6ebc103cc4afb64c2a4ec051c7ce578b577ef9931c424 -SIZE (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 1979 +TIMESTAMP = 1546020418 +SHA256 (cabal/classy-prelude-conduit-1.5.0.tar.gz) = da27783595cd6b94ea5cb93f3e81084a664e65ed4766757a5e7f81fb3df8fd00 +SIZE (cabal/classy-prelude-conduit-1.5.0.tar.gz) = 1985 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.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-classy-prelude/distinfo =================================================================== --- devel/hs-classy-prelude/distinfo +++ devel/hs-classy-prelude/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525004675 -SHA256 (cabal/classy-prelude-1.4.0.tar.gz) = 2b3b255676ab0fdeb39aebafa3543535ddd684d00c645b643e50cb9e2d25f9e0 -SIZE (cabal/classy-prelude-1.4.0.tar.gz) = 12056 +TIMESTAMP = 1545847066 +SHA256 (cabal/classy-prelude-1.5.0.tar.gz) = d3bae4b17fdf73d7255f550ad172b1f709a8743371aa3a40c13c2cdc9fa7a4da +SIZE (cabal/classy-prelude-1.5.0.tar.gz) = 12053 Index: devel/hs-concurrent-output/Makefile =================================================================== --- devel/hs-concurrent-output/Makefile +++ devel/hs-concurrent-output/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= concurrent-output -PORTVERSION= 1.10.5 -PORTREVISION= 2 +PORTVERSION= 1.10.9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-concurrent-output/distinfo =================================================================== --- devel/hs-concurrent-output/distinfo +++ devel/hs-concurrent-output/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523694433 -SHA256 (cabal/concurrent-output-1.10.5.tar.gz) = 98c096228664d591eb2c352080955a202e883cdab8452efae3cae407e30fa5c3 -SIZE (cabal/concurrent-output-1.10.5.tar.gz) = 21970 +TIMESTAMP = 1545835357 +SHA256 (cabal/concurrent-output-1.10.9.tar.gz) = 8cc49408e957c65359182fbfcda80717b931915d101e4be55ccb26c44b098e57 +SIZE (cabal/concurrent-output-1.10.9.tar.gz) = 22177 Index: devel/hs-constraints/Makefile =================================================================== --- devel/hs-constraints/Makefile +++ devel/hs-constraints/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= constraints -PORTVERSION= 0.10 -PORTREVISION= 1 +PORTVERSION= 0.10.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-constraints/distinfo =================================================================== --- devel/hs-constraints/distinfo +++ devel/hs-constraints/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523445706 -SHA256 (cabal/constraints-0.10.tar.gz) = c224b82e53c21791083c83fed2f2c938bd715a63c8efa90a5abcc3d8859126c6 -SIZE (cabal/constraints-0.10.tar.gz) = 19703 +TIMESTAMP = 1545654328 +SHA256 (cabal/constraints-0.10.1.tar.gz) = 5880ec261e053841b307c7c8c59614f46c2efbd5189f0f2a3c817589cedec3f7 +SIZE (cabal/constraints-0.10.1.tar.gz) = 19901 Index: devel/hs-darcs/Makefile =================================================================== --- devel/hs-darcs/Makefile +++ devel/hs-darcs/Makefile @@ -3,7 +3,7 @@ PORTNAME= darcs PORTVERSION= 2.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,6 +11,8 @@ LICENSE= GPLv2 +BROKEN= Doesn't build with recent GHC + USE_CABAL= async attoparsec base16-bytestring cryptohash \ data-ordlist fgl graphviz hashable html HTTP \ mmap mtl random \ Index: devel/hs-darcs/files/patch-darcs.cabal =================================================================== --- /dev/null +++ devel/hs-darcs/files/patch-darcs.cabal @@ -0,0 +1,67 @@ +--- darcs.cabal.orig 2018-06-24 18:17:58 UTC ++++ darcs.cabal +@@ -74,7 +74,7 @@ flag curl + description: Use libcurl for HTTP support. + + -- in future this could extend to any other external libraries, +--- e.g. libiconv ++-- e.g. libiconv + flag pkgconfig + description: Use pkgconfig to configure libcurl + default: False +@@ -112,7 +112,7 @@ flag warn-as-error + -- ---------------------------------------------------------------------- + + custom-setup +- setup-depends: base >= 4.9 && < 4.12, ++ setup-depends: base >= 4.9 && < 4.13, + Cabal >= 1.24, + process >= 1.2.3.0 && < 1.7, + filepath >= 1.4.1 && < 1.5.0.0, +@@ -380,8 +380,8 @@ Library + else + build-depends: unix >= 2.7.1.0 && < 2.8 + +- build-depends: base >= 4.9 && < 4.12, +- stm >= 2.1 && < 2.5, ++ build-depends: base >= 4.9 && < 4.13, ++ stm >= 2.1 && < 2.6, + binary >= 0.5 && < 0.10, + containers >= 0.5.6.2 && < 0.7, + regex-compat-tdfa >= 0.95.1 && < 0.96, +@@ -389,7 +389,7 @@ Library + mtl >= 2.2.1 && < 2.3, + transformers >= 0.4.2.0 && < 0.6, + parsec >= 3.1.9 && < 3.2, +- fgl >= 5.5.2.3 && < 5.7, ++ fgl >= 5.5.2.3 && < 5.8, + graphviz >= 2999.18.1 && < 2999.20.1, + html >= 1.0.1.2 && < 1.1, + filepath >= 1.4.1 && < 1.5.0.0, +@@ -401,7 +401,7 @@ Library + tar >= 0.5 && < 0.6, + data-ordlist == 0.4.*, + attoparsec >= 0.13.0.1 && < 0.14, +- zip-archive >= 0.3 && < 0.4, ++ zip-archive >= 0.3 && < 0.5, + async >= 2.0.2 && < 2.3, + sandi >= 0.4 && < 0.5, + unix-compat >= 0.4.2 && < 0.6, +@@ -499,7 +499,7 @@ Executable darcs + cc-options: -D_REENTRANT + + build-depends: darcs, +- base >= 4.9 && < 4.12 ++ base >= 4.9 && < 4.13 + + -- ---------------------------------------------------------------------- + -- unit test driver +@@ -534,7 +534,7 @@ test-suite darcs-test + test-framework >= 0.8.1.1 && < 0.9, + test-framework-hunit >= 0.3.0.2 && < 0.4, + test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, +- zip-archive >= 0.3 && < 0.4 ++ zip-archive >= 0.3 && < 0.5 + + -- https://github.com/yesodweb/Shelly.hs/issues/177 + if os(windows) Index: devel/hs-data-pprint/Makefile =================================================================== --- devel/hs-data-pprint/Makefile +++ devel/hs-data-pprint/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-pprint PORTVERSION= 0.2.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org 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,14 +1,24 @@ ---- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC +--- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC +++ data-pprint.cabal +@@ -30,7 +30,7 @@ description: + > [1..10] === reverse [10..1] + > reverse [10..] === [1..] + > [1..] === [1..99] ++ [101..] +- > ([1..], [1..]) === ([1..], [1..100]) ++ > ([1..], [1..]) === ([1..], [1..100]) + > (error "x", [1..]) === (0 `div` 0, reverse [1..]) + > error ("xx" ++ show (length [1..])) === 1 + > error ("xx" ++ error "yy") === 1 @@ -68,10 +68,10 @@ library System.IO.Parallel other-modules: build-depends: - base >= 4.0 && < 4.10, -+ base >= 4.0 && < 4.12, ++ base >= 4.0 && < 4.13, pretty >= 1.0 && < 1.2, mtl >= 2.0 && < 2.3, deepseq >= 1.1 && < 1.5, - time >= 1.2 && < 1.6, + time >= 1.2 && < 1.9, parallel >= 3.1 && < 3.3 + Index: devel/hs-deepseq-generics/Makefile =================================================================== --- devel/hs-deepseq-generics/Makefile +++ devel/hs-deepseq-generics/Makefile @@ -2,7 +2,7 @@ PORTNAME= deepseq-generics PORTVERSION= 0.2.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal =================================================================== --- devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal +++ devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal @@ -5,6 +5,6 @@ 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 ++ build-depends: base >= 4.5 && < 4.13, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5 other-extensions: BangPatterns, FlexibleContexts, TypeOperators ghc-options: -Wall Index: devel/hs-dlist/Makefile =================================================================== --- devel/hs-dlist/Makefile +++ devel/hs-dlist/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dlist -PORTVERSION= 0.8.0.3 -PORTREVISION= 3 +PORTVERSION= 0.8.0.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-dlist/distinfo =================================================================== --- devel/hs-dlist/distinfo +++ devel/hs-dlist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627832 -SHA256 (cabal/dlist-0.8.0.3.tar.gz) = 876782c96957ff480863effb33878f48dd55de7fa64d036e12bf1fbd49542f2f -SIZE (cabal/dlist-0.8.0.3.tar.gz) = 8596 +TIMESTAMP = 1546158989 +SHA256 (cabal/dlist-0.8.0.5.tar.gz) = 98a88aa839b40d4aee8b08880030d282d627b63de311f5414dca6e831a951b43 +SIZE (cabal/dlist-0.8.0.5.tar.gz) = 8987 Index: devel/hs-equivalence/Makefile =================================================================== --- devel/hs-equivalence/Makefile +++ devel/hs-equivalence/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= equivalence -PORTVERSION= 0.3.2 -PORTREVISION= 3 +PORTVERSION= 0.3.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-equivalence/distinfo =================================================================== --- devel/hs-equivalence/distinfo +++ devel/hs-equivalence/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627833 -SHA256 (cabal/equivalence-0.3.2.tar.gz) = 7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529 -SIZE (cabal/equivalence-0.3.2.tar.gz) = 8378 +TIMESTAMP = 1545554667 +SHA256 (cabal/equivalence-0.3.3.tar.gz) = ee8dd8ce12298e6252f331e3844f684cfe7f32b70e529fe7b8dd63153eb2500a +SIZE (cabal/equivalence-0.3.3.tar.gz) = 8371 Index: devel/hs-exceptions/Makefile =================================================================== --- devel/hs-exceptions/Makefile +++ devel/hs-exceptions/Makefile @@ -2,7 +2,7 @@ PORTNAME= exceptions PORTVERSION= 0.10.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-exceptions/files/patch-exceptions.cabal =================================================================== --- /dev/null +++ devel/hs-exceptions/files/patch-exceptions.cabal @@ -0,0 +1,11 @@ +--- exceptions.cabal.orig 2018-03-11 14:52:28 UTC ++++ exceptions.cabal +@@ -35,7 +35,7 @@ library + build-depends: + base >= 4.3 && < 5, + stm >= 2.2 && < 3, +- template-haskell >= 2.2 && < 2.14, ++ template-haskell >= 2.2 && < 2.15, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.3 && < 0.7, + mtl >= 2.0 && < 2.3 Index: devel/hs-fgl/Makefile =================================================================== --- devel/hs-fgl/Makefile +++ devel/hs-fgl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fgl -PORTVERSION= 5.5.3.1 -PORTREVISION= 3 +PORTVERSION= 5.7.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-fgl/distinfo =================================================================== --- devel/hs-fgl/distinfo +++ devel/hs-fgl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499541554 -SHA256 (cabal/fgl-5.5.3.1.tar.gz) = dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c -SIZE (cabal/fgl-5.5.3.1.tar.gz) = 54868 +TIMESTAMP = 1545555065 +SHA256 (cabal/fgl-5.7.0.1.tar.gz) = ffce7af67d4e7ee2f6a7c44fbb749c4253ce9bb35b8b1ffe1c93a173a01fe910 +SIZE (cabal/fgl-5.7.0.1.tar.gz) = 56186 Index: devel/hs-filestore/Makefile =================================================================== --- devel/hs-filestore/Makefile +++ devel/hs-filestore/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= filestore -PORTVERSION= 0.6.3.2 -PORTREVISION= 1 +PORTVERSION= 0.6.3.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-filestore/distinfo =================================================================== --- devel/hs-filestore/distinfo +++ devel/hs-filestore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523961106 -SHA256 (cabal/filestore-0.6.3.2.tar.gz) = 1b8090d20c940ac3444dd9649ed71e934601dba9f2fb9579e67fff6dcd32a15b -SIZE (cabal/filestore-0.6.3.2.tar.gz) = 31870 +TIMESTAMP = 1545674897 +SHA256 (cabal/filestore-0.6.3.4.tar.gz) = a06b24a0c522ecec62e6b5bcc2d0c014ced0aa86821b3a522ebd33aa25b63e60 +SIZE (cabal/filestore-0.6.3.4.tar.gz) = 32070 Index: devel/hs-fortran-src/Makefile =================================================================== --- devel/hs-fortran-src/Makefile +++ devel/hs-fortran-src/Makefile @@ -9,6 +9,8 @@ LICENSE= APACHE20 +BROKEN= Doesn't build with newest GHC + USE_CABAL= fgl>=5.0 GenericPretty>=1.2.2 uniplate>=1.6 alex>=3.1 \ happy>=1.19 unordered-containers>=0.2.9.0 syb>=0.7 \ hashable>=1.2.3.0 Index: devel/hs-fortran-src/files/patch-fortran-src.cabal =================================================================== --- /dev/null +++ devel/hs-fortran-src/files/patch-fortran-src.cabal @@ -0,0 +1,29 @@ +--- fortran-src.cabal.orig 2018-05-18 02:24:45 UTC ++++ fortran-src.cabal +@@ -28,7 +28,7 @@ executable fortran-src + uniplate >= 1.6 && < 2, + GenericPretty >= 1.2.2 && < 2, + pretty >= 1.1 && < 2, +- containers >= 0.5 && < 0.6, ++ containers >= 0.5 && < 0.7, + text >= 1.2 && < 2, + bytestring >= 0.10 && < 0.11, + binary >= 0.8.3.0 && < 0.9, +@@ -78,7 +78,7 @@ library + uniplate >= 1.6 && < 2, + GenericPretty >= 1.2.2 && < 2, + pretty >= 1.1 && < 2, +- containers >= 0.5 && < 0.6, ++ containers >= 0.5 && < 0.7, + text >= 1.2 && < 2, + bytestring >= 0.10 && < 0.11, + binary >= 0.8.3.0 && < 0.9, +@@ -102,7 +102,7 @@ test-suite spec + filepath >= 1.4 && < 2, + GenericPretty >= 1.2.2 && < 2, + pretty >= 1.1 && < 2, +- containers >= 0.5 && < 0.6, ++ containers >= 0.5 && < 0.7, + text >= 1.2 && < 2, + bytestring >= 0.10 && < 0.11, + binary >= 0.8.3.0 && < 0.9, Index: devel/hs-foundation/Makefile =================================================================== --- devel/hs-foundation/Makefile +++ devel/hs-foundation/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= foundation -PORTVERSION= 0.0.20 -PORTREVISION= 1 +PORTVERSION= 0.0.21 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -12,5 +11,9 @@ USE_CABAL= basement +post-extract: + ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs + ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs + .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 = 1523130712 -SHA256 (cabal/foundation-0.0.20.tar.gz) = ba6ae63a9ce0846bf942af2c3ace56600f051c61e83a0b55dd625de23a78e42d -SIZE (cabal/foundation-0.0.20.tar.gz) = 122940 +TIMESTAMP = 1545589565 +SHA256 (cabal/foundation-0.0.21.tar.gz) = 4ed3a0e7f8052b52d27c9806eff3bea51acc2587f74f81db4b8e03e938f283e0 +SIZE (cabal/foundation-0.0.21.tar.gz) = 120009 Index: devel/hs-free/Makefile =================================================================== --- devel/hs-free/Makefile +++ devel/hs-free/Makefile @@ -2,7 +2,7 @@ PORTNAME= free PORTVERSION= 5.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-free/files/patch-free.cabal =================================================================== --- devel/hs-free/files/patch-free.cabal +++ devel/hs-free/files/patch-free.cabal @@ -1,11 +1,13 @@ ---- free.cabal.orig 2018-04-15 20:31:19 UTC +--- free.cabal.orig 2018-03-08 00:33:22 UTC +++ free.cabal -@@ -84,7 +84,7 @@ library +@@ -84,8 +84,8 @@ library transformers-base < 0.5, transformers-compat >= 0.3 && < 1, template-haskell >= 2.7.0.0 && < 3, - exceptions >= 0.6 && < 0.10, +- containers < 0.6 + exceptions >= 0.6 && < 0.11, - containers < 0.6 ++ containers < 0.7 exposed-modules: + Control.Applicative.Free Index: devel/hs-generic-deriving/Makefile =================================================================== --- devel/hs-generic-deriving/Makefile +++ devel/hs-generic-deriving/Makefile @@ -2,7 +2,7 @@ PORTNAME= generic-deriving PORTVERSION= 1.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-generic-deriving/files/patch-generic-deriving.cabal =================================================================== --- devel/hs-generic-deriving/files/patch-generic-deriving.cabal +++ devel/hs-generic-deriving/files/patch-generic-deriving.cabal @@ -1,11 +1,14 @@ ---- generic-deriving.cabal.orig 2018-04-11 11:59:07 UTC +--- generic-deriving.cabal.orig 2018-01-11 21:49:37 UTC +++ generic-deriving.cabal -@@ -77,7 +77,7 @@ library +@@ -75,9 +75,9 @@ library + build-depends: base >= 4.3 && < 4.9 + other-modules: Generics.Deriving.TH.Pre4_9 - build-depends: containers >= 0.1 && < 0.6 +- build-depends: containers >= 0.1 && < 0.6 ++ build-depends: containers >= 0.1 && < 0.7 , ghc-prim < 1 - , template-haskell >= 2.4 && < 2.13 -+ , template-haskell >= 2.4 && < 2.14 ++ , template-haskell >= 2.4 && < 2.15 default-language: Haskell2010 ghc-options: -Wall Index: devel/hs-geniplate-mirror/Makefile =================================================================== --- devel/hs-geniplate-mirror/Makefile +++ devel/hs-geniplate-mirror/Makefile @@ -2,7 +2,7 @@ PORTNAME= geniplate-mirror PORTVERSION= 0.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal =================================================================== --- /dev/null +++ devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal @@ -0,0 +1,10 @@ +--- geniplate-mirror.cabal.orig 2018-02-07 14:46:43 UTC ++++ geniplate-mirror.cabal +@@ -28,6 +28,6 @@ source-repository head + location: https://github.com/danr/geniplate + + library +- Build-Depends: base >= 4 && < 5.0, template-haskell < 2.14, mtl ++ Build-Depends: base >= 4 && < 5.0, template-haskell < 2.15, mtl + + Exposed-modules: Data.Generics.Geniplate 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.7.2 -PORTREVISION= 1 +PORTVERSION= 0.8.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-ghc-events/distinfo =================================================================== --- devel/hs-ghc-events/distinfo +++ devel/hs-ghc-events/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523991488 -SHA256 (cabal/ghc-events-0.7.2.tar.gz) = b01643f72a448fcd63a0b48781d71b21fb0bb22a54967f0b8a39db0e5638ffbf -SIZE (cabal/ghc-events-0.7.2.tar.gz) = 203071 +TIMESTAMP = 1545835185 +SHA256 (cabal/ghc-events-0.8.0.1.tar.gz) = 29c5f07f1f0fbf64f8f74b806a5ce3b3ad39bbd443bb7241451e91ad48a6a898 +SIZE (cabal/ghc-events-0.8.0.1.tar.gz) = 1441899 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.3.1 -PORTREVISION= 1 +PORTVERSION= 0.13.4.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,6 +9,8 @@ LICENSE= GPLv2 +BROKEN= Doesn't build with recent GHC + USE_CABAL= hashtables random USE_ALEX= yes USE_HAPPY= yes Index: devel/hs-gtk2hs-buildtools/distinfo =================================================================== --- devel/hs-gtk2hs-buildtools/distinfo +++ devel/hs-gtk2hs-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523786090 -SHA256 (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 220f2f4aa1e01b8585fddf35bfc9f3a9dd300f2308d3c2b800c621cdd2ce7154 -SIZE (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 177911 +TIMESTAMP = 1545833512 +SHA256 (cabal/gtk2hs-buildtools-0.13.4.0.tar.gz) = 0f3e6ba90839efd43efe8cecbddb6478a55e2ce7788c57a0add4df477dede679 +SIZE (cabal/gtk2hs-buildtools-0.13.4.0.tar.gz) = 177959 Index: devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs =================================================================== --- devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 =================================================================== --- devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 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.19.0.1 -PORTREVISION= 1 +PORTVERSION= 2.21.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,6 +9,8 @@ LICENSE= BSD3CLAUSE +BROKEN= Doesn't build with recent GHC + USE_CABAL= ghc-paths haddock-library>=1.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: devel/hs-haddock-api/distinfo =================================================================== --- devel/hs-haddock-api/distinfo +++ devel/hs-haddock-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523989416 -SHA256 (cabal/haddock-api-2.19.0.1.tar.gz) = 432be5729450dc1923637d4a3533932582a490e1fe81d48af8be9e2ba93ed130 -SIZE (cabal/haddock-api-2.19.0.1.tar.gz) = 177912 +TIMESTAMP = 1545846892 +SHA256 (cabal/haddock-api-2.21.0.tar.gz) = dcaeb11b9fa22544b932492198b373abf598c87fedc3ea05ae125a6230ecd148 +SIZE (cabal/haddock-api-2.21.0.tar.gz) = 177939 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.5.0.1 -PORTREVISION= 1 +PORTVERSION= 1.7.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haddock-library/distinfo =================================================================== --- devel/hs-haddock-library/distinfo +++ devel/hs-haddock-library/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523633978 -SHA256 (cabal/haddock-library-1.5.0.1.tar.gz) = ff2c10f043524135c809303c0d81c7f27a954f0174784e59a497e75e287aabb2 -SIZE (cabal/haddock-library-1.5.0.1.tar.gz) = 47111 +TIMESTAMP = 1545833664 +SHA256 (cabal/haddock-library-1.7.0.tar.gz) = e7c2794a7eb352824f098cafa07bc0506f2c3633808bfbf4c64aef0ba664d011 +SIZE (cabal/haddock-library-1.7.0.tar.gz) = 26315 Index: devel/hs-haddock-library/files/patch-haddock-library.cabal =================================================================== --- devel/hs-haddock-library/files/patch-haddock-library.cabal +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 Index: devel/hs-haddock/Makefile =================================================================== --- devel/hs-haddock/Makefile +++ devel/hs-haddock/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haddock -PORTVERSION= 2.19.0.1 -PORTREVISION= 1 +PORTVERSION= 2.21.0 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 = 1524638302 -SHA256 (cabal/haddock-2.19.0.1.tar.gz) = 6769a3fae0a7c2c7ebb41029d4d3c7916eb7d75fe6f307a0f7d00b07814c32bc -SIZE (cabal/haddock-2.19.0.1.tar.gz) = 276623 +TIMESTAMP = 1546019118 +SHA256 (cabal/haddock-2.21.0.tar.gz) = 0863cea77db75032ea8eb3b31e363300cf59ce347c56bd0d3aa64b0b298378b6 +SIZE (cabal/haddock-2.21.0.tar.gz) = 264884 Index: devel/hs-hashable/Makefile =================================================================== --- devel/hs-hashable/Makefile +++ devel/hs-hashable/Makefile @@ -2,7 +2,7 @@ PORTNAME= hashable PORTVERSION= 1.2.7.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel haskell Index: devel/hs-hashable/files/patch-hashable.cabal =================================================================== --- /dev/null +++ devel/hs-hashable/files/patch-hashable.cabal @@ -0,0 +1,11 @@ +--- hashable.cabal.orig 2018-03-07 22:02:09 UTC ++++ hashable.cabal +@@ -48,7 +48,7 @@ Library + Exposed-modules: Data.Hashable + Data.Hashable.Lifted + Other-modules: Data.Hashable.Class +- Build-depends: base >= 4.4 && < 4.12, ++ Build-depends: base >= 4.4 && < 4.13, + bytestring >= 0.9 && < 0.11, + deepseq >= 1.3 && < 1.5 + if impl(ghc) 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.20.2 -PORTREVISION= 1 +PORTVERSION= 1.21.0 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 = 1523958315 -SHA256 (cabal/haskell-src-exts-1.20.2.tar.gz) = 9f6686e8bc8b849991207304e524747b0d1dcedfea351ac073ce971b36f9a3ea -SIZE (cabal/haskell-src-exts-1.20.2.tar.gz) = 1387571 +TIMESTAMP = 1545681093 +SHA256 (cabal/haskell-src-exts-1.21.0.tar.gz) = 95dac187824edfa23b6a2363880b5e113df8ce4a641e8a0f76e6d45aaa699ff3 +SIZE (cabal/haskell-src-exts-1.21.0.tar.gz) = 1231435 Index: devel/hs-haskell-src-meta/Makefile =================================================================== --- devel/hs-haskell-src-meta/Makefile +++ devel/hs-haskell-src-meta/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= haskell-src-meta -PORTVERSION= 0.8.0.2 -PORTREVISION= 1 +PORTVERSION= 0.8.0.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-haskell-src-meta/distinfo =================================================================== --- devel/hs-haskell-src-meta/distinfo +++ devel/hs-haskell-src-meta/distinfo @@ -1,3 +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 +TIMESTAMP = 1545757485 +SHA256 (cabal/haskell-src-meta-0.8.0.3.tar.gz) = 8473e3555080860c2043581b398dbab67319584a568463b074a092fd4d095822 +SIZE (cabal/haskell-src-meta-0.8.0.3.tar.gz) = 20473 Index: devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts =================================================================== --- /dev/null +++ devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts @@ -0,0 +1,28 @@ +From 109ee29d5fd0f4e23fdd2f80eb122d66341b64a9 Mon Sep 17 00:00:00 2001 +From: Galen Huntington +Date: Sun, 23 Dec 2018 22:57:21 -0800 +Subject: [PATCH] Support haskell-src-exts 1.21. + +--- + haskell-src-meta.cabal | 2 +- + src/Language/Haskell/Meta/Syntax/Translate.hs | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs +index 0dba4f5..aa95cff 100644 +--- src/Language/Haskell/Meta/Syntax/Translate.hs ++++ src/Language/Haskell/Meta/Syntax/Translate.hs +@@ -314,11 +314,13 @@ instance ToName TyVarBndr where + toName (PlainTV n) = n + toName (KindedTV n _) = n + ++#if !MIN_VERSION_haskell_src_exts(1,21,0) + instance ToType (Hs.Kind l) where + toType (Hs.KindStar _) = StarT + toType (Hs.KindFn _ k1 k2) = toType k1 .->. toType k2 + toType (Hs.KindParen _ kp) = toType kp + toType (Hs.KindVar _ n) = VarT (toName n) ++#endif + + toKind :: Hs.Kind l -> Kind + toKind = toType Index: devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal =================================================================== --- devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal +++ devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal @@ -1,16 +1,17 @@ ---- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC +--- haskell-src-meta.cabal.orig 2018-06-19 10:23:31 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, +- build-depends: base >= 4.6 && < 4.12, +- haskell-src-exts >= 1.18 && < 1.21, ++ build-depends: base >= 4.6 && < 4.13, ++ haskell-src-exts >= 1.18 && < 1.22, pretty >= 1.0 && < 1.2, syb >= 0.1 && < 0.8, -- template-haskell >= 2.8 && < 2.13, -+ template-haskell >= 2.8 && < 2.14, +- template-haskell >= 2.8 && < 2.14, ++ template-haskell >= 2.8 && < 2.15, th-orphans >= 0.9.1 && < 0.14 if impl(ghc < 7.8) Index: devel/hs-hint/Makefile =================================================================== --- devel/hs-hint/Makefile +++ devel/hs-hint/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hint -PORTVERSION= 0.8.0 +PORTVERSION= 0.9.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hint/distinfo =================================================================== --- devel/hs-hint/distinfo +++ devel/hs-hint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531857801 -SHA256 (cabal/hint-0.8.0.tar.gz) = 2e702d62c8f56b799d767f3d3707bec12597bc529a051ad90bd5840581551c41 -SIZE (cabal/hint-0.8.0.tar.gz) = 31126 +TIMESTAMP = 1545674257 +SHA256 (cabal/hint-0.9.0.tar.gz) = 7425af412a66d22f254608b4e9f552d65fd96c6cc5885af7b2ed0af62923f8bc +SIZE (cabal/hint-0.9.0.tar.gz) = 31062 Index: devel/hs-hlint/Makefile =================================================================== --- devel/hs-hlint/Makefile +++ devel/hs-hlint/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hlint -PORTVERSION= 2.1.8 +PORTVERSION= 2.1.12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hlint/distinfo =================================================================== --- devel/hs-hlint/distinfo +++ devel/hs-hlint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531821668 -SHA256 (cabal/hlint-2.1.8.tar.gz) = 9713ebf3d0ae16c169d0e02486ba93bfdc6349d9b82dccf8a19a58c1177e75ce -SIZE (cabal/hlint-2.1.8.tar.gz) = 111934 +TIMESTAMP = 1545836418 +SHA256 (cabal/hlint-2.1.12.tar.gz) = 7de5c4a21cb3d957579398a5fe7c8bc2f56279616309b91cb1e9fda3e55e6fb4 +SIZE (cabal/hlint-2.1.12.tar.gz) = 114373 Index: devel/hs-hoogle/Makefile =================================================================== --- devel/hs-hoogle/Makefile +++ devel/hs-hoogle/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hoogle -PORTVERSION= 5.0.17.3 -PORTREVISION= 1 +PORTVERSION= 5.0.17.4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hoogle/distinfo =================================================================== --- devel/hs-hoogle/distinfo +++ devel/hs-hoogle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525080726 -SHA256 (cabal/hoogle-5.0.17.3.tar.gz) = 66bebaf75600fef1c5fc0613ccc55c137aaed4c8f69653cf903f4fb003b98f9c -SIZE (cabal/hoogle-5.0.17.3.tar.gz) = 86528 +TIMESTAMP = 1545936497 +SHA256 (cabal/hoogle-5.0.17.4.tar.gz) = 499b2b7a77806ed486d7ed8daad29c3827cec38a32dbd02769b72fba87f62d15 +SIZE (cabal/hoogle-5.0.17.4.tar.gz) = 93902 Index: devel/hs-hslogger/Makefile =================================================================== --- devel/hs-hslogger/Makefile +++ devel/hs-hslogger/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hslogger -PORTVERSION= 1.2.10 -PORTREVISION= 3 +PORTVERSION= 1.2.12 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hslogger/distinfo =================================================================== --- devel/hs-hslogger/distinfo +++ devel/hs-hslogger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627844 -SHA256 (cabal/hslogger-1.2.10.tar.gz) = d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b -SIZE (cabal/hslogger-1.2.10.tar.gz) = 35889 +TIMESTAMP = 1545658038 +SHA256 (cabal/hslogger-1.2.12.tar.gz) = f97a4c89d0921f237999de5d44950127dbe8baa177960ccccbfb79cccfd46c7a +SIZE (cabal/hslogger-1.2.12.tar.gz) = 36228 Index: devel/hs-hslua-module-text/Makefile =================================================================== --- devel/hs-hslua-module-text/Makefile +++ devel/hs-hslua-module-text/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hslua-module-text -PORTVERSION= 0.1.2.1 -PORTREVISION= 1 +PORTVERSION= 0.2.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hslua-module-text/distinfo =================================================================== --- devel/hs-hslua-module-text/distinfo +++ devel/hs-hslua-module-text/distinfo @@ -1,3 +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 +TIMESTAMP = 1545833621 +SHA256 (cabal/hslua-module-text-0.2.0.tar.gz) = 711705b9befac9b65cc44e13483dc5b6ddcca45bc049813863653276908d8f7e +SIZE (cabal/hslua-module-text-0.2.0.tar.gz) = 3583 Index: devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal =================================================================== --- devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 Index: devel/hs-hslua/Makefile =================================================================== --- devel/hs-hslua/Makefile +++ devel/hs-hslua/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hslua -PORTVERSION= 0.9.5.1 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-hslua/distinfo =================================================================== --- devel/hs-hslua/distinfo +++ devel/hs-hslua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524940935 -SHA256 (cabal/hslua-0.9.5.1.tar.gz) = 681ffb1775e948143c0dd4be3086259f2eda8a9f7b09ce94016150c57e9d74d0 -SIZE (cabal/hslua-0.9.5.1.tar.gz) = 228252 +TIMESTAMP = 1545846233 +SHA256 (cabal/hslua-1.0.1.tar.gz) = ca4e74bbbd6917877bf61e86505d6550603aa62659c2ec8c3780d8be29feb1a0 +SIZE (cabal/hslua-1.0.1.tar.gz) = 235701 Index: devel/hs-hslua/files/patch-hslua.cabal =================================================================== --- devel/hs-hslua/files/patch-hslua.cabal +++ devel/hs-hslua/files/patch-hslua.cabal @@ -1,12 +1,10 @@ ---- hslua.cabal.orig 2018-04-28 18:45:32 UTC +--- hslua.cabal.orig 2018-10-01 07:39:40 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 +@@ -91,7 +91,6 @@ library + , bytestring >= 0.10.2 && < 0.11 + , containers >= 0.5 && < 0.7 + , exceptions >= 0.8 && < 0.11 +- , fail >= 4.9 && < 5 + , mtl >= 2.2 && < 2.3 + , text >= 1.0 && < 1.3 + hs-source-dirs: src Index: devel/hs-io-streams-haproxy/Makefile =================================================================== --- devel/hs-io-streams-haproxy/Makefile +++ devel/hs-io-streams-haproxy/Makefile @@ -2,7 +2,7 @@ PORTNAME= io-streams-haproxy PORTVERSION= 1.0.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org 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 @@ -5,7 +5,7 @@ c-sources: cbits/byteorder.c - build-depends: base >= 4.5 && < 4.11, -+ build-depends: base >= 4.5 && < 4.12, ++ build-depends: base >= 4.5 && < 4.13, attoparsec >= 0.7 && < 0.14, bytestring >= 0.9 && < 0.11, io-streams >= 1.3 && < 1.6, Index: devel/hs-keys/Makefile =================================================================== --- devel/hs-keys/Makefile +++ devel/hs-keys/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= keys -PORTVERSION= 3.12 -PORTREVISION= 1 +PORTVERSION= 3.12.1 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 = 1523890076 -SHA256 (cabal/keys-3.12.tar.gz) = d4bfa78ff9df50224f1722925ae148279377193d04277a7dad224a47b34d5e55 -SIZE (cabal/keys-3.12.tar.gz) = 13353 +TIMESTAMP = 1545679232 +SHA256 (cabal/keys-3.12.1.tar.gz) = 7fcea48187df82c02c159dea07a581cddf371023e6a3c34de7fa69a8ef2315fb +SIZE (cabal/keys-3.12.1.tar.gz) = 13608 Index: devel/hs-kqueue/Makefile =================================================================== --- devel/hs-kqueue/Makefile +++ devel/hs-kqueue/Makefile @@ -2,7 +2,7 @@ PORTNAME= kqueue PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-kqueue/files/patch-kqueue.cabal =================================================================== --- devel/hs-kqueue/files/patch-kqueue.cabal +++ devel/hs-kqueue/files/patch-kqueue.cabal @@ -5,7 +5,7 @@ Exposed-modules: System.KQueue System.KQueue.HighLevel - Build-depends: base >= 4.0 && < 4.10 -+ Build-depends: base >= 4.0 && < 4.12 ++ Build-depends: base >= 4.0 && < 4.13 , directory >= 1.0 && < 1.4 , filepath >= 1.1 && < 1.5 , mtl >= 1.1 && < 2.3 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.2 -PORTREVISION= 1 +PORTVERSION= 0.8.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 = 1523449230 -SHA256 (cabal/language-c-0.7.2.tar.gz) = 63ad22ddd8e51747c8d64239029cf4afd3e7d4060c9b9478145479f5d4d549e5 -SIZE (cabal/language-c-0.7.2.tar.gz) = 121429 +TIMESTAMP = 1545654745 +SHA256 (cabal/language-c-0.8.2.tar.gz) = b729d3b2263b0f029a66c37ae1c05b86b68bad1cde6c0b407bfd5201b91fce15 +SIZE (cabal/language-c-0.8.2.tar.gz) = 193533 Index: devel/hs-lens/Makefile =================================================================== --- devel/hs-lens/Makefile +++ devel/hs-lens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lens -PORTVERSION= 4.16.1 -PORTREVISION= 1 +PORTVERSION= 4.17 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,10 @@ LICENSE= BSD3CLAUSE +BROKEN= Doesn't build with recent GHC + USE_CABAL= base-orphans>=0.3 bifunctors>=5 call-stack comonad>=4 \ - contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \ + contravariant 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 \ Index: devel/hs-lens/distinfo =================================================================== --- devel/hs-lens/distinfo +++ devel/hs-lens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524407577 -SHA256 (cabal/lens-4.16.1.tar.gz) = f5bec97b1d5cf3d6487afebc79b927bd5a18f1fd594b104de36a35bf606ea4c6 -SIZE (cabal/lens-4.16.1.tar.gz) = 991132 +TIMESTAMP = 1545677566 +SHA256 (cabal/lens-4.17.tar.gz) = 473664de541023bef44aa29105abbb1e35542e9254cdc846963183e0dd3f08cc +SIZE (cabal/lens-4.17.tar.gz) = 991660 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.10.0.1 -PORTREVISION= 1 +PORTVERSION= 0.10.0.3 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 = 1523785768 -SHA256 (cabal/lifted-async-0.10.0.1.tar.gz) = 0d925b16fffe6fb3db994165401aeb0752595d1feec3011eba5b8b2c8524c4b1 -SIZE (cabal/lifted-async-0.10.0.1.tar.gz) = 10129 +TIMESTAMP = 1545833386 +SHA256 (cabal/lifted-async-0.10.0.3.tar.gz) = 83d09c355cf7c5d35f179f6f084524f451966ed29beac721f0500ee607822b8c +SIZE (cabal/lifted-async-0.10.0.3.tar.gz) = 10217 Index: devel/hs-map-syntax/Makefile =================================================================== --- devel/hs-map-syntax/Makefile +++ devel/hs-map-syntax/Makefile @@ -2,7 +2,7 @@ PORTNAME= map-syntax PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-map-syntax/files/patch-map-syntax.cabal =================================================================== --- /dev/null +++ devel/hs-map-syntax/files/patch-map-syntax.cabal @@ -0,0 +1,13 @@ +--- map-syntax.cabal.orig 2018-04-03 20:48:24 UTC ++++ map-syntax.cabal +@@ -37,8 +37,8 @@ Library + Data.Map.Syntax + + build-depends: +- base >= 4.3 && < 4.12, +- containers >= 0.3 && < 0.6, ++ base >= 4.3 && < 4.13, ++ containers >= 0.3 && < 0.7, + mtl >= 2.0 && < 2.3 + + ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -fno-warn-unused-do-bind Index: devel/hs-memory/Makefile =================================================================== --- devel/hs-memory/Makefile +++ devel/hs-memory/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= memory -PORTVERSION= 0.14.16 -PORTREVISION= 1 +PORTVERSION= 0.14.18 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-memory/distinfo =================================================================== --- devel/hs-memory/distinfo +++ devel/hs-memory/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523375674 -SHA256 (cabal/memory-0.14.16.tar.gz) = 7bb0834ab28ce1248f3be09df211d49d20d703cdcda3ed16cde99356e2d72b0f -SIZE (cabal/memory-0.14.16.tar.gz) = 42207 +TIMESTAMP = 1545678187 +SHA256 (cabal/memory-0.14.18.tar.gz) = f5458d170a291788ac8da896bb44b0cc84021c99dd596c52adf2f7a7f6c03507 +SIZE (cabal/memory-0.14.18.tar.gz) = 42266 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.2.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-microlens-th/distinfo =================================================================== --- devel/hs-microlens-th/distinfo +++ devel/hs-microlens-th/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523954941 -SHA256 (cabal/microlens-th-0.4.2.1.tar.gz) = ec57108e9ab54c085dd316b60ac156e6624078a46682a60ed2462005cae4fc42 -SIZE (cabal/microlens-th-0.4.2.1.tar.gz) = 20972 +TIMESTAMP = 1545657437 +SHA256 (cabal/microlens-th-0.4.2.3.tar.gz) = 321018c6c0aad3f68eb26f6c7e7a518db43039e3f8f19c4634ceb4c7f8051c8f +SIZE (cabal/microlens-th-0.4.2.3.tar.gz) = 20960 Index: devel/hs-microstache/Makefile =================================================================== --- devel/hs-microstache/Makefile +++ devel/hs-microstache/Makefile @@ -2,7 +2,7 @@ PORTNAME= microstache PORTVERSION= 1.0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-microstache/files/patch-microstache.cabal =================================================================== --- devel/hs-microstache/files/patch-microstache.cabal +++ devel/hs-microstache/files/patch-microstache.cabal @@ -1,11 +1,39 @@ ---- microstache.cabal.orig 2018-04-22 20:59:09 UTC +--- microstache.cabal.orig 2017-07-20 19:26:17 UTC +++ microstache.cabal -@@ -40,7 +40,7 @@ source-repository head +@@ -40,10 +40,10 @@ source-repository head library build-depends: - aeson >=0.11 && < 1.3, -+ aeson >=0.11 && < 1.4, ++ aeson >=0.11 && < 1.5, base >=4.5 && < 5.0, bytestring >=0.9.2.1 && < 0.11, - containers >=0.4.2.1 && < 0.6, +- containers >=0.4.2.1 && < 0.6, ++ containers >=0.4.2.1 && < 0.7, + deepseq >=1.3.0.0 && < 1.5, + directory >=1.1.0.2 && < 1.4, + filepath >=1.3.0.0 && < 1.5, +@@ -83,7 +83,7 @@ test-suite tests + if !impl(ghc >= 8.0) + build-depends: + semigroups == 0.18.* +- other-modules: ++ other-modules: + Text.Microstache.ParserSpec + Text.Microstache.RenderSpec + Text.Microstache.TypeSpec +@@ -93,12 +93,12 @@ test-suite mustache-spec + main-is: Spec.hs + hs-source-dirs: mustache-spec + type: exitcode-stdio-1.0 +- build-depends: ++ build-depends: + hspec, + aeson, + base, + bytestring, +- containers, ++ containers, + parsec, + microstache, + text 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= 4 +PORTREVISION= 5 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 @@ -14,8 +14,8 @@ @@ -31,5 +31,5 @@ Library exposed-modules: System.Locale - + - build-depends: base >= 4.2 && < 4.9 -+ build-depends: base >= 4.2 && < 4.12 ++ build-depends: base >= 4.2 && < 4.13 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= 4 +PORTREVISION= 5 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 @@ -13,11 +13,11 @@ +++ old-time.cabal @@ -53,7 +53,7 @@ Library HsTime.h - + build-depends: - base >= 4.7 && < 4.9, -+ base >= 4.7 && < 4.12, ++ base >= 4.7 && < 4.13, old-locale == 1.0.* - + ghc-options: -Wall Index: devel/hs-optparse-applicative/Makefile =================================================================== --- devel/hs-optparse-applicative/Makefile +++ devel/hs-optparse-applicative/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= optparse-applicative -PORTVERSION= 0.14.0.0 -PORTREVISION= 3 +PORTVERSION= 0.14.3.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-optparse-applicative/distinfo =================================================================== --- devel/hs-optparse-applicative/distinfo +++ devel/hs-optparse-applicative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499447048 -SHA256 (cabal/optparse-applicative-0.14.0.0.tar.gz) = b55b32fdd5d101b2d6edb2746a66648fc2cd1b850d7adea185f201ac71b83c1a -SIZE (cabal/optparse-applicative-0.14.0.0.tar.gz) = 53120 +TIMESTAMP = 1545655938 +SHA256 (cabal/optparse-applicative-0.14.3.0.tar.gz) = 72476302fe555a508917b2d7d6121c7b58ea5434cdc08aeb5d4b652e8f0e7663 +SIZE (cabal/optparse-applicative-0.14.3.0.tar.gz) = 53480 Index: devel/hs-parallel/Makefile =================================================================== --- devel/hs-parallel/Makefile +++ devel/hs-parallel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= parallel -PORTVERSION= 3.2.1.1 -PORTREVISION= 2 +PORTVERSION= 3.2.2.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-parallel/distinfo =================================================================== --- devel/hs-parallel/distinfo +++ devel/hs-parallel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499444913 -SHA256 (cabal/parallel-3.2.1.1.tar.gz) = 323bb9bc9e36fb9bfb08e68a772411302b1599bfffbc6de20fa3437ce1473c17 -SIZE (cabal/parallel-3.2.1.1.tar.gz) = 13367 +TIMESTAMP = 1545498989 +SHA256 (cabal/parallel-3.2.2.0.tar.gz) = 170453a71a2a8b31cca63125533f7771d7debeb639700bdabdd779c34d8a6ef6 +SIZE (cabal/parallel-3.2.2.0.tar.gz) = 14681 Index: devel/hs-parallel/files/patch-parallel.cabal =================================================================== --- devel/hs-parallel/files/patch-parallel.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- parallel.cabal.orig 2018-04-10 09:45:32 UTC -+++ parallel.cabal -@@ -34,7 +34,7 @@ library - - build-depends: - array >= 0.3 && < 0.6, -- base >= 4.3 && < 4.11, -+ base >= 4.3 && < 4.12, - containers >= 0.4 && < 0.6, - deepseq >= 1.1 && < 1.5 Index: devel/hs-primitive/Makefile =================================================================== --- devel/hs-primitive/Makefile +++ devel/hs-primitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= primitive -PORTVERSION= 0.6.3.0 -PORTREVISION= 1 +PORTVERSION= 0.6.4.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 = 1523292481 -SHA256 (cabal/primitive-0.6.3.0.tar.gz) = cddeff804e0f577f1be0179d5d145dfc170f8bfb66f663b9fba67104a45d9555 -SIZE (cabal/primitive-0.6.3.0.tar.gz) = 25336 +TIMESTAMP = 1545490019 +SHA256 (cabal/primitive-0.6.4.0.tar.gz) = 4cbeaf7924dd79221f327ea101a29bf35c4976dc3319df157ff46ea68e6a0c64 +SIZE (cabal/primitive-0.6.4.0.tar.gz) = 45937 Index: devel/hs-primitive/files/patch-primitive.cabal =================================================================== --- /dev/null +++ devel/hs-primitive/files/patch-primitive.cabal @@ -0,0 +1,11 @@ +--- primitive.cabal.orig 2018-05-30 18:38:36 UTC ++++ primitive.cabal +@@ -53,7 +53,7 @@ Library + Data.Primitive.Internal.Compat + Data.Primitive.Internal.Operations + +- Build-Depends: base >= 4.5 && < 4.12 ++ Build-Depends: base >= 4.5 && < 4.13 + , ghc-prim >= 0.2 && < 0.6 + , transformers >= 0.2 && < 0.6 + Index: devel/hs-profunctors/Makefile =================================================================== --- devel/hs-profunctors/Makefile +++ devel/hs-profunctors/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= profunctors -PORTVERSION= 5.2.2 -PORTREVISION= 1 +PORTVERSION= 5.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= base-orphans bifunctors comonad contravariant \ - distributive tagged +USE_CABAL= base-orphans bifunctors comonad distributive tagged .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-profunctors/distinfo =================================================================== --- devel/hs-profunctors/distinfo +++ devel/hs-profunctors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523817696 -SHA256 (cabal/profunctors-5.2.2.tar.gz) = e981e6a33ac99d38a947a749179bbea3c294ecf6bfde41660fe6d8d5a2e43768 -SIZE (cabal/profunctors-5.2.2.tar.gz) = 28155 +TIMESTAMP = 1545676462 +SHA256 (cabal/profunctors-5.3.tar.gz) = 74632acc5bb76e04ade95e187be432b607da0e863c0e08f3cabafb23d8b4a3b7 +SIZE (cabal/profunctors-5.3.tar.gz) = 28744 Index: devel/hs-profunctors/files/patch-profunctors.cabal =================================================================== --- /dev/null +++ devel/hs-profunctors/files/patch-profunctors.cabal @@ -0,0 +1,10 @@ +--- profunctors.cabal.orig 2018-07-03 01:33:59 UTC ++++ profunctors.cabal +@@ -38,7 +38,6 @@ library + base-orphans >= 0.4 && < 0.9, + bifunctors >= 5.2 && < 6, + comonad >= 4 && < 6, +- contravariant >= 1 && < 2, + distributive >= 0.4.4 && < 1, + semigroups >= 0.11 && < 0.19, + tagged >= 0.4.4 && < 1, Index: devel/hs-reflection/Makefile =================================================================== --- devel/hs-reflection/Makefile +++ devel/hs-reflection/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= reflection -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.1.4 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 = 1523900374 -SHA256 (cabal/reflection-2.1.3.tar.gz) = 88f81923abd7211e51de7071cd5800b30784e374c193de8cdd7b1c201f8de405 -SIZE (cabal/reflection-2.1.3.tar.gz) = 18085 +TIMESTAMP = 1545655551 +SHA256 (cabal/reflection-2.1.4.tar.gz) = f22fc478d43a36ec3d6c48c57ec53636c0bf936f3733b9a2b34e1a2e6351c44d +SIZE (cabal/reflection-2.1.4.tar.gz) = 18364 Index: devel/hs-safe-exceptions/Makefile =================================================================== --- devel/hs-safe-exceptions/Makefile +++ devel/hs-safe-exceptions/Makefile @@ -2,7 +2,7 @@ PORTNAME= safe-exceptions PORTVERSION= 0.1.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal =================================================================== --- devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal +++ devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal @@ -5,7 +5,7 @@ hs-source-dirs: src exposed-modules: Control.Exception.Safe - build-depends: base >= 4.7 && < 4.11 -+ build-depends: base >= 4.7 && < 4.12 ++ build-depends: base >= 4.7 && < 4.13 , deepseq >= 1.2 && < 1.5 - , exceptions >= 0.8 && < 0.9 + , exceptions >= 0.8 && < 0.11 Index: devel/hs-setlocale/Makefile =================================================================== --- devel/hs-setlocale/Makefile +++ devel/hs-setlocale/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= setlocale -PORTVERSION= 1.0.0.6 -PORTREVISION= 1 +PORTVERSION= 1.0.0.8 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 = 1523637605 -SHA256 (cabal/setlocale-1.0.0.6.tar.gz) = 587af63153c1f3642de2c2f526b3a3c82c46ece3bd09ffd96a0eedbfd1c288e6 -SIZE (cabal/setlocale-1.0.0.6.tar.gz) = 2113 +TIMESTAMP = 1545559211 +SHA256 (cabal/setlocale-1.0.0.8.tar.gz) = 6dd148e47714707c311d20af606284ab392392a84ffb71da4004010e67d5b969 +SIZE (cabal/setlocale-1.0.0.8.tar.gz) = 2111 Index: devel/hs-split/Makefile =================================================================== --- devel/hs-split/Makefile +++ devel/hs-split/Makefile @@ -3,7 +3,7 @@ PORTNAME= split PORTVERSION= 0.2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-split/files/patch-split.cabal =================================================================== --- /dev/null +++ devel/hs-split/files/patch-split.cabal @@ -0,0 +1,11 @@ +--- split.cabal.orig 2018-01-24 03:00:12 UTC ++++ split.cabal +@@ -51,7 +51,7 @@ Source-repository head + + Library + ghc-options: -Wall +- build-depends: base <4.12 ++ build-depends: base <4.13 + exposed-modules: Data.List.Split, Data.List.Split.Internals + default-language: Haskell2010 + Hs-source-dirs: src 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.9 -PORTREVISION= 1 +PORTVERSION= 0.6.1.10 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 = 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 +TIMESTAMP = 1545562890 +SHA256 (cabal/syb-with-class-0.6.1.10.tar.gz) = a77e3f231141b173b50bad8939a2eafbc0b14c615556464ad95851b5d9ef133a +SIZE (cabal/syb-with-class-0.6.1.10.tar.gz) = 12530 Index: devel/hs-tagged/Makefile =================================================================== --- devel/hs-tagged/Makefile +++ devel/hs-tagged/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagged PORTVERSION= 0.8.5 -PORTREVISION= 3 +PORTREVISION= 4 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.14 ++ build-depends: template-haskell >= 2.8 && < 2.15 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 @@ -2,7 +2,7 @@ PORTNAME= test-framework PORTVERSION= 0.8.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-test-framework/files/patch-test-framework.cabal =================================================================== --- /dev/null +++ devel/hs-test-framework/files/patch-test-framework.cabal @@ -0,0 +1,11 @@ +--- test-framework.cabal.orig 2017-12-30 17:49:37 UTC ++++ test-framework.cabal +@@ -48,7 +48,7 @@ Library + , ansi-terminal >= 0.4.0 && < 0.9 + , ansi-wl-pprint >= 0.5.1 && < 0.7 + , random >= 1.0 && < 1.2 +- , containers >= 0.1 && < 0.6 ++ , containers >= 0.1 && < 0.7 + , regex-posix >= 0.72 && < 0.96 + , old-locale >= 1.0 && < 1.1 + , time >= 1.1.2 && < 1.9 Index: devel/hs-text-short/Makefile =================================================================== --- devel/hs-text-short/Makefile +++ devel/hs-text-short/Makefile @@ -2,7 +2,7 @@ PORTNAME= text-short PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-text-short/files/patch-text-short.cabal =================================================================== --- /dev/null +++ devel/hs-text-short/files/patch-text-short.cabal @@ -0,0 +1,11 @@ +--- text-short.cabal.orig 2018-12-24 13:33:33 UTC ++++ text-short.cabal +@@ -33,7 +33,7 @@ library + + other-modules: Data.Text.Short.Internal + +- build-depends: base >= 4.7 && < 4.12 ++ build-depends: base >= 4.7 && < 4.13 + , bytestring >= 0.10.4 && < 0.11 + , hashable >= 1.2.6 && < 1.3 + , deepseq >= 1.3 && < 1.5 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.6.0 -PORTREVISION= 1 +PORTVERSION= 0.2.10.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 = 1523446140 -SHA256 (cabal/th-abstraction-0.2.6.0.tar.gz) = e52e289a547d68f203d65f2e63ec2d87a3c613007d2fe873615c0969b981823c -SIZE (cabal/th-abstraction-0.2.6.0.tar.gz) = 23406 +TIMESTAMP = 1545494086 +SHA256 (cabal/th-abstraction-0.2.10.0.tar.gz) = c9dbffcaa4ed04f257427e61da135797190b572d4e37662f7821844cbd2114af +SIZE (cabal/th-abstraction-0.2.10.0.tar.gz) = 29620 Index: devel/hs-th-abstraction/files/patch-th-abstraction.cabal =================================================================== --- devel/hs-th-abstraction/files/patch-th-abstraction.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 Index: devel/hs-th-expand-syns/Makefile =================================================================== --- devel/hs-th-expand-syns/Makefile +++ devel/hs-th-expand-syns/Makefile @@ -2,7 +2,7 @@ PORTNAME= th-expand-syns PORTVERSION= 0.4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal =================================================================== --- /dev/null +++ devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal @@ -0,0 +1,11 @@ +--- th-expand-syns.cabal.orig 2017-12-26 20:43:27 UTC ++++ th-expand-syns.cabal +@@ -26,7 +26,7 @@ source-repository head + location: git://github.com/DanielSchuessler/th-expand-syns.git + + Library +- build-depends: base >= 4 && < 5, template-haskell < 2.14, syb, containers ++ build-depends: base >= 4 && < 5, template-haskell < 2.15, syb, containers + ghc-options: + exposed-modules: Language.Haskell.TH.ExpandSyns + other-modules: Language.Haskell.TH.ExpandSyns.SemigroupCompat 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.8 -PORTREVISION= 1 +PORTVERSION= 0.7.11 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -10,5 +9,7 @@ LICENSE= BSD3CLAUSE +USE_CABAL= th-abstraction + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: devel/hs-th-lift/distinfo =================================================================== --- devel/hs-th-lift/distinfo +++ devel/hs-th-lift/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523429375 -SHA256 (cabal/th-lift-0.7.8.tar.gz) = 2cf83385e848d9136a1d6e49ca845fd1d09935f2ff658c6f4e268d8ece02c12b -SIZE (cabal/th-lift-0.7.8.tar.gz) = 12399 +TIMESTAMP = 1545493576 +SHA256 (cabal/th-lift-0.7.11.tar.gz) = d53cd1479d3cf35c513095f3954eee539e73c55266cec5f1fa0a82d53f30238c +SIZE (cabal/th-lift-0.7.11.tar.gz) = 12756 Index: devel/hs-th-orphans/Makefile =================================================================== --- devel/hs-th-orphans/Makefile +++ devel/hs-th-orphans/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= th-orphans -PORTVERSION= 0.13.5 -PORTREVISION= 1 +PORTVERSION= 0.13.6 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-th-orphans/distinfo =================================================================== --- devel/hs-th-orphans/distinfo +++ devel/hs-th-orphans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524930811 -SHA256 (cabal/th-orphans-0.13.5.tar.gz) = 95644d4b7914317e1dd31095947b8371f1a18be0c09e75f0e29203eb774a25ad -SIZE (cabal/th-orphans-0.13.5.tar.gz) = 6675 +TIMESTAMP = 1545681019 +SHA256 (cabal/th-orphans-0.13.6.tar.gz) = 7745e6b93a73cbc0a6aa0da0a7b7377f0be4fffb4fd311e5502de199ec1dd469 +SIZE (cabal/th-orphans-0.13.6.tar.gz) = 6773 Index: devel/hs-time-locale-compat/Makefile =================================================================== --- devel/hs-time-locale-compat/Makefile +++ devel/hs-time-locale-compat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= time-locale-compat -PORTVERSION= 0.1.1.3 -PORTREVISION= 3 +PORTVERSION= 0.1.1.5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-time-locale-compat/distinfo =================================================================== --- devel/hs-time-locale-compat/distinfo +++ devel/hs-time-locale-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627860 -SHA256 (cabal/time-locale-compat-0.1.1.3.tar.gz) = 9144bf68b47791a2ac73f45aeadbc5910be2da9ad174909e1a10a70b4576aced -SIZE (cabal/time-locale-compat-0.1.1.3.tar.gz) = 1925 +TIMESTAMP = 1545832941 +SHA256 (cabal/time-locale-compat-0.1.1.5.tar.gz) = 07ff1566de7d851423a843b2de385442319348c621d4f779b3d365ce91ac502c +SIZE (cabal/time-locale-compat-0.1.1.5.tar.gz) = 1956 Index: devel/hs-unliftio-core/Makefile =================================================================== --- devel/hs-unliftio-core/Makefile +++ devel/hs-unliftio-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= unliftio-core PORTVERSION= 0.1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-unliftio-core/files/patch-unliftio-core.cabal =================================================================== --- devel/hs-unliftio-core/files/patch-unliftio-core.cabal +++ devel/hs-unliftio-core/files/patch-unliftio-core.cabal @@ -5,7 +5,7 @@ src build-depends: - base >=4.5 && <4.11 -+ base >=4.5 && <4.12 ++ base >=4.5 && <4.13 , transformers >=0.2 && <0.6 exposed-modules: Control.Monad.IO.Unlift Index: devel/hs-unliftio/Makefile =================================================================== --- devel/hs-unliftio/Makefile +++ devel/hs-unliftio/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= unliftio -PORTVERSION= 0.2.6.0 -PORTREVISION= 1 +PORTVERSION= 0.2.9.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-unliftio/distinfo =================================================================== --- devel/hs-unliftio/distinfo +++ devel/hs-unliftio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523902179 -SHA256 (cabal/unliftio-0.2.6.0.tar.gz) = f87d5b6fa7f1bdb2d47e91c30411a3a878bc281a1259fc23abe146d1c4a4b366 -SIZE (cabal/unliftio-0.2.6.0.tar.gz) = 28311 +TIMESTAMP = 1545757713 +SHA256 (cabal/unliftio-0.2.9.0.tar.gz) = ff6596a932d1b52b409739fd7bbc07234b484cc72f459f2515b27c2b55cd39b8 +SIZE (cabal/unliftio-0.2.9.0.tar.gz) = 38909 Index: devel/hs-uuagc-bootstrap/Makefile =================================================================== --- devel/hs-uuagc-bootstrap/Makefile +++ devel/hs-uuagc-bootstrap/Makefile @@ -10,6 +10,10 @@ LICENSE= BSD3CLAUSE +DEPRECATED= No release since 2011 +BROKEN= Doesn't build with newest GHC +EXPIRATION_DATE=31.01.2019 + USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uulib>=0.9.14 EXECUTABLE= uuagc-bootstrap Index: devel/hs-uuagc/Makefile =================================================================== --- devel/hs-uuagc/Makefile +++ devel/hs-uuagc/Makefile @@ -11,6 +11,10 @@ LICENSE= BSD3CLAUSE +DEPRECATED= No release since 2015 +BROKEN= Doesn't build with recent Haskell libraries +EXPIRATION_DATE=31.01.2019 + USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \ uulib>=0.9.14 Index: devel/hs-uuid/Makefile =================================================================== --- devel/hs-uuid/Makefile +++ devel/hs-uuid/Makefile @@ -2,7 +2,7 @@ PORTNAME= uuid PORTVERSION= 1.3.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-uuid/files/patch-uuid.cabal =================================================================== --- devel/hs-uuid/files/patch-uuid.cabal +++ devel/hs-uuid/files/patch-uuid.cabal @@ -1,10 +1,15 @@ ---- uuid.cabal.orig 2018-04-29 12:00:18 UTC +--- uuid.cabal.orig 2016-12-17 19:29:29 UTC +++ uuid.cabal -@@ -37,7 +37,7 @@ Library - entropy >= 0.3.7 && < 0.4, +@@ -34,10 +34,10 @@ Library + bytestring >= 0.10 && < 0.11, + cryptohash-sha1 >= 0.11.100 && < 0.12, + cryptohash-md5 >= 0.11.100 && < 0.12, +- entropy >= 0.3.7 && < 0.4, ++ entropy >= 0.3.7 && < 0.5, 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-vault/Makefile =================================================================== --- devel/hs-vault/Makefile +++ devel/hs-vault/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vault -PORTVERSION= 0.3.1.0 -PORTREVISION= 1 +PORTVERSION= 0.3.1.2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-vault/distinfo =================================================================== --- devel/hs-vault/distinfo +++ devel/hs-vault/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523431307 -SHA256 (cabal/vault-0.3.1.0.tar.gz) = d960a843c3dae1f6073f50e980dcdbbe2e46e9911273c9f122ba96494c4c979f -SIZE (cabal/vault-0.3.1.0.tar.gz) = 5199 +TIMESTAMP = 1545653873 +SHA256 (cabal/vault-0.3.1.2.tar.gz) = 9e00e52ec0b054cfb9b1e44d8ce2eefb499cc1dcd4bcdd0d434b370d635e551c +SIZE (cabal/vault-0.3.1.2.tar.gz) = 5307 Index: devel/hs-vector-algorithms/Makefile =================================================================== --- devel/hs-vector-algorithms/Makefile +++ devel/hs-vector-algorithms/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vector-algorithms -PORTVERSION= 0.7.0.1 -PORTREVISION= 4 +PORTVERSION= 0.8.0.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-vector-algorithms/distinfo =================================================================== --- devel/hs-vector-algorithms/distinfo +++ devel/hs-vector-algorithms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627863 -SHA256 (cabal/vector-algorithms-0.7.0.1.tar.gz) = ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070 -SIZE (cabal/vector-algorithms-0.7.0.1.tar.gz) = 25435 +TIMESTAMP = 1545678245 +SHA256 (cabal/vector-algorithms-0.8.0.1.tar.gz) = 15bcde786dcf03861946885e030d3dbe3b683e1a6fc12d7317e115084f4637fe +SIZE (cabal/vector-algorithms-0.8.0.1.tar.gz) = 26071 Index: devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal =================================================================== --- devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- vector-algorithms.cabal.orig 2017-07-07 20:17:27 UTC -+++ vector-algorithms.cabal -@@ -44,7 +44,7 @@ library - hs-source-dirs: src - - build-depends: base >= 4.5 && < 5, -- vector >= 0.6 && < 0.12, -+ vector >= 0.6 && < 0.13, - primitive >=0.3 && <0.7, - bytestring >= 0.9 && < 1.0 - 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.4 -PORTREVISION= 1 +PORTVERSION= 0.2.5.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-vector-binary-instances/distinfo =================================================================== --- devel/hs-vector-binary-instances/distinfo +++ devel/hs-vector-binary-instances/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523451213 -SHA256 (cabal/vector-binary-instances-0.2.4.tar.gz) = 2b2f783e414dcf2e7dc34ad14264e5af83e5cd4784d5a0a64e4b4571963443f8 -SIZE (cabal/vector-binary-instances-0.2.4.tar.gz) = 4146 +TIMESTAMP = 1545833565 +SHA256 (cabal/vector-binary-instances-0.2.5.1.tar.gz) = 3945b99f8efd319c837700b7cef5163ee23e656e89227357e0b7a41d2a66c512 +SIZE (cabal/vector-binary-instances-0.2.5.1.tar.gz) = 4067 Index: devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal =================================================================== --- devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/Makefile =================================================================== --- devel/hs-vector/Makefile +++ devel/hs-vector/Makefile @@ -2,7 +2,7 @@ PORTNAME= vector PORTVERSION= 0.12.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-vector/files/patch-vector.cabal =================================================================== --- devel/hs-vector/files/patch-vector.cabal +++ devel/hs-vector/files/patch-vector.cabal @@ -5,7 +5,7 @@ vector.h - Build-Depends: base >= 4.5 && < 4.10 -+ Build-Depends: base >= 4.5 && < 4.12 ++ Build-Depends: base >= 4.5 && < 4.13 , primitive >= 0.5.0.1 && < 0.7 , ghc-prim >= 0.2 && < 0.6 , deepseq >= 1.1 && < 1.5 Index: devel/stack/Makefile =================================================================== --- devel/stack/Makefile +++ devel/stack/Makefile @@ -22,6 +22,8 @@ LICENSE= BSD3CLAUSE +BROKEN= asdasd + BUILD_DEPENDS= ghc>0:lang/ghc \ hs-mtl>0:devel/hs-mtl \ hs-network>0:net/hs-network \ Index: graphics/hs-JuicyPixels/Makefile =================================================================== --- graphics/hs-JuicyPixels/Makefile +++ graphics/hs-JuicyPixels/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= JuicyPixels -PORTVERSION= 3.2.9.5 -PORTREVISION= 1 +PORTVERSION= 3.3.3 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 = 1523462111 -SHA256 (cabal/JuicyPixels-3.2.9.5.tar.gz) = 849c6cf4a613f906f7e553a1baefe9c0dc61c13b41a5f5b9605cf80e328cc355 -SIZE (cabal/JuicyPixels-3.2.9.5.tar.gz) = 122952 +TIMESTAMP = 1545834119 +SHA256 (cabal/JuicyPixels-3.3.3.tar.gz) = 2c04b5b6504a780e9363dc8894837976e18ce0623182e38aab6bc5e76c40b3c4 +SIZE (cabal/JuicyPixels-3.3.3.tar.gz) = 130714 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= 3 +PORTREVISION= 4 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org Index: graphics/hs-dia-base/files/patch-dia-base.cabal =================================================================== --- graphics/hs-dia-base/files/patch-dia-base.cabal +++ graphics/hs-dia-base/files/patch-dia-base.cabal @@ -5,6 +5,6 @@ Build-Depends: - base >= 4.0 && < 4.10, -+ base >= 4.0 && < 4.12, ++ base >= 4.0 && < 4.13, deepseq >= 1.1 && < 1.5 Index: graphics/hs-dia-functions/Makefile =================================================================== --- graphics/hs-dia-functions/Makefile +++ graphics/hs-dia-functions/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= dia-functions -PORTVERSION= 0.2.1.4 -PORTREVISION= 4 +PORTVERSION= 0.2.1.5 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org Index: graphics/hs-dia-functions/distinfo =================================================================== --- graphics/hs-dia-functions/distinfo +++ graphics/hs-dia-functions/distinfo @@ -1,2 +1,3 @@ -SHA256 (cabal/dia-functions-0.2.1.4.tar.gz) = 4730fbef211f42b4567f4a034dc27bd82f2770adac55b3d04b555067dd550e92 -SIZE (cabal/dia-functions-0.2.1.4.tar.gz) = 8126 +TIMESTAMP = 1545837099 +SHA256 (cabal/dia-functions-0.2.1.5.tar.gz) = aff8ffc4ff79a48f7b275cf84b5a97092e1a674e3c978fdae405d66c3cf732e1 +SIZE (cabal/dia-functions-0.2.1.5.tar.gz) = 8127 Index: graphics/hs-dia-functions/files/patch-dia-functions.cabal =================================================================== --- graphics/hs-dia-functions/files/patch-dia-functions.cabal +++ graphics/hs-dia-functions/files/patch-dia-functions.cabal @@ -1,11 +1,22 @@ ---- dia-functions.cabal.orig 2017-07-11 15:29:54 UTC +--- dia-functions.cabal.orig 2016-05-24 15:37:59 UTC +++ dia-functions.cabal -@@ -30,7 +30,7 @@ library +@@ -19,7 +19,7 @@ cabal-version: >=1.2 + build-type: Simple + + library +- GHC-Options: -Wall -fwarn-tabs -fno-warn-unused-matches -fno-warn-name-shadowing ++ GHC-Options: -Wall -fwarn-tabs -fno-warn-unused-matches -fno-warn-name-shadowing + + Exposed-Modules: + Graphics.Diagrams.Colors, +@@ -30,8 +30,8 @@ library Build-Depends: data-pprint >= 0.2 && < 0.3, dia-base >= 0.1 && < 0.2, -- base >= 4.0 && < 4.9, -+ base >= 4.0 && < 5, - containers >= 0.4 && < 0.6, +- base >= 4.0 && < 4.10, +- containers >= 0.4 && < 0.6, ++ base >= 4.0 && < 4.13, ++ containers >= 0.4 && < 0.7, xhtml >= 3000.2 && < 3000.3, mtl >= 2.0 && < 2.3, + deepseq >= 1.1 && < 1.5 Index: graphics/hs-graphviz/Makefile =================================================================== --- graphics/hs-graphviz/Makefile +++ graphics/hs-graphviz/Makefile @@ -2,6 +2,7 @@ PORTNAME= graphviz PORTVERSION= 2999.20.0.2 +PORTREVISION= 1 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org Index: graphics/hs-graphviz/files/patch-graphviz.cabal =================================================================== --- /dev/null +++ graphics/hs-graphviz/files/patch-graphviz.cabal @@ -0,0 +1,11 @@ +--- graphviz.cabal.orig 2018-05-25 10:40:58 UTC ++++ graphviz.cabal +@@ -64,7 +64,7 @@ Library { + process, + directory, + temporary >=1.1 && <1.4, +- fgl >= 5.4 && < 5.7, ++ fgl >= 5.4 && < 5.8, + filepath, + polyparse >=1.9 && <1.13, + bytestring >= 0.9 && < 0.11, Index: lang/ghc/Makefile =================================================================== --- lang/ghc/Makefile +++ lang/ghc/Makefile @@ -18,11 +18,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -GHC_VERSION= 8.4.4 +GHC_VERSION= 8.6.3 HSCOLOUR_VERSION= 1.24.4 -LLVM_VERSION= 50 +LLVM_VERSION= 60 -CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.3 +CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.* ghc-8.6.2 .include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk" Index: lang/ghc/bsd.hackage.mk =================================================================== --- lang/ghc/bsd.hackage.mk +++ lang/ghc/bsd.hackage.mk @@ -95,6 +95,7 @@ basic-prelude_port?= devel/hs-basic-prelude bencode_port?= textproc/hs-bencode bifunctors_port?= devel/hs-bifunctors +bitarray_port?= devel/hs-bitarray bits-atomic_port?= devel/hs-bits-atomic blaze-builder_port?= devel/hs-blaze-builder blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator @@ -158,6 +159,7 @@ cprng-aes_port?= security/hs-cprng-aes cpu_port?= sysutils/hs-cpu criterion_port?= benchmarks/hs-criterion +criterion-measurement_port?= benchmarks/hs-criterion-measurement Crypto_port?= security/hs-Crypto crypto-api_port?= security/hs-crypto-api crypto-cipher-types_port?= security/hs-crypto-cipher-types @@ -198,6 +200,7 @@ DAV_port?= www/hs-DAV # executable dbus_port?= devel/hs-dbus deepseq-generics_port?= devel/hs-deepseq-generics +dense-linear-algebra_port?= math/hs-dense-linear-algebra dia-base_port?= graphics/hs-dia-base dia-functions_port?= graphics/hs-dia-functions Diff_port?= textproc/hs-Diff @@ -311,6 +314,7 @@ hslua_port?= devel/hs-hslua hslua-module-text_port?= devel/hs-hslua-module-text HsOpenSSL_port?= security/hs-HsOpenSSL +HsYAML_port?= textproc/hs-HsYAML hspec_port?= devel/hs-hspec # executable hspec-core_port?= devel/hs-hspec-core hspec-discover_port?= devel/hs-hspec-discover # executable @@ -355,6 +359,7 @@ libmpd_port?= audio/hs-libmpd libxml_port?= textproc/hs-libxml libxml-sax_port?= textproc/hs-libxml-sax # lib_depends +libyaml_port?= textproc/hs-libyaml lifted-async_port?= devel/hs-lifted-async lifted-base_port?= devel/hs-lifted-base List_port?= devel/hs-List @@ -548,6 +553,7 @@ unamb_port?= devel/hs-unamb unexceptionalio_port?= devel/hs-unexceptionalio unicode-show_port?= devel/hs-unicode-show +unicode-transforms_port?= textproc/hs-unicode-transforms uniplate_port?= devel/hs-uniplate unix-compat_port?= devel/hs-unix-compat unix-time_port?= devel/hs-unix-time Index: lang/ghc/bsd.cabal.options.mk =================================================================== --- lang/ghc/bsd.cabal.options.mk +++ lang/ghc/bsd.cabal.options.mk @@ -18,7 +18,7 @@ HADDOCK_CMD?= ${LOCALBASE}/bin/haddock HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour -GHC_VERSION?= 8.4.4 +GHC_VERSION?= 8.6.3 HSCOLOUR_VERSION= 1.24.4 Index: lang/ghc/distinfo =================================================================== --- lang/ghc/distinfo +++ lang/ghc/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1541010522 -SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2 -SIZE (ghc-8.4.4-src.tar.xz) = 11319500 +TIMESTAMP = 1541010523 +SHA256 (ghc-8.6.3-src.tar.xz) = 9f9e37b7971935d88ba80426c36af14b1e0b3ec1d9c860f44a4391771bc07f23 +SIZE (ghc-8.6.3-src.tar.xz) = 19138116 SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 Index: lang/ghc/files/extra-patch-aclocal.m4 =================================================================== --- lang/ghc/files/extra-patch-aclocal.m4 +++ lang/ghc/files/extra-patch-aclocal.m4 @@ -1,46 +1,8 @@ --- aclocal.m4.orig 2018-03-25 21:22:32 UTC +++ aclocal.m4 -@@ -648,6 +648,14 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], - $3="$$3 -D_HPUX_SOURCE" - $5="$$5 -D_HPUX_SOURCE" - ;; -+ arm*freebsd*) -+ # On arm/freebsd, tell gcc to generate Arm -+ # instructions (ie not Thumb) and to link using the gold linker. -+ # Forcing LD to be ld.gold is done in FIND_LD m4 macro. -+ $2="$$2 -marm" -+ $3="$$3 -Wl,-z,noexecstack" -+ $4="$$4 -z noexecstack" -+ ;; - arm*linux*) - # On arm/linux and arm/android, tell gcc to generate Arm - # instructions (ie not Thumb). -@@ -656,6 +664,11 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], - $4="$$4 -z noexecstack" - ;; - -+ aarch64*freebsd*) -+ $3="$$3 -Wl,-z,noexecstack" -+ $4="$$4 -z noexecstack" -+ ;; -+ - aarch64*linux*) - $3="$$3 -Wl,-z,noexecstack" - $4="$$4 -z noexecstack" -@@ -1917,6 +1930,10 @@ case "$1" in - # converts the canonicalized target into someting llvm can understand - AC_DEFUN([GHC_LLVM_TARGET], [ - case "$2-$3" in -+ *-freebsd*-gnueabihf) -+ llvm_target_vendor="unknown" -+ llvm_target_os="freebsd-gnueabihf" -+ ;; - hardfloat-*eabi) - llvm_target_vendor="unknown" - llvm_target_os="$3""hf" @@ -2361,13 +2378,6 @@ AC_DEFUN([FIND_LD],[ [enable_ld_override=yes]) - + find_ld() { - # Make sure the user didn't specify LD manually. - if test "z$LD" != "z"; then Index: lang/ghc/files/patch-configure =================================================================== --- lang/ghc/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2018-03-06 20:04:54 UTC -+++ configure -@@ -9108,6 +9108,19 @@ $as_echo_n "checking Setting up CFLAGS, LDFLAGS, IGNOR - IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack" - ;; - -+ arm*freebsd*) -+ # On arm/freebsd, tell gcc to generate Arm -+ # instructions (ie not Thumb). -+ CFLAGS="$CFLAGS -marm" -+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" -+ IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack" -+ ;; -+ -+ aarch64*freebsd*) -+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" -+ IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack" -+ ;; -+ - powerpc-ibm-aix*) - # We need `-D_THREAD_SAFE` to unlock the thread-local `errno`. - CFLAGS="$CFLAGS -D_THREAD_SAFE" Index: lang/ghc/files/patch-fix-build-on-arm =================================================================== --- lang/ghc/files/patch-fix-build-on-arm +++ /dev/null @@ -1,231 +0,0 @@ -From d8495549ba9d194815c2d0eaee6797fc7c00756a Mon Sep 17 00:00:00 2001 -From: Kavon Farvardin -Date: Sun, 28 Oct 2018 12:11:49 -0400 -Subject: [PATCH] Fix for T14251 on ARM - -We now calculate the SSE register padding needed to fix the calling -convention in LLVM in a robust way: grouping them by whether -registers in that class overlap (with the same class overlapping -itself). - -My prior patch assumed that no matter the platform, physical -register Fx aliases with Dx, etc, for our calling convention. - -This is unfortunately not the case for any platform except x86-64. - -Test Plan: -Only know how to test on x86-64, but it should be tested on ARM with: - -`make test WAYS=llvm && make test WAYS=optllvm` - -Reviewers: bgamari, angerman - -Reviewed By: bgamari - -Subscribers: rwbarton, carter - -GHC Trac Issues: #15780, #14251, #15747 - -Differential Revision: https://phabricator.haskell.org/D5254 ---- - compiler/llvmGen/LlvmCodeGen/Base.hs | 123 ++++++++++++++++++++++---------- - compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 6 +- - 2 files changed, 90 insertions(+), 39 deletions(-) - -diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs -index ec91bac..0a40b73 100644 ---- compiler/llvmGen/LlvmCodeGen/Base.hs -+++ compiler/llvmGen/LlvmCodeGen/Base.hs -@@ -26,7 +26,7 @@ module LlvmCodeGen.Base ( - - cmmToLlvmType, widthToLlvmFloat, widthToLlvmInt, llvmFunTy, - llvmFunSig, llvmFunArgs, llvmStdFunAttrs, llvmFunAlign, llvmInfAlign, -- llvmPtrBits, tysToParams, llvmFunSection, padLiveArgs, isSSE, -+ llvmPtrBits, tysToParams, llvmFunSection, padLiveArgs, isFPR, - - strCLabel_llvm, strDisplayName_llvm, strProcedureName_llvm, - getGlobalPtr, generateExternDecls, -@@ -47,6 +47,7 @@ import CodeGen.Platform ( activeStgRegs ) - import DynFlags - import FastString - import Cmm hiding ( succ ) -+import CmmUtils ( regsOverlap ) - import Outputable as Outp - import Platform - import UniqFM -@@ -58,8 +59,7 @@ import ErrUtils - import qualified Stream - - import Control.Monad (ap) --import Data.List (sort) --import Data.Maybe (mapMaybe) -+import Data.List (sort, groupBy, head) - - -- ---------------------------------------------------------------------------- - -- * Some Data Types -@@ -152,36 +152,91 @@ llvmFunArgs dflags live = - map (lmGlobalRegArg dflags) (filter isPassed allRegs) - where platform = targetPlatform dflags - allRegs = activeStgRegs platform -- paddedLive = map (\(_,r) -> r) $ padLiveArgs live -+ paddedLive = map (\(_,r) -> r) $ padLiveArgs dflags live - isLive r = r `elem` alwaysLive || r `elem` paddedLive -- isPassed r = not (isSSE r) || isLive r -- -- --isSSE :: GlobalReg -> Bool --isSSE (FloatReg _) = True --isSSE (DoubleReg _) = True --isSSE (XmmReg _) = True --isSSE (YmmReg _) = True --isSSE (ZmmReg _) = True --isSSE _ = False -- --sseRegNum :: GlobalReg -> Maybe Int --sseRegNum (FloatReg i) = Just i --sseRegNum (DoubleReg i) = Just i --sseRegNum (XmmReg i) = Just i --sseRegNum (YmmReg i) = Just i --sseRegNum (ZmmReg i) = Just i --sseRegNum _ = Nothing -- ---- the bool indicates whether the global reg was added as padding. ---- the returned list is not sorted in any particular order, ---- but does indicate the set of live registers needed, with SSE padding. --padLiveArgs :: LiveGlobalRegs -> [(Bool, GlobalReg)] --padLiveArgs live = allRegs -+ isPassed r = not (isFPR r) || isLive r -+ -+ -+isFPR :: GlobalReg -> Bool -+isFPR (FloatReg _) = True -+isFPR (DoubleReg _) = True -+isFPR (XmmReg _) = True -+isFPR (YmmReg _) = True -+isFPR (ZmmReg _) = True -+isFPR _ = False -+ -+sameFPRClass :: GlobalReg -> GlobalReg -> Bool -+sameFPRClass (FloatReg _) (FloatReg _) = True -+sameFPRClass (DoubleReg _) (DoubleReg _) = True -+sameFPRClass (XmmReg _) (XmmReg _) = True -+sameFPRClass (YmmReg _) (YmmReg _) = True -+sameFPRClass (ZmmReg _) (ZmmReg _) = True -+sameFPRClass _ _ = False -+ -+normalizeFPRNum :: GlobalReg -> GlobalReg -+normalizeFPRNum (FloatReg _) = FloatReg 1 -+normalizeFPRNum (DoubleReg _) = DoubleReg 1 -+normalizeFPRNum (XmmReg _) = XmmReg 1 -+normalizeFPRNum (YmmReg _) = YmmReg 1 -+normalizeFPRNum (ZmmReg _) = ZmmReg 1 -+normalizeFPRNum _ = error "normalizeFPRNum expected only FPR regs" -+ -+getFPRCtor :: GlobalReg -> Int -> GlobalReg -+getFPRCtor (FloatReg _) = FloatReg -+getFPRCtor (DoubleReg _) = DoubleReg -+getFPRCtor (XmmReg _) = XmmReg -+getFPRCtor (YmmReg _) = YmmReg -+getFPRCtor (ZmmReg _) = ZmmReg -+getFPRCtor _ = error "getFPRCtor expected only FPR regs" -+ -+fprRegNum :: GlobalReg -> Int -+fprRegNum (FloatReg i) = i -+fprRegNum (DoubleReg i) = i -+fprRegNum (XmmReg i) = i -+fprRegNum (YmmReg i) = i -+fprRegNum (ZmmReg i) = i -+fprRegNum _ = error "fprRegNum expected only FPR regs" -+ -+-- | Input: dynflags, and the list of live registers -+-- -+-- Output: An augmented list of live registers, where padding was -+-- added to the list of registers to ensure the calling convention is -+-- correctly used by LLVM. -+-- -+-- Each global reg in the returned list is tagged with a bool, which -+-- indicates whether the global reg was added as padding, or was an original -+-- live register. -+-- -+-- That is, True => padding, False => a real, live global register. -+-- -+-- Also, the returned list is not sorted in any particular order. -+-- -+padLiveArgs :: DynFlags -> LiveGlobalRegs -> [(Bool, GlobalReg)] -+padLiveArgs dflags live = -+ if platformUnregisterised plat -+ then taggedLive -- not using GHC's register convention for platform. -+ else padding ++ taggedLive -+ where -+ taggedLive = map (\x -> (False, x)) live -+ plat = targetPlatform dflags -+ -+ fprLive = filter isFPR live -+ padding = concatMap calcPad $ groupBy sharesClass fprLive -+ -+ sharesClass :: GlobalReg -> GlobalReg -> Bool -+ sharesClass a b = sameFPRClass a b || overlappingClass -+ where -+ overlappingClass = regsOverlap dflags (norm a) (norm b) -+ norm = CmmGlobal . normalizeFPRNum -+ -+ calcPad :: [GlobalReg] -> [(Bool, GlobalReg)] -+ calcPad rs = getFPRPadding (getFPRCtor $ head rs) rs -+ -+getFPRPadding :: (Int -> GlobalReg) -> LiveGlobalRegs -> [(Bool, GlobalReg)] -+getFPRPadding paddingCtor live = padding - where -- sseRegNums = sort $ mapMaybe sseRegNum live -- (_, padding) = foldl assignSlots (1, []) $ sseRegNums -- allRegs = padding ++ map (\r -> (False, r)) live -+ fprRegNums = sort $ map fprRegNum live -+ (_, padding) = foldl assignSlots (1, []) $ fprRegNums - - assignSlots (i, acc) regNum - | i == regNum = -- don't need padding here -@@ -195,11 +250,7 @@ padLiveArgs live = allRegs - - genPad start n = - take n $ flip map (iterate (+1) start) (\i -> -- (True, FloatReg i)) -- -- NOTE: Picking float should be fine for the following reasons: -- -- (1) Float aliases with all the other SSE register types on -- -- the given platform. -- -- (2) The argument is not live anyways. -+ (True, paddingCtor i)) - - - -- | Llvm standard fun attributes -diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs -index 1873400..21abc65 100644 ---- compiler/llvmGen/LlvmCodeGen/CodeGen.hs -+++ compiler/llvmGen/LlvmCodeGen/CodeGen.hs -@@ -1814,14 +1814,14 @@ funPrologue live cmmBlocks = do - -- STG Liveness optimisation done here. - funEpilogue :: LiveGlobalRegs -> LlvmM ([LlvmVar], LlvmStatements) - funEpilogue live = do -+ dflags <- getDynFlags - - -- the bool indicates whether the register is padding. - let alwaysNeeded = map (\r -> (False, r)) alwaysLive -- livePadded = alwaysNeeded ++ padLiveArgs live -+ livePadded = alwaysNeeded ++ padLiveArgs dflags live - - -- Set to value or "undef" depending on whether the register is - -- actually live -- dflags <- getDynFlags - let loadExpr r = do - (v, _, s) <- getCmmRegVal (CmmGlobal r) - return (Just $ v, s) -@@ -1833,7 +1833,7 @@ funEpilogue live = do - loads <- flip mapM allRegs $ \r -> case () of - _ | (False, r) `elem` livePadded - -> loadExpr r -- if r is not padding, load it -- | not (isSSE r) || (True, r) `elem` livePadded -+ | not (isFPR r) || (True, r) `elem` livePadded - -> loadUndef r - | otherwise -> return (Nothing, nilOL) - --- -1.9.1 - Index: lang/ghc/files/patch-ghc.mk =================================================================== --- lang/ghc/files/patch-ghc.mk +++ lang/ghc/files/patch-ghc.mk @@ -1,4 +1,4 @@ ---- ghc.mk.orig 2017-01-03 15:59:18 UTC +--- ghc.mk.orig 2018-09-16 20:53:54 UTC +++ ghc.mk @@ -96,6 +96,7 @@ endif # Catch make if it runs away into an infinite loop @@ -8,14 +8,13 @@ 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 -@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th - PACKAGES_STAGE1 += ghc-boot - PACKAGES_STAGE1 += template-haskell +@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell PACKAGES_STAGE1 += ghc-compact -- + PACKAGES_STAGE1 += ghc-heap + -ifeq "$(HADDOCK_DOCS)" "YES" PACKAGES_STAGE1 += xhtml -endif - + ifeq "$(WITH_TERMINFO)" "YES" PACKAGES_STAGE1 += terminfo Index: lang/ghc/files/patch-llvm-targets =================================================================== --- lang/ghc/files/patch-llvm-targets +++ /dev/null @@ -1,12 +0,0 @@ ---- llvm-targets.orig 2018-03-17 14:04:41 UTC -+++ llvm-targets -@@ -20,4 +20,9 @@ - ,("aarch64-apple-ios", ("e-m:o-i64:64-i128:128-n32:64-S128", "generic", "+neon")) - ,("i386-apple-ios", ("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128", "yonah", "")) - ,("x86_64-apple-ios", ("e-m:o-i64:64-f80:128-n8:16:32:64-S128", "core2", "")) -+,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align")) -+,("armv7-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align")) -+,("aarch64-unknown-freebsd", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon")) -+,("amd64-portbld-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "")) -+,("i386-portbld-freebsd", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "i486", "")) - ] Index: lang/ghc/files/patch-rts_posix_OSMem.c =================================================================== --- lang/ghc/files/patch-rts_posix_OSMem.c +++ /dev/null @@ -1,250 +0,0 @@ ---- rts/posix/OSMem.c.orig 2017-11-28 16:39:14 UTC -+++ rts/posix/OSMem.c -@@ -36,6 +36,10 @@ - #if defined(HAVE_NUMAIF_H) - #include - #endif -+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_SYS_TIME_H) -+#include -+#include -+#endif - - #include - -@@ -45,6 +49,29 @@ - #include - #endif - -+#ifndef MAP_FAILED -+# define MAP_FAILED ((void *)-1) -+#endif -+ -+#if defined(hpux_HOST_OS) -+# ifndef MAP_ANON -+# define MAP_ANON MAP_ANONYMOUS -+# endif -+#endif -+ -+#ifndef darwin_HOST_OS -+# undef RESERVE_FLAGS -+# if defined(MAP_GUARD) -+# define RESERVE_FLAGS MAP_GUARD /* FreeBSD */ -+# elif defined(MAP_NORESERVE) -+# define RESERVE_FLAGS MAP_NORESERVE | MAP_ANON | MAP_PRIVATE; -+# else -+# if defined(USE_LARGE_ADDRESS_SPACE) -+# error USE_LARGE_ADDRESS_SPACE needs MAP_NORESERVE or MAP_GUARD -+# endif -+# endif -+#endif -+ - static void *next_request = 0; - - void osMemInit(void) -@@ -98,8 +125,10 @@ - The naming is chosen from the Win32 API (VirtualAlloc) which does the - same thing and has done so forever, while support for this in Unix systems - has only been added recently and is hidden in the posix portability mess. -- It is confusing because to get the reserve behavior we need MAP_NORESERVE -- (which tells the kernel not to allocate backing space), but heh... -+ The Linux manpage suggests that mmap must be passed MAP_NORESERVE in order -+ to get reservation-only behavior. It is confusing because to get the reserve -+ behavior we need MAP_NORESERVE (which tells the kernel not to allocate backing -+ space), but heh... - */ - enum - { -@@ -108,6 +137,44 @@ - MEM_RESERVE_AND_COMMIT = MEM_RESERVE | MEM_COMMIT - }; - -+#if defined(linux_HOST_OS) -+static void * -+linux_retry_mmap(int operation, W_ size, void *ret, void *addr, int prot, int flags) -+{ -+ if (addr != 0 && (operation & MEM_RESERVE)) { -+ // Try again with no hint address. -+ // It's not clear that this can ever actually help, -+ // but since our alternative is to abort, we may as well try. -+ ret = mmap(0, size, prot, flags, -1, 0); -+ } -+ if (ret == MAP_FAILED && errno == EPERM) { -+ // Linux is not willing to give us any mapping, -+ // so treat this as an out-of-memory condition -+ // (really out of virtual address space). -+ errno = ENOMEM; -+ } -+ return ret; -+} -+#endif /* defined(linux_HOST_OS) */ -+ -+static void -+post_mmap_madvise(int operation, W_ size, void *ret) -+{ -+#if defined(MADV_WILLNEED) -+ if (operation & MEM_COMMIT) { -+ madvise(ret, size, MADV_WILLNEED); -+# if defined(MADV_DODUMP) -+ madvise(ret, size, MADV_DODUMP); -+# endif -+ } else { -+ madvise(ret, size, MADV_DONTNEED); -+# if defined(MADV_DONTDUMP) -+ madvise(ret, size, MADV_DONTDUMP); -+# endif -+ } -+#endif -+} -+ - /* Returns NULL on failure; errno set */ - static void * - my_mmap (void *addr, W_ size, int operation) -@@ -149,69 +216,44 @@ - VM_PROT_READ|VM_PROT_WRITE); - } - --#else -+#else /* defined(darwin_HOST_OS) */ - - int prot, flags; -- if (operation & MEM_COMMIT) -+ if (operation & MEM_COMMIT) { - prot = PROT_READ | PROT_WRITE; -- else -+ } else { - prot = PROT_NONE; -- if (operation == MEM_RESERVE) --# if defined(MAP_NORESERVE) -- flags = MAP_NORESERVE; -+ } -+ -+ if (operation == MEM_RESERVE) { -+# if defined(RESERVE_FLAGS) -+ flags = RESERVE_FLAGS; - # else --# if defined(USE_LARGE_ADDRESS_SPACE) --# error USE_LARGE_ADDRESS_SPACE needs MAP_NORESERVE --# endif - errorBelch("my_mmap(,,MEM_RESERVE) not supported on this platform"); - # endif -- else if (operation == MEM_COMMIT) -- flags = MAP_FIXED; -- else -- flags = 0; -+ } else if (operation == MEM_COMMIT) { -+ flags = MAP_FIXED | MAP_ANON | MAP_PRIVATE; -+ } else { -+ flags = MAP_ANON | MAP_PRIVATE; -+ } - --#if defined(hpux_HOST_OS) -- ret = mmap(addr, size, prot, flags | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); --#elif defined(linux_HOST_OS) -- ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0); -- if (ret == (void *)-1 && errno == EPERM) { -+ ret = mmap(addr, size, prot, flags, -1, 0); -+# if defined(linux_HOST_OS) -+ if (ret == MAP_FAILED && errno == EPERM) { - // Linux may return EPERM if it tried to give us - // a chunk of address space below mmap_min_addr, - // See Trac #7500. -- if (addr != 0 && (operation & MEM_RESERVE)) { -- // Try again with no hint address. -- // It's not clear that this can ever actually help, -- // but since our alternative is to abort, we may as well try. -- ret = mmap(0, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0); -- } -- if (ret == (void *)-1 && errno == EPERM) { -- // Linux is not willing to give us any mapping, -- // so treat this as an out-of-memory condition -- // (really out of virtual address space). -- errno = ENOMEM; -- } -+ ret = linux_retry_mmap(operation, size, ret, addr, prot, flags); - } -- -- if (operation & MEM_COMMIT) { -- madvise(ret, size, MADV_WILLNEED); --#if defined(MADV_DODUMP) -- madvise(ret, size, MADV_DODUMP); --#endif -- } else { -- madvise(ret, size, MADV_DONTNEED); --#if defined(MADV_DONTDUMP) -- madvise(ret, size, MADV_DONTDUMP); --#endif -- } -- --#else -- ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0); --#endif --#endif -- -- if (ret == (void *)-1) { -+# endif -+ if (ret == MAP_FAILED) { - return NULL; - } -+#endif /* defined(darwin_HOST_OS) */ -+ -+ // Map in committed pages rather than take a fault for each chunk. -+ // Also arrange to include them in core-dump files. -+ post_mmap_madvise(operation, size, ret); - - return ret; - } -@@ -435,6 +477,8 @@ - void *base, *top; - void *start, *end; - -+ ASSERT((len & ~MBLOCK_MASK) == len); -+ - /* We try to allocate len + MBLOCK_SIZE, - because we need memory which is MBLOCK_SIZE aligned, - and then we discard what we don't need */ -@@ -500,8 +544,19 @@ - (void*)startAddress, (void*)minimumAddress); - } - -+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_SYS_TIME_H) -+ struct rlimit limit; -+ if (!getrlimit(RLIMIT_AS, &limit) -+ && limit.rlim_cur > 0 -+ && *len > limit.rlim_cur) { -+ *len = limit.rlim_cur; -+ } -+#endif -+ - attempt = 0; - while (1) { -+ *len &= ~MBLOCK_MASK; -+ - if (*len < MBLOCK_SIZE) { - // Give up if the system won't even give us 16 blocks worth of heap - barf("osReserveHeapMemory: Failed to allocate heap storage"); -@@ -512,9 +567,14 @@ - if (at == NULL) { - // This means that mmap failed which we take to mean that we asked - // for too much memory. This can happen due to POSIX resource -- // limits. In this case we reduce our allocation request by a factor -- // of two and try again. -- *len /= 2; -+ // limits. In this case we reduce our allocation request by a -+ // fraction of the current size and try again. -+ // -+ // Note that the previously would instead decrease the request size -+ // by a factor of two; however, this meant that significant amounts -+ // of memory will be wasted (e.g. imagine a machine with 512GB of -+ // physical memory but a 511GB ulimit). See #14492. -+ *len -= *len / 8; - } else if ((W_)at >= minimumAddress) { - // Success! We were given a block of memory starting above the 8 GB - // mark, which is what we were looking for. -@@ -536,7 +596,7 @@ - { - void *r = my_mmap(at, size, MEM_COMMIT); - if (r == NULL) { -- barf("Unable to commit %d bytes of memory", size); -+ barf("Unable to commit %" FMT_Word " bytes of memory", size); - } - } 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.2.5 -PORTREVISION= 1 +PORTVERSION= 2.3.2.9 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 = 1523785923 -SHA256 (cabal/email-validate-2.3.2.5.tar.gz) = 7b4ff4e89eccc073df2f51e9d20d507ba1a6d4f5746130c712844c7cf8674e4c -SIZE (cabal/email-validate-2.3.2.5.tar.gz) = 9693 +TIMESTAMP = 1545833431 +SHA256 (cabal/email-validate-2.3.2.9.tar.gz) = aeac6eea61192683bbde6bb8bdcf2150a03f79fa2bf4a1deb5e838a0011a4e8b +SIZE (cabal/email-validate-2.3.2.9.tar.gz) = 9678 Index: math/Makefile =================================================================== --- math/Makefile +++ math/Makefile @@ -270,6 +270,7 @@ SUBDIR += hs-contravariant SUBDIR += hs-data-lens SUBDIR += hs-data-lens-template + SUBDIR += hs-dense-algebra SUBDIR += hs-distributive SUBDIR += hs-erf SUBDIR += hs-fixed Index: math/hs-Agda/Makefile =================================================================== --- math/hs-Agda/Makefile +++ math/hs-Agda/Makefile @@ -2,15 +2,17 @@ # $FreeBSD$ PORTNAME= Agda -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.4.2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Dependently typed functional programming language and proof assistant +BROKEN= Doesn't build with recent GHC + USE_CABAL= async EdisonCore blaze-html boxes data-hash edit-distance \ - equivalence geniplate-mirror gitrev hashable hashtables ieee754 \ - mtl murmur-hash parallel regex-tdfa strict \ + equivalence filemanip geniplate-mirror gitrev hashable \ + hashtables ieee754 mtl murmur-hash parallel regex-tdfa strict \ unordered-containers uri-encode zlib USE_ALEX= yes Index: math/hs-Agda/distinfo =================================================================== --- math/hs-Agda/distinfo +++ math/hs-Agda/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531764592 -SHA256 (cabal/Agda-2.5.4.tar.gz) = b40971e3312461771e36a11aaf4002424178301cf315b21a679f527b79c09e09 -SIZE (cabal/Agda-2.5.4.tar.gz) = 1993562 +TIMESTAMP = 1545834764 +SHA256 (cabal/Agda-2.5.4.2.tar.gz) = f645add8a47a35da3f37757204fa9c80aeb0993d628fc2057fa343e92e579b1f +SIZE (cabal/Agda-2.5.4.2.tar.gz) = 1988621 Index: math/hs-adjunctions/Makefile =================================================================== --- math/hs-adjunctions/Makefile +++ math/hs-adjunctions/Makefile @@ -2,7 +2,7 @@ PORTNAME= adjunctions PORTVERSION= 4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= comonad>=4 contravariant>=1.0 distributive>=0.4 free>=4.0 \ +USE_CABAL= comonad>=4 distributive>=0.4 free>=4.0 \ mtl>=2.0.1 profunctors>=4 semigroupoids>=4 semigroups>=0.11 \ tagged>=0.7 void>=0.5.5.1 Index: math/hs-adjunctions/files/patch-adjunctions.cabal =================================================================== --- /dev/null +++ math/hs-adjunctions/files/patch-adjunctions.cabal @@ -0,0 +1,12 @@ +--- adjunctions.cabal.orig 2018-01-28 14:49:01 UTC ++++ adjunctions.cabal +@@ -49,8 +49,7 @@ library + array >= 0.3.0.2 && < 0.7, + base >= 4 && < 5, + comonad >= 4 && < 6, +- containers >= 0.3 && < 0.6, +- contravariant >= 1 && < 2, ++ containers >= 0.3 && < 0.7, + distributive >= 0.5.1 && < 1, + free >= 4 && < 6, + mtl >= 2.0.1 && < 2.3, Index: math/hs-comonad/Makefile =================================================================== --- math/hs-comonad/Makefile +++ math/hs-comonad/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= comonad -PORTVERSION= 5.0.3 -PORTREVISION= 1 +PORTVERSION= 5.0.4 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= contravariant>=0.2.0.1 distributive>=0.2.2 semigroups>=0.8.3.1 \ - tagged>=0.1 +USE_CABAL= distributive>=0.2.2 semigroups>=0.8.3.1 tagged>=0.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-comonad/distinfo =================================================================== --- math/hs-comonad/distinfo +++ math/hs-comonad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523787141 -SHA256 (cabal/comonad-5.0.3.tar.gz) = a7f4584d634051123c547f0d10f88eaf23d99229dbd01dfdcd98cddd41e54df6 -SIZE (cabal/comonad-5.0.3.tar.gz) = 17430 +TIMESTAMP = 1545588743 +SHA256 (cabal/comonad-5.0.4.tar.gz) = 78a89d7f9f0975b40b3294adcb70885649572b687ac5f5dc98e452471838e825 +SIZE (cabal/comonad-5.0.4.tar.gz) = 17758 Index: math/hs-comonad/files/patch-comonad.cabal =================================================================== --- /dev/null +++ math/hs-comonad/files/patch-comonad.cabal @@ -0,0 +1,11 @@ +--- comonad.cabal.orig 2018-07-01 21:24:59 UTC ++++ comonad.cabal +@@ -89,7 +89,7 @@ library + build-depends: containers >= 0.3 && < 0.7 + + if flag(contravariant) +- build-depends: contravariant >= 0.2.0.1 && < 2 ++ + + if flag(distributive) + build-depends: distributive >= 0.2.2 && < 1 Index: math/hs-data-lens-template/Makefile =================================================================== --- math/hs-data-lens-template/Makefile +++ math/hs-data-lens-template/Makefile @@ -2,7 +2,7 @@ PORTNAME= data-lens-template PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-data-lens-template/files/patch-data-lens-template.cabal =================================================================== --- math/hs-data-lens-template/files/patch-data-lens-template.cabal +++ math/hs-data-lens-template/files/patch-data-lens-template.cabal @@ -5,7 +5,7 @@ data-lens >= 2.0 && < 2.12, base >= 1.0 && < 5, - template-haskell >= 2.11 && < 2.12 -+ template-haskell >= 2.11 && < 2.14 ++ template-haskell >= 2.11 && < 2.15 exposed-modules: Data.Lens.Template Index: math/hs-data-lens/Makefile =================================================================== --- math/hs-data-lens/Makefile +++ math/hs-data-lens/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= data-lens -PORTVERSION= 2.11.1 -PORTREVISION= 3 +PORTVERSION= 2.11.2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-data-lens/distinfo =================================================================== --- math/hs-data-lens/distinfo +++ math/hs-data-lens/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623374 -SHA256 (cabal/data-lens-2.11.1.tar.gz) = fbbe0bb7d754fa9bced7c89a0629146618ab204cbe7a7ea26b1fa9746ac73c32 -SIZE (cabal/data-lens-2.11.1.tar.gz) = 6208 +TIMESTAMP = 1545835321 +SHA256 (cabal/data-lens-2.11.2.tar.gz) = 5d81364318876f83a4f096a4f9d22695e18042d14114f0f9cce0497cc6ed7988 +SIZE (cabal/data-lens-2.11.2.tar.gz) = 6244 Index: math/hs-data-lens/files/patch-data-lens.cabal =================================================================== --- math/hs-data-lens/files/patch-data-lens.cabal +++ math/hs-data-lens/files/patch-data-lens.cabal @@ -1,11 +1,13 @@ ---- data-lens.cabal.orig 2017-07-10 16:11:36 UTC +--- data-lens.cabal.orig 2018-01-01 04:21:32 UTC +++ data-lens.cabal -@@ -23,7 +23,7 @@ library +@@ -22,8 +22,8 @@ library + build-depends: base >= 4 && < 5, comonad >= 4.0 && < 5.1, - containers >= 0.3 && < 0.6, -- semigroupoids >= 4.0 && < 5.2, -+ semigroupoids >= 4.0 && < 5.3, +- containers >= 0.3 && < 0.6, +- semigroupoids >= 4.0 && < 5.3, ++ containers >= 0.3 && < 0.7, ++ semigroupoids >= 4.0 && < 5.4, transformers >= 0.4 && < 0.6 extensions: CPP Index: math/hs-dense-linear-algebra/Makefile =================================================================== --- /dev/null +++ math/hs-dense-linear-algebra/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= dense-linear-algebra +PORTVERSION= 0.1.0.0 +CATEGORIES= math haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Simple and incomplete pure haskell implementation of linear algebra + +LICENSE= BSD3CLAUSE + +USE_CABAL= math-functions vector-algorithms vector-binary-instances + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include Index: math/hs-dense-linear-algebra/distinfo =================================================================== --- /dev/null +++ math/hs-dense-linear-algebra/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546093924 +SHA256 (cabal/dense-linear-algebra-0.1.0.0.tar.gz) = f7777a7931b40332ebbc716f64abb63697cbab0128e5c1228d47760c5597f2d4 +SIZE (cabal/dense-linear-algebra-0.1.0.0.tar.gz) = 6285 Index: math/hs-dense-linear-algebra/pkg-descr =================================================================== --- /dev/null +++ math/hs-dense-linear-algebra/pkg-descr @@ -0,0 +1,3 @@ +This library is simply collection of linear-algebra related modules split from statistics library. + +WWW: https://github.com/bos/statistics \ No newline at end of file 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.1 -PORTREVISION= 1 +PORTVERSION= 1.0.2.2 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 = 1523429156 -SHA256 (cabal/integer-logarithms-1.0.2.1.tar.gz) = 32ad4a482a60ec957d1af1268952e2a6b382b67438c14f74f6c2aef2e49b48f2 -SIZE (cabal/integer-logarithms-1.0.2.1.tar.gz) = 8781 +TIMESTAMP = 1545492748 +SHA256 (cabal/integer-logarithms-1.0.2.2.tar.gz) = ba86628d5c14f31fddccea86eeec122ed992af28d5b7ad964b2f5487605e7fc3 +SIZE (cabal/integer-logarithms-1.0.2.2.tar.gz) = 8855 Index: math/hs-kan-extensions/Makefile =================================================================== --- math/hs-kan-extensions/Makefile +++ math/hs-kan-extensions/Makefile @@ -2,7 +2,7 @@ PORTNAME= kan-extensions PORTVERSION= 5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= adjunctions comonad contravariant distributive free mtl \ - semigroupoids tagged +USE_CABAL= adjunctions comonad distributive free mtl semigroupoids tagged .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include 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,8 +1,12 @@ ---- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC +--- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC +++ kan-extensions.cabal -@@ -57,7 +57,6 @@ library - containers >= 0.4 && < 0.6, - contravariant >= 1 && < 2, +@@ -54,10 +54,8 @@ library + array >= 0.3.0.2 && < 0.6, + base >= 4.4 && < 5, + comonad >= 4 && < 6, +- containers >= 0.4 && < 0.6, +- contravariant >= 1 && < 2, ++ containers >= 0.4 && < 0.7, distributive >= 0.2.2 && < 1, - fail >= 4.9 && < 5, free >= 4 && < 6, Index: math/hs-math-functions/Makefile =================================================================== --- math/hs-math-functions/Makefile +++ math/hs-math-functions/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= math-functions -PORTVERSION= 0.2.1.0 -PORTREVISION= 3 +PORTVERSION= 0.3.1.0 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE -USE_CABAL= primitive vector vector-th-unbox +USE_CABAL= data-default-class primitive vector vector-th-unbox .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: math/hs-math-functions/distinfo =================================================================== --- math/hs-math-functions/distinfo +++ math/hs-math-functions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499614804 -SHA256 (cabal/math-functions-0.2.1.0.tar.gz) = f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb -SIZE (cabal/math-functions-0.2.1.0.tar.gz) = 40272 +TIMESTAMP = 1546104045 +SHA256 (cabal/math-functions-0.3.1.0.tar.gz) = 3340ebec0ab91444f86ce3f785db920b8acfd5fbad70d38abcb02b77ac0f6655 +SIZE (cabal/math-functions-0.3.1.0.tar.gz) = 41822 Index: math/hs-pointed/Makefile =================================================================== --- math/hs-pointed/Makefile +++ math/hs-pointed/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pointed -PORTVERSION= 5 -PORTREVISION= 3 +PORTVERSION= 5.0.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-pointed/distinfo =================================================================== --- math/hs-pointed/distinfo +++ math/hs-pointed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499623377 -SHA256 (cabal/pointed-5.tar.gz) = 8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17 -SIZE (cabal/pointed-5.tar.gz) = 4873 +TIMESTAMP = 1545753017 +SHA256 (cabal/pointed-5.0.1.tar.gz) = b94635a5c8779238501a9156015422ce2fb4d5efd45d68999e8cbe2ecc5121dd +SIZE (cabal/pointed-5.0.1.tar.gz) = 7020 Index: math/hs-pointed/files/patch-git_55eab0 =================================================================== --- math/hs-pointed/files/patch-git_55eab0 +++ /dev/null @@ -1,22 +0,0 @@ -From 55eab00abddefc8b0d9bb2b8c40940e8dfbb0391 Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus -Date: Sun, 29 May 2016 17:40:00 +0300 -Subject: [PATCH] Allow data-default-class-0.1.0 - ---- - pointed.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pointed.cabal b/pointed.cabal -index 96abe75..9ec3f14 100644 ---- pointed.cabal -+++ pointed.cabal -@@ -61,7 +61,7 @@ flag unordered-containers - - library - build-depends: base >= 4 && < 5, -- data-default-class >= 0.0.1 && < 0.1 -+ data-default-class >= 0.0.1 && < 0.2 - - if flag(comonad) - build-depends: comonad >= 5 && < 6 Index: math/hs-pointed/files/patch-pointed.cabal =================================================================== --- /dev/null +++ math/hs-pointed/files/patch-pointed.cabal @@ -0,0 +1,19 @@ +--- pointed.cabal.orig 2018-01-22 16:20:10 UTC ++++ pointed.cabal +@@ -80,7 +80,6 @@ library + build-depends: comonad >= 5 && < 6 + + if flag(containers) +- build-depends: containers >= 0.4 && < 0.6 + + if flag(kan-extensions) + build-depends: kan-extensions >= 5 && < 6 +@@ -92,7 +91,7 @@ library + build-depends: semigroups >= 0.8.3.1 && < 1 + + if flag(stm) +- build-depends: stm >= 2.1.2.1 && < 2.5 ++ build-depends: stm >= 2.1.2.1 && < 2.6 + + if flag(tagged) + build-depends: tagged >= 0.5 && < 1 Index: math/hs-probability/Makefile =================================================================== --- math/hs-probability/Makefile +++ math/hs-probability/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= probability -PORTVERSION= 0.2.5.1 -PORTREVISION= 3 +PORTVERSION= 0.2.5.2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org Index: math/hs-probability/distinfo =================================================================== --- math/hs-probability/distinfo +++ math/hs-probability/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499450528 -SHA256 (cabal/probability-0.2.5.1.tar.gz) = d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d -SIZE (cabal/probability-0.2.5.1.tar.gz) = 27278 +TIMESTAMP = 1545562979 +SHA256 (cabal/probability-0.2.5.2.tar.gz) = 0f2b8c734eca6b079109948a28d85733543d5cea1dea2d5a1369f52ffc4a3415 +SIZE (cabal/probability-0.2.5.2.tar.gz) = 27285 Index: math/hs-semigroupoids/Makefile =================================================================== --- math/hs-semigroupoids/Makefile +++ math/hs-semigroupoids/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= semigroupoids -PORTVERSION= 5.2.2 -PORTREVISION= 1 +PORTVERSION= 5.3.1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ LICENSE= BSD3CLAUSE USE_CABAL= base-orphans>=0.3 bifunctors>=5.0 comonad>=4.2.6 \ - contravariant>=0.2.0.1 distributive>=0.2.2 \ - semigroups>=0.8.3.1 tagged>=0.7.3 transformers-compat>=0.3 + distributive>=0.2.2 semigroups>=0.8.3.1 tagged>=0.7.3 \ + transformers-compat>=0.3 FLAGS_ENABLE= containers contravariant distributive comonad tagged FLAGS_DISABLE= doctests Index: math/hs-semigroupoids/distinfo =================================================================== --- math/hs-semigroupoids/distinfo +++ math/hs-semigroupoids/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523816690 -SHA256 (cabal/semigroupoids-5.2.2.tar.gz) = e4def54834cda65ac1e74e6f12a435410e19c1348e820434a30c491c8937299e -SIZE (cabal/semigroupoids-5.2.2.tar.gz) = 23800 +TIMESTAMP = 1545676425 +SHA256 (cabal/semigroupoids-5.3.1.tar.gz) = cd89ec61f86260997c79c09bacb7d6c18031375bc3e5467b36f7cb812793388e +SIZE (cabal/semigroupoids-5.3.1.tar.gz) = 25327 Index: math/hs-semigroupoids/files/patch-semigroupoids.cabal =================================================================== --- /dev/null +++ math/hs-semigroupoids/files/patch-semigroupoids.cabal @@ -0,0 +1,11 @@ +--- semigroupoids.cabal.orig 2018-07-02 18:08:27 UTC ++++ semigroupoids.cabal +@@ -155,7 +155,7 @@ library + build-depends: containers >= 0.3 && < 0.7 + + if flag(contravariant) +- build-depends: contravariant >= 0.2.0.1 && < 2 ++ + + if flag(distributive) + build-depends: distributive >= 0.2.2 && < 1 Index: math/hs-statistics/Makefile =================================================================== --- math/hs-statistics/Makefile +++ math/hs-statistics/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= statistics -PORTVERSION= 0.14.0.2 -PORTREVISION= 3 +PORTVERSION= 0.15.0.0 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= aeson>=0.6.0.0 base-orphans erf math-functions>=0.1.5.2 monad-par>=0.3.4 \ +USE_CABAL= aeson>=0.6.0.0 base-orphans data-default-class dense-linear-algebra \ + erf math-functions>=0.1.5.2 math-functions monad-par>=0.3.4 \ mwc-random>=0.13.0.0 primitive>=0.3 vector>=0.10 \ vector-algorithms>=0.4 vector-binary-instances>=0.2.1 vector-th-unbox Index: math/hs-statistics/distinfo =================================================================== --- math/hs-statistics/distinfo +++ math/hs-statistics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499614825 -SHA256 (cabal/statistics-0.14.0.2.tar.gz) = 3495df2da42c9fcc5b594b97f16c02353bfd6616d6e134ac031dac389d7a4778 -SIZE (cabal/statistics-0.14.0.2.tar.gz) = 99683 +TIMESTAMP = 1545846937 +SHA256 (cabal/statistics-0.15.0.0.tar.gz) = 95e9c45c95e81a35c7bd7443e8d6626fd100505a567de47622185fe9c8be6472 +SIZE (cabal/statistics-0.15.0.0.tar.gz) = 97390 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.13 -PORTREVISION= 1 +PORTVERSION= 0.15 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 = 1524638503 -SHA256 (cabal/vector-space-0.13.tar.gz) = 0291d5778378acbbb1d6709ba57238f3d6ad551b8b2c6ca2b8177e68f748d617 -SIZE (cabal/vector-space-0.13.tar.gz) = 16121 +TIMESTAMP = 1545675645 +SHA256 (cabal/vector-space-0.15.tar.gz) = 6849b443dbb246fa39ac8dc645cc364ce63bd91fb0761ad759eea10eeca25c0f +SIZE (cabal/vector-space-0.15.tar.gz) = 16078 Index: net/hs-bsb-http-chunked/Makefile =================================================================== --- net/hs-bsb-http-chunked/Makefile +++ net/hs-bsb-http-chunked/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bsb-http-chunked -PORTVERSION= 0.0.0.2 -PORTREVISION= 1 +PORTVERSION= 0.0.0.4 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org Index: net/hs-bsb-http-chunked/distinfo =================================================================== --- net/hs-bsb-http-chunked/distinfo +++ net/hs-bsb-http-chunked/distinfo @@ -1,3 +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 +TIMESTAMP = 1545495255 +SHA256 (cabal/bsb-http-chunked-0.0.0.4.tar.gz) = 148309e23eb8b261c1de374712372d62d8c8dc8ee504c392809c7ec33c0a0e7c +SIZE (cabal/bsb-http-chunked-0.0.0.4.tar.gz) = 6630 Index: net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal =================================================================== --- net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 Index: net/hs-resolv/Makefile =================================================================== --- net/hs-resolv/Makefile +++ net/hs-resolv/Makefile @@ -2,7 +2,7 @@ PORTNAME= resolv PORTVERSION= 0.1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org Index: net/hs-resolv/files/patch-resolv.cabal =================================================================== --- net/hs-resolv/files/patch-resolv.cabal +++ net/hs-resolv/files/patch-resolv.cabal @@ -1,11 +1,16 @@ ---- resolv.cabal.orig 2018-04-09 19:24:44 UTC +--- resolv.cabal.orig 2017-10-26 22:24:39 UTC +++ resolv.cabal -@@ -78,7 +78,7 @@ library +@@ -78,11 +78,11 @@ library Network.DNS.FFI Compat - build-depends: base >= 4.5 && <4.11 -+ build-depends: base >= 4.5 && <4.12 ++ build-depends: base >= 4.5 && <4.13 , base16-bytestring == 0.1.* , binary >= 0.7.3 && < 0.9 , bytestring >= 0.9.2 && < 0.11 +- , containers >= 0.4.2.1 && < 0.6 ++ , containers >= 0.4.2.1 && < 0.7 + + ghc-options: -Wall + include-dirs: cbits Index: ports-mgmt/hs-porte/Makefile =================================================================== --- ports-mgmt/hs-porte/Makefile +++ ports-mgmt/hs-porte/Makefile @@ -11,6 +11,10 @@ LICENSE= BSD3CLAUSE +DEPRECATED= No updates since 2010 +BROKEN= Doesn't build with newest GHC +EXPIRATION_DATE=31.01.2019 + USE_CABAL= extensible-exceptions stringsearch EXECUTABLE= porte Index: security/hs-cipher-aes128/Makefile =================================================================== --- security/hs-cipher-aes128/Makefile +++ security/hs-cipher-aes128/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cipher-aes128 -PORTVERSION= 0.7.0.3 -PORTREVISION= 3 +PORTVERSION= 0.7.0.4 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-cipher-aes128/distinfo =================================================================== --- security/hs-cipher-aes128/distinfo +++ security/hs-cipher-aes128/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624169 -SHA256 (cabal/cipher-aes128-0.7.0.3.tar.gz) = 6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a -SIZE (cabal/cipher-aes128-0.7.0.3.tar.gz) = 25276 +TIMESTAMP = 1545659725 +SHA256 (cabal/cipher-aes128-0.7.0.4.tar.gz) = cd8d8987c1a1839f3c66e655277981083be85489d34b6b47f95d7e82d2d10285 +SIZE (cabal/cipher-aes128-0.7.0.4.tar.gz) = 26294 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= 3 +PORTREVISION= 4 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal =================================================================== --- security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal +++ security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal @@ -5,7 +5,7 @@ library default-language: Haskell2010 - build-depends: base >= 4.5 && < 4.10 -+ build-depends: base >= 4.5 && < 4.12 ++ build-depends: base >= 4.5 && < 4.13 , bytestring >= 0.9.2 && < 0.11 hs-source-dirs: src Index: security/hs-cryptohash-sha1/Makefile =================================================================== --- security/hs-cryptohash-sha1/Makefile +++ security/hs-cryptohash-sha1/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-sha1 PORTVERSION= 0.11.100.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal =================================================================== --- security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal +++ security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal @@ -5,7 +5,7 @@ library default-language: Haskell2010 - build-depends: base >= 4.5 && < 4.10 -+ build-depends: base >= 4.5 && < 4.12 ++ build-depends: base >= 4.5 && < 4.13 , bytestring >= 0.9.2 && < 0.11 hs-source-dirs: src Index: security/hs-cryptohash-sha256/Makefile =================================================================== --- security/hs-cryptohash-sha256/Makefile +++ security/hs-cryptohash-sha256/Makefile @@ -2,7 +2,7 @@ PORTNAME= cryptohash-sha256 PORTVERSION= 0.11.101.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal =================================================================== --- security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal +++ security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal @@ -5,7 +5,7 @@ Unsafe - build-depends: base >= 4.5 && < 4.11 -+ build-depends: base >= 4.5 && < 4.12 ++ build-depends: base >= 4.5 && < 4.13 , bytestring >= 0.9.2 && < 0.11 ghc-options: -Wall Index: security/hs-entropy/Makefile =================================================================== --- security/hs-entropy/Makefile +++ security/hs-entropy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= entropy -PORTVERSION= 0.3.8 -PORTREVISION= 3 +PORTVERSION= 0.4.1.4 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-entropy/distinfo =================================================================== --- security/hs-entropy/distinfo +++ security/hs-entropy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538619 -SHA256 (cabal/entropy-0.3.8.tar.gz) = 743a49d5e17ae9d6118ff077f2cd2d5944c0ea6cff501efeec95b68d5f7474d0 -SIZE (cabal/entropy-0.3.8.tar.gz) = 6573 +TIMESTAMP = 1545494256 +SHA256 (cabal/entropy-0.4.1.4.tar.gz) = 2e3f6a65c8fde3551a8fb03b0a519b718762fc3278b1a5750f96d399e821eeb9 +SIZE (cabal/entropy-0.4.1.4.tar.gz) = 7361 Index: security/hs-hackage-security/Makefile =================================================================== --- security/hs-hackage-security/Makefile +++ security/hs-hackage-security/Makefile @@ -2,7 +2,7 @@ PORTNAME= hackage-security PORTVERSION= 0.5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org Index: security/hs-hackage-security/files/patch-hackage-security.cabal =================================================================== --- /dev/null +++ security/hs-hackage-security/files/patch-hackage-security.cabal @@ -0,0 +1,18 @@ +--- hackage-security.cabal.orig 2018-03-25 23:39:07 UTC ++++ hackage-security.cabal +@@ -98,12 +98,12 @@ library + Hackage.Security.Util.TypedEmbedded + Prelude + -- We support ghc 7.4 (bundled with Cabal 1.14) and up +- build-depends: base >= 4.5 && < 4.12, ++ build-depends: base >= 4.5 && < 4.13, + base16-bytestring >= 0.1.1 && < 0.2, + base64-bytestring >= 1.0 && < 1.1, + bytestring >= 0.9 && < 0.11, +- Cabal >= 1.14 && < 2.4, +- containers >= 0.4 && < 0.6, ++ Cabal >= 1.14 && < 2.6, ++ containers >= 0.4 && < 0.7, + ed25519 >= 0.0 && < 0.1, + filepath >= 1.2 && < 1.5, + mtl >= 2.2 && < 2.3, Index: sysutils/hs-angel/Makefile =================================================================== --- sysutils/hs-angel/Makefile +++ sysutils/hs-angel/Makefile @@ -10,6 +10,10 @@ LICENSE= BSD3CLAUSE +DEPRECATED= No releases since 2016 +BROKEN= Doesn't build with recent GHC +EXPIRATION_DATE=31.01.2019 + USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \ unordered-containers>=0.1.4 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.4 -PORTREVISION= 1 +PORTVERSION= 0.1.1.6 CATEGORIES= sysutils haskell MAINTAINER= haskell@FreeBSD.org Index: sysutils/hs-ekg-core/distinfo =================================================================== --- sysutils/hs-ekg-core/distinfo +++ sysutils/hs-ekg-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523637800 -SHA256 (cabal/ekg-core-0.1.1.4.tar.gz) = 66d89acca05c1c91dc57a9c4b3f62d25ccd0c04bb2bfd46d5947f9b8cd8ee937 -SIZE (cabal/ekg-core-0.1.1.4.tar.gz) = 13252 +TIMESTAMP = 1545657937 +SHA256 (cabal/ekg-core-0.1.1.6.tar.gz) = 66a8dd79ad27659052168f08dd41fabb8593e364de00fb857ef5cc943acd5742 +SIZE (cabal/ekg-core-0.1.1.6.tar.gz) = 13454 Index: sysutils/hs-ekg-core/files/patch-ekg-core.cabal =================================================================== --- sysutils/hs-ekg-core/files/patch-ekg-core.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 Index: sysutils/hs-ekg-json/Makefile =================================================================== --- sysutils/hs-ekg-json/Makefile +++ sysutils/hs-ekg-json/Makefile @@ -10,6 +10,9 @@ LICENSE= BSD3CLAUSE +BROKEN= Doesn't build with newest Haskell libraries +EXPIRATION_DATE=31.01.2018 + USE_CABAL= aeson ekg-core>=0.1 unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" Index: sysutils/hs-ekg-json/files/patch-ekg-json.cabal =================================================================== --- sysutils/hs-ekg-json/files/patch-ekg-json.cabal +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 Index: textproc/Makefile =================================================================== --- textproc/Makefile +++ textproc/Makefile @@ -253,6 +253,7 @@ SUBDIR += hr-aspell SUBDIR += hs-Diff SUBDIR += hs-HStringTemplate + SUBDIR += hs-HsYAML SUBDIR += hs-appar SUBDIR += hs-attoparsec SUBDIR += hs-attoparsec-iso8601 @@ -280,6 +281,7 @@ SUBDIR += hs-lhs2tex SUBDIR += hs-libxml SUBDIR += hs-libxml-sax + SUBDIR += hs-libyaml SUBDIR += hs-magic SUBDIR += hs-pandoc SUBDIR += hs-pandoc-citeproc @@ -303,6 +305,7 @@ SUBDIR += hs-tagsoup SUBDIR += hs-tagstream-conduit SUBDIR += hs-texmath + SUBDIR += hs-unicode-transforms SUBDIR += hs-uri SUBDIR += hs-uri-bytestring SUBDIR += hs-uri-bytestring-aeson Index: textproc/hs-HsYAML/Makefile =================================================================== --- textproc/hs-HsYAML/Makefile +++ textproc/hs-HsYAML/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= rfc5051 -PORTVERSION= 0.1.0.3 -PORTREVISION= 4 +PORTNAME= HsYAML +PORTVERSION= 0.1.1.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Simple unicode collation as per RFC5051 +COMMENT= Pure Haskell YAML 1.2 parser -LICENSE= BSD3CLAUSE +LICENSE= GPLv2 + +USE_CABAL= dlist .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-HsYAML/distinfo =================================================================== --- /dev/null +++ textproc/hs-HsYAML/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546098464 +SHA256 (cabal/HsYAML-0.1.1.2.tar.gz) = 5d429433df990bf9b93f9edb3b6d5778bdf0a1bdbfbe36302236eed5fdf70084 +SIZE (cabal/HsYAML-0.1.1.2.tar.gz) = 60789 Index: textproc/hs-HsYAML/files/patch-HsYAML.cabal =================================================================== --- /dev/null +++ textproc/hs-HsYAML/files/patch-HsYAML.cabal @@ -0,0 +1,15 @@ +--- HsYAML.cabal.orig 2018-06-30 12:49:02 UTC ++++ HsYAML.cabal +@@ -65,10 +65,10 @@ library + Trustworthy + TypeSynonymInstances + +- build-depends: base >=4.5 && <4.12 ++ build-depends: base >=4.5 && <4.13 + , bytestring >=0.9 && <0.11 + , dlist >=0.8 && <0.9 +- , containers >=0.4.2 && <0.6 ++ , containers >=0.4.2 && <0.7 + , text >=1.2.3 && <1.3 + , mtl >=2.2.1 && <2.3 + , parsec >=3.1.13.0 && < 3.2 Index: textproc/hs-HsYAML/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-HsYAML/pkg-descr @@ -0,0 +1,6 @@ +HsYAML is a YAML 1.2 parser implementation for Haskell. Features of HsYAML include +pure Haskell implementation with small dependency footprint and emphasis on +strict compliance with the YAML 1.2 specification; direct decoding to native +Haskell types via (aeson-inspired) typeclass-based API. + +WWW: https://github.com/hvr/HsYAML \ No newline at end of file Index: textproc/hs-attoparsec-iso8601/Makefile =================================================================== --- textproc/hs-attoparsec-iso8601/Makefile +++ textproc/hs-attoparsec-iso8601/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= attoparsec-iso8601 -PORTVERSION= 1.0.0.0 -PORTREVISION= 3 +PORTVERSION= 1.0.1.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-attoparsec-iso8601/distinfo =================================================================== --- textproc/hs-attoparsec-iso8601/distinfo +++ textproc/hs-attoparsec-iso8601/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499622155 -SHA256 (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = aa6c6d87587383e386cb85e7ffcc4a6317aa8dafb8ba9a104ecac365ce2a858a -SIZE (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = 4188 +TIMESTAMP = 1545832395 +SHA256 (cabal/attoparsec-iso8601-1.0.1.0.tar.gz) = 499ffbd2d39e79cc4fda5ad0129dbf94fdb72a84aa932dfe2a5f5c5c02074142 +SIZE (cabal/attoparsec-iso8601-1.0.1.0.tar.gz) = 4317 Index: textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal =================================================================== --- textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-blaze-markup/Makefile =================================================================== --- textproc/hs-blaze-markup/Makefile +++ textproc/hs-blaze-markup/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-markup -PORTVERSION= 0.8.2.1 -PORTREVISION= 1 +PORTVERSION= 0.8.2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-blaze-markup/distinfo =================================================================== --- textproc/hs-blaze-markup/distinfo +++ textproc/hs-blaze-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523696236 -SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146 -SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320 +TIMESTAMP = 1545494364 +SHA256 (cabal/blaze-markup-0.8.2.2.tar.gz) = c6f0cf8fd707ba8c0b700e0c5ad6a1212c8b57d46a9cbdfb904d8bf585ad82e1 +SIZE (cabal/blaze-markup-0.8.2.2.tar.gz) = 14458 Index: textproc/hs-cassava/Makefile =================================================================== --- textproc/hs-cassava/Makefile +++ textproc/hs-cassava/Makefile @@ -2,7 +2,7 @@ PORTNAME= cassava PORTVERSION= 0.5.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-cassava/files/patch-cassava.cabal =================================================================== --- /dev/null +++ textproc/hs-cassava/files/patch-cassava.cabal @@ -0,0 +1,11 @@ +--- cassava.cabal.orig 2017-08-12 16:05:04 UTC ++++ cassava.cabal +@@ -96,7 +96,7 @@ Library + attoparsec >= 0.11.3.0 && < 0.14, + base >= 4.5 && < 5, + bytestring >= 0.9.2 && < 0.11, +- containers >= 0.4.2 && < 0.6, ++ containers >= 0.4.2 && < 0.7, + deepseq >= 1.1 && < 1.5, + hashable < 1.3, + scientific >= 0.3.4.7 && < 0.4, Index: textproc/hs-feed/Makefile =================================================================== --- textproc/hs-feed/Makefile +++ textproc/hs-feed/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= feed -PORTVERSION= 1.0.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-feed/distinfo =================================================================== --- textproc/hs-feed/distinfo +++ textproc/hs-feed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523695585 -SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17 -SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936 +TIMESTAMP = 1545834803 +SHA256 (cabal/feed-1.0.1.0.tar.gz) = 87bd055b13c43f54e997f716a33d647c6bc1cdb78337c840d144c0b5fdccd31c +SIZE (cabal/feed-1.0.1.0.tar.gz) = 105930 Index: textproc/hs-feed/files/patch-feed.cabal =================================================================== --- textproc/hs-feed/files/patch-feed.cabal +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 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= 6.2.0.1 -PORTREVISION= 1 +PORTVERSION= 6.7.0.0 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 = 1525094674 -SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630 -SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725 +TIMESTAMP = 1546341547 +SHA256 (cabal/hs-bibutils-6.7.0.0.tar.gz) = c5d205294ff372306504b03c4334fd96215727087ee4ee1378a45273a8d6dee1 +SIZE (cabal/hs-bibutils-6.7.0.0.tar.gz) = 742250 Index: textproc/hs-lhs2tex/Makefile =================================================================== --- textproc/hs-lhs2tex/Makefile +++ textproc/hs-lhs2tex/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lhs2tex -PORTVERSION= 1.20 -PORTREVISION= 1 +PORTVERSION= 1.22 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 = 1524639224 -SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a -SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326 +TIMESTAMP = 1545563352 +SHA256 (cabal/lhs2tex-1.22.tar.gz) = 7eea3b5b4bae019aa9acb6036e6c2606c62a0d9969a081d4b9b9f04baa3129bd +SIZE (cabal/lhs2tex-1.22.tar.gz) = 679988 Index: textproc/hs-lhs2tex/files/patch-src_Document.lhs =================================================================== --- textproc/hs-lhs2tex/files/patch-src_Document.lhs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_Main.lhs +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_Math.lhs +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_NewCode.lhs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 =================================================================== --- textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-libyaml/Makefile =================================================================== --- textproc/hs-libyaml/Makefile +++ textproc/hs-libyaml/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= rfc5051 -PORTVERSION= 0.1.0.3 -PORTREVISION= 4 +PORTNAME= libyaml +PORTVERSION= 0.1.0.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Simple unicode collation as per RFC5051 +COMMENT= Low-level, streaming YAML interface LICENSE= BSD3CLAUSE +USE_CABAL= conduit resourcet + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-libyaml/distinfo =================================================================== --- /dev/null +++ textproc/hs-libyaml/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546195286 +SHA256 (cabal/libyaml-0.1.0.0.tar.gz) = 9cd688e316938d8a80536cb1b329c4b651c845e34e045b0c443b345580fb6f07 +SIZE (cabal/libyaml-0.1.0.0.tar.gz) = 62557 Index: textproc/hs-libyaml/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-libyaml/pkg-descr @@ -0,0 +1,5 @@ +This package provides a haskell wrapper over the libyaml C library +version 0.2.1 by Kirill Simonov. It contains the C source so you don’t need to +worry about any non-Haskell dependencies. + +WWW: https://github.com/snoyberg/yaml \ No newline at end of file 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.14.3.1 -PORTREVISION= 1 +PORTVERSION= 0.15.0.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-pandoc-citeproc/distinfo =================================================================== --- textproc/hs-pandoc-citeproc/distinfo +++ textproc/hs-pandoc-citeproc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525014746 -SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a -SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846 +TIMESTAMP = 1546182397 +SHA256 (cabal/pandoc-citeproc-0.15.0.1.tar.gz) = 29db5f2aad3225859727271855461724574f3695ab3856ceac33b24a55ae92f8 +SIZE (cabal/pandoc-citeproc-0.15.0.1.tar.gz) = 325491 Index: textproc/hs-pandoc-types/Makefile =================================================================== --- textproc/hs-pandoc-types/Makefile +++ textproc/hs-pandoc-types/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandoc-types -PORTVERSION= 1.17.4.2 -PORTREVISION= 1 +PORTVERSION= 1.17.5.4 PORTEPOCH= 1 CATEGORIES= textproc haskell Index: textproc/hs-pandoc-types/distinfo =================================================================== --- textproc/hs-pandoc-types/distinfo +++ textproc/hs-pandoc-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524405363 -SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca -SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035 +TIMESTAMP = 1546097979 +SHA256 (cabal/pandoc-types-1.17.5.4.tar.gz) = 32aca86c510bd23c6bd54ce1a37ca005f4b84f077ab8e835a522833cf5179327 +SIZE (cabal/pandoc-types-1.17.5.4.tar.gz) = 26080 Index: textproc/hs-pandoc/Makefile =================================================================== --- textproc/hs-pandoc/Makefile +++ textproc/hs-pandoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pandoc -PORTVERSION= 2.2 -PORTREVISION= 1 +PORTVERSION= 2.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,14 +10,14 @@ LICENSE= GPLv2 -USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \ +USE_CABAL= aeson aeson-pretty base64-bytestring blaze-html \ blaze-markup cmark cmark-gfm data-default \ deepseq-generics doctemplates extensible-exceptions \ - filemanip haddock-library \ - hslua hslua-module-text HTTP JuicyPixels mtl \ + filemanip Glob haddock-library \ + hslua hslua-module-text HsYAML HTTP JuicyPixels mtl \ network network-uri pandoc-types \ random scientific SHA skylighting syb tagsoup\ - temporary texmath \ + temporary texmath unicode-transforms \ unordered-containers vector xml \ yaml zip-archive zlib Index: textproc/hs-pandoc/distinfo =================================================================== --- textproc/hs-pandoc/distinfo +++ textproc/hs-pandoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524940319 -SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569 -SIZE (cabal/pandoc-2.2.tar.gz) = 8995928 +TIMESTAMP = 1546095746 +SHA256 (cabal/pandoc-2.5.tar.gz) = d57dc5db78a0a304de70436fe59a7599ab0c6d0fb2ab6704eeae498a4536222e +SIZE (cabal/pandoc-2.5.tar.gz) = 9550372 Index: textproc/hs-pandoc/files/patch-pandoc.cabal =================================================================== --- /dev/null +++ textproc/hs-pandoc/files/patch-pandoc.cabal @@ -0,0 +1,32 @@ +--- pandoc.cabal.orig 2018-11-27 17:33:51 UTC ++++ pandoc.cabal +@@ -364,7 +364,7 @@ library + text >= 1.1.1.0 && < 1.3, + time >= 1.5 && < 1.10, + safe >= 0.3 && < 0.4, +- zip-archive >= 0.2.3.4 && < 0.4, ++ zip-archive >= 0.2.3.4 && < 0.5, + HTTP >= 4000.0.5 && < 4000.4, + texmath >= 0.11 && < 0.12, + xml >= 1.3.12 && < 1.4, +@@ -389,7 +389,7 @@ library + haddock-library >= 1.7 && < 1.8, + deepseq >= 1.3 && < 1.5, + JuicyPixels >= 3.1.6.1 && < 3.4, +- Glob >= 0.7 && < 0.10, ++ Glob >= 0.7 && < 0.11, + cmark-gfm >= 0.1.1 && < 0.2, + doctemplates >= 0.2.1 && < 0.3, + network-uri >= 2.6 && < 2.7, +@@ -658,9 +658,9 @@ test-suite test-pandoc + QuickCheck >= 2.4 && < 2.13, + containers >= 0.4.2.1 && < 0.7, + executable-path >= 0.0 && < 0.1, +- zip-archive >= 0.2.3.4 && < 0.4, ++ zip-archive >= 0.2.3.4 && < 0.5, + xml >= 1.3.12 && < 1.4, +- Glob >= 0.7 && < 0.10 ++ Glob >= 0.7 && < 0.11 + if impl(ghc < 8.0) + build-depends: semigroups == 0.18.* + if impl(ghc < 8.4) Index: textproc/hs-polyparse/Makefile =================================================================== --- textproc/hs-polyparse/Makefile +++ textproc/hs-polyparse/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= polyparse -PORTVERSION= 1.12 -PORTREVISION= 3 +PORTVERSION= 1.12.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-polyparse/distinfo =================================================================== --- textproc/hs-polyparse/distinfo +++ textproc/hs-polyparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543355 -SHA256 (cabal/polyparse-1.12.tar.gz) = f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15 -SIZE (cabal/polyparse-1.12.tar.gz) = 32625 +TIMESTAMP = 1545492975 +SHA256 (cabal/polyparse-1.12.1.tar.gz) = dd8d34e05853ea0ab9b9fee1cbaa51ae33095f7c0c09ff539dcd6d771e0adaa5 +SIZE (cabal/polyparse-1.12.1.tar.gz) = 33060 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.3 -PORTREVISION= 1 +PORTVERSION= 1.2.3.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-regex-tdfa/distinfo =================================================================== --- textproc/hs-regex-tdfa/distinfo +++ textproc/hs-regex-tdfa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523955154 -SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9 -SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268 +TIMESTAMP = 1545554836 +SHA256 (cabal/regex-tdfa-1.2.3.1.tar.gz) = 8aaaeeecf050807c7c514d4dd1763ac63bd121782de5a0847bef5d48a095ea50 +SIZE (cabal/regex-tdfa-1.2.3.1.tar.gz) = 66397 Index: textproc/hs-rfc5051/Makefile =================================================================== --- textproc/hs-rfc5051/Makefile +++ textproc/hs-rfc5051/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rfc5051 -PORTVERSION= 0.1.0.3 -PORTREVISION= 4 +PORTVERSION= 0.1.0.4 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-rfc5051/distinfo =================================================================== --- textproc/hs-rfc5051/distinfo +++ textproc/hs-rfc5051/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624838 -SHA256 (cabal/rfc5051-0.1.0.3.tar.gz) = e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b -SIZE (cabal/rfc5051-0.1.0.3.tar.gz) = 217935 +TIMESTAMP = 1545561512 +SHA256 (cabal/rfc5051-0.1.0.4.tar.gz) = 615daa230eabc781eff1d3ce94c42fc5ba6188dbeb115a233328454b02c1b3d3 +SIZE (cabal/rfc5051-0.1.0.4.tar.gz) = 218105 Index: textproc/hs-skylighting-core/Makefile =================================================================== --- textproc/hs-skylighting-core/Makefile +++ textproc/hs-skylighting-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= skylighting-core -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-skylighting-core/distinfo =================================================================== --- textproc/hs-skylighting-core/distinfo +++ textproc/hs-skylighting-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524848800 -SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e -SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965 +TIMESTAMP = 1546103880 +SHA256 (cabal/skylighting-core-0.7.5.tar.gz) = f706a2eb5d37d1323525d9c4944da2ad8d29c1ccf7d0ae7b433695d981413889 +SIZE (cabal/skylighting-core-0.7.5.tar.gz) = 599065 Index: textproc/hs-skylighting/Makefile =================================================================== --- textproc/hs-skylighting/Makefile +++ textproc/hs-skylighting/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= skylighting -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-skylighting/distinfo =================================================================== --- textproc/hs-skylighting/distinfo +++ textproc/hs-skylighting/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524846475 -SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574 -SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234 +TIMESTAMP = 1546098040 +SHA256 (cabal/skylighting-0.7.5.tar.gz) = 7de100e42e7dac3687372f85225a6d905d534f75990c5a25c6e640acf0ad1320 +SIZE (cabal/skylighting-0.7.5.tar.gz) = 555533 Index: textproc/hs-stringsearch/Makefile =================================================================== --- textproc/hs-stringsearch/Makefile +++ textproc/hs-stringsearch/Makefile @@ -3,7 +3,7 @@ PORTNAME= stringsearch PORTVERSION= 0.3.6.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-stringsearch/files/patch-stringsearch.cabal =================================================================== --- /dev/null +++ textproc/hs-stringsearch/files/patch-stringsearch.cabal @@ -0,0 +1,11 @@ +--- stringsearch.cabal.orig 2015-03-28 23:03:58 UTC ++++ stringsearch.cabal +@@ -83,7 +83,7 @@ Library + -- Packages needed in order to build this package. + if flag(base4) + Build-depends: base >= 4 && < 5, array >= 0.3 && < 0.6, +- bytestring >= 0.9 && < 1, containers >= 0.3 && < 0.6 ++ bytestring >= 0.9 && < 1, containers >= 0.3 && < 0.7 + else + if flag(base3) + Build-depends: base >= 3 && < 4, array >= 0.1 && < 0.4, Index: textproc/hs-texmath/Makefile =================================================================== --- textproc/hs-texmath/Makefile +++ textproc/hs-texmath/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= texmath -PORTVERSION= 0.10.1.2 -PORTREVISION= 1 +PORTVERSION= 0.11.1.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-texmath/distinfo =================================================================== --- textproc/hs-texmath/distinfo +++ textproc/hs-texmath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524845873 -SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821 -SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634 +TIMESTAMP = 1545834044 +SHA256 (cabal/texmath-0.11.1.2.tar.gz) = 373f1281832c0f397976eec8f94117d2e298443ae2591f64a92e734631224cf1 +SIZE (cabal/texmath-0.11.1.2.tar.gz) = 1707310 Index: textproc/hs-unicode-transforms/Makefile =================================================================== --- textproc/hs-unicode-transforms/Makefile +++ textproc/hs-unicode-transforms/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ -PORTNAME= rfc5051 -PORTVERSION= 0.1.0.3 -PORTREVISION= 4 +PORTNAME= unicode-transforms +PORTVERSION= 0.3.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Simple unicode collation as per RFC5051 +COMMENT= Unicode normalization LICENSE= BSD3CLAUSE +USE_CABAL= bitarray + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: textproc/hs-unicode-transforms/distinfo =================================================================== --- /dev/null +++ textproc/hs-unicode-transforms/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1546101707 +SHA256 (cabal/unicode-transforms-0.3.5.tar.gz) = c9f7d138ab43ed2e11de5973b0bd771c8f5c14cc0d87d3fbd1c6980c176fa03e +SIZE (cabal/unicode-transforms-0.3.5.tar.gz) = 718750 Index: textproc/hs-unicode-transforms/pkg-descr =================================================================== --- /dev/null +++ textproc/hs-unicode-transforms/pkg-descr @@ -0,0 +1,3 @@ +Fast Unicode 9.0 normalization in Haskell (NFC, NFKC, NFD, NFKD). + +WWW: https://github.com/harendra-kumar/unicode-transforms \ No newline at end of file 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.6 -PORTREVISION= 1 +PORTVERSION= 0.1.0.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-uri-bytestring-aeson/distinfo =================================================================== --- textproc/hs-uri-bytestring-aeson/distinfo +++ textproc/hs-uri-bytestring-aeson/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1545835914 +SHA256 (cabal/uri-bytestring-aeson-0.1.0.7.tar.gz) = 7e90b5eb1c65a83461e127a27ce635f2f8279eb0d0cb14823831b6dfb503ef9b +SIZE (cabal/uri-bytestring-aeson-0.1.0.7.tar.gz) = 2034 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.3.1.1 -PORTREVISION= 1 +PORTVERSION= 0.3.2.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 = 1524253203 -SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb -SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241 +TIMESTAMP = 1545680924 +SHA256 (cabal/uri-bytestring-0.3.2.1.tar.gz) = 64bd16bed1eca66d844cbc9dfb90a7ffda5b24572066765cf61b3d8d28a1c1fc +SIZE (cabal/uri-bytestring-0.3.2.1.tar.gz) = 22280 Index: textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal =================================================================== --- textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 Index: textproc/hs-xmlhtml/Makefile =================================================================== --- textproc/hs-xmlhtml/Makefile +++ textproc/hs-xmlhtml/Makefile @@ -2,7 +2,7 @@ PORTNAME= xmlhtml PORTVERSION= 0.2.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org Index: textproc/hs-xmlhtml/files/patch-xmlhtml.cabal =================================================================== --- textproc/hs-xmlhtml/files/patch-xmlhtml.cabal +++ textproc/hs-xmlhtml/files/patch-xmlhtml.cabal @@ -1,10 +1,12 @@ ---- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC +--- xmlhtml.cabal.orig 2017-11-24 19:17:43 UTC +++ xmlhtml.cabal -@@ -826,7 +826,6 @@ Library +@@ -826,8 +826,7 @@ 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, +- containers >= 0.3 && < 0.6, ++ containers >= 0.3 && < 0.7, parsec >= 3.1.2 && < 3.2, text >= 0.11 && < 1.3, + unordered-containers >= 0.1.4 && < 0.3 Index: textproc/hs-yaml/Makefile =================================================================== --- textproc/hs-yaml/Makefile +++ textproc/hs-yaml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yaml -PORTVERSION= 0.8.29 -PORTREVISION= 1 +PORTVERSION= 0.11.0.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \ - resourcet>=0.3 scientific unordered-containers vector + libyaml 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 = 1524402297 -SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74 -SIZE (cabal/yaml-0.8.29.tar.gz) = 82660 +TIMESTAMP = 1546184008 +SHA256 (cabal/yaml-0.11.0.0.tar.gz) = e66466cd29a4d256c3dd4dd4ab366033dbc5fa1fb67fdc6f7ac7aa3f161527bf +SIZE (cabal/yaml-0.11.0.0.tar.gz) = 26529 Index: www/hs-HTTP/Makefile =================================================================== --- www/hs-HTTP/Makefile +++ www/hs-HTTP/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= HTTP -PORTVERSION= 4000.3.11 -PORTREVISION= 1 +PORTVERSION= 4000.3.12 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-HTTP/distinfo =================================================================== --- www/hs-HTTP/distinfo +++ www/hs-HTTP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523302416 -SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645 -SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747 +TIMESTAMP = 1545834704 +SHA256 (cabal/HTTP-4000.3.12.tar.gz) = a3ff6a9c93771079121083f1691188fe45f84380118e0f76bc4578153c361990 +SIZE (cabal/HTTP-4000.3.12.tar.gz) = 71800 Index: www/hs-HTTP/files/patch-HTTP.cabal =================================================================== --- /dev/null +++ www/hs-HTTP/files/patch-HTTP.cabal @@ -0,0 +1,20 @@ +--- HTTP.cabal.orig 2018-06-09 15:12:09 UTC ++++ HTTP.cabal +@@ -109,7 +109,7 @@ Library + + -- note the test harness constraints should be kept in sync with these + -- where dependencies are shared +- Build-depends: base >= 4.3.0.0 && < 4.12, parsec >= 2.0 && < 3.2 ++ Build-depends: base >= 4.3.0.0 && < 4.13, parsec >= 2.0 && < 3.2 + Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.11 + Build-depends: time >= 1.1.2.3 && < 1.10 + +@@ -151,7 +151,7 @@ Test-Suite test + bytestring >= 0.9.1.5 && < 0.11, + deepseq >= 1.3.0.0 && < 1.5, + pureMD5 >= 0.2.4 && < 2.2, +- base >= 4.3.0.0 && < 4.12, ++ base >= 4.3.0.0 && < 4.13, + split >= 0.1.3 && < 0.3, + test-framework >= 0.2.0 && < 0.9, + test-framework-hunit >= 0.3.0 && <0.4 Index: www/hs-cgi/Makefile =================================================================== --- www/hs-cgi/Makefile +++ www/hs-cgi/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cgi -PORTVERSION= 3001.3.0.2 -PORTREVISION= 3 +PORTVERSION= 3001.3.0.3 PORTEPOCH= 1 CATEGORIES= www haskell Index: www/hs-cgi/distinfo =================================================================== --- www/hs-cgi/distinfo +++ www/hs-cgi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625371 -SHA256 (cabal/cgi-3001.3.0.2.tar.gz) = 92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1 -SIZE (cabal/cgi-3001.3.0.2.tar.gz) = 18008 +TIMESTAMP = 1545835086 +SHA256 (cabal/cgi-3001.3.0.3.tar.gz) = eb8144d7d0b74643c43b73c63e4d9fa88a110c4be719b9436917ca7d0d32b4e6 +SIZE (cabal/cgi-3001.3.0.3.tar.gz) = 18988 Index: www/hs-cgi/files/patch-cgi.cabal =================================================================== --- www/hs-cgi/files/patch-cgi.cabal +++ /dev/null @@ -1,16 +0,0 @@ ---- 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) 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.5.1 -PORTREVISION= 1 +PORTVERSION= 7.5.1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-happstack-server/distinfo =================================================================== --- www/hs-happstack-server/distinfo +++ www/hs-happstack-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524594391 -SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1 -SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810 +TIMESTAMP = 1545837312 +SHA256 (cabal/happstack-server-7.5.1.1.tar.gz) = 614a65dd721bfa74ff4e0090e70c4b5c7dfb1fdb6485218b4ce1c5d50509fd61 +SIZE (cabal/happstack-server-7.5.1.1.tar.gz) = 81814 Index: www/hs-happstack-server/files/patch-happstack-server.cabal =================================================================== --- /dev/null +++ www/hs-happstack-server/files/patch-happstack-server.cabal @@ -0,0 +1,11 @@ +--- happstack-server.cabal.orig 2018-06-26 15:51:43 UTC ++++ happstack-server.cabal +@@ -95,7 +95,7 @@ Library + system-filepath >= 0.3.1, + syb, + text >= 0.10 && < 1.3, +- template-haskell < 2.14, ++ template-haskell < 2.15, + time, + time-compat, + threads >= 0.5, Index: www/hs-heist/Makefile =================================================================== --- www/hs-heist/Makefile +++ www/hs-heist/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= heist -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.0.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-heist/distinfo =================================================================== --- www/hs-heist/distinfo +++ www/hs-heist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524939588 -SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96 -SIZE (cabal/heist-1.1.tar.gz) = 71239 +TIMESTAMP = 1545835019 +SHA256 (cabal/heist-1.1.0.1.tar.gz) = 185778ba87642685b8c4ca5608963b05a4bae929a2e9474b1514126fb94b90c8 +SIZE (cabal/heist-1.1.0.1.tar.gz) = 71359 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.8.1 -PORTREVISION= 1 +PORTVERSION= 0.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,9 +9,9 @@ LICENSE= GPLv3 -USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \ - time-locale-compat unordered-containers uri-bytestring \ - uuid-types +USE_CABAL= attoparsec attoparsec-iso8601 base-compat cookie hashable \ + http-types tagged 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 = 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 +TIMESTAMP = 1545757436 +SHA256 (cabal/http-api-data-0.4.tar.gz) = 837e3f39f23df2caa23d75a4608f4a0505a1ab23f7290006976a37a373164a8a +SIZE (cabal/http-api-data-0.4.tar.gz) = 20498 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.12.1 -PORTREVISION= 1 +PORTVERSION= 0.12.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-http-types/distinfo =================================================================== --- www/hs-http-types/distinfo +++ www/hs-http-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523783338 -SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3 -SIZE (cabal/http-types-0.12.1.tar.gz) = 13189 +TIMESTAMP = 1545832873 +SHA256 (cabal/http-types-0.12.2.tar.gz) = 523102d7ba8923e1b399cfd2a1c821e858146ecd934fc147c3acd0fd2b2f9305 +SIZE (cabal/http-types-0.12.2.tar.gz) = 13552 Index: www/hs-snap-server/Makefile =================================================================== --- www/hs-snap-server/Makefile +++ www/hs-snap-server/Makefile @@ -2,7 +2,7 @@ PORTNAME= snap-server PORTVERSION= 1.1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-snap-server/files/patch-snap-server.cabal =================================================================== --- www/hs-snap-server/files/patch-snap-server.cabal +++ www/hs-snap-server/files/patch-snap-server.cabal @@ -1,10 +1,18 @@ ---- snap-server.cabal.orig 2017-05-15 21:28:21 UTC +--- snap-server.cabal.orig 2018-03-20 13:04:01 UTC +++ snap-server.cabal -@@ -89,7 +89,6 @@ Library - base >= 4 && < 5, +@@ -95,13 +95,12 @@ Library + + build-depends: + attoparsec >= 0.12 && < 0.14, +- base >= 4.6 && < 4.12, ++ base >= 4.6 && < 4.13, blaze-builder >= 0.4 && < 0.5, bytestring >= 0.9.1 && < 0.11, - bytestring-builder >= 0.10.4 && < 0.11, case-insensitive >= 1.1 && < 1.3, clock >= 0.7.1 && < 0.8, - containers >= 0.3 && < 0.6, +- containers >= 0.3 && < 0.6, ++ containers >= 0.3 && < 0.7, + filepath >= 1.1 && < 2.0, + io-streams >= 1.3 && < 1.6, + io-streams-haproxy >= 1.0 && < 1.1, 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.7 -PORTREVISION= 1 +PORTVERSION= 1.7.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-yesod-auth-hashdb/distinfo =================================================================== --- www/hs-yesod-auth-hashdb/distinfo +++ www/hs-yesod-auth-hashdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525187444 -SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c -SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493 +TIMESTAMP = 1546182489 +SHA256 (cabal/yesod-auth-hashdb-1.7.1.tar.gz) = 0d6f27a49aa862af8f4d1a84f8fe540300e42f9208728fba03a7996a5517dfe5 +SIZE (cabal/yesod-auth-hashdb-1.7.1.tar.gz) = 15545 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.6.3 -PORTREVISION= 1 +PORTVERSION= 1.6.5 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-yesod-auth/distinfo =================================================================== --- www/hs-yesod-auth/distinfo +++ www/hs-yesod-auth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525183168 -SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8 -SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951 +TIMESTAMP = 1546179997 +SHA256 (cabal/yesod-auth-1.6.5.tar.gz) = b9dd963473a4d18d6a6921c0c321d86c77f264d8be2849b4aadcfa8f3ac337b3 +SIZE (cabal/yesod-auth-1.6.5.tar.gz) = 51828 Index: www/hs-yesod-bin/Makefile =================================================================== --- www/hs-yesod-bin/Makefile +++ www/hs-yesod-bin/Makefile @@ -2,6 +2,7 @@ PORTNAME= yesod-bin PORTVERSION= 1.6.0.3 +PORTREVISION= 1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org Index: www/hs-yesod-bin/files/patch-yesod-bin.cabal =================================================================== --- /dev/null +++ www/hs-yesod-bin/files/patch-yesod-bin.cabal @@ -0,0 +1,11 @@ +--- yesod-bin.cabal.orig 2018-05-13 12:13:32 UTC ++++ yesod-bin.cabal +@@ -43,7 +43,7 @@ executable yesod + , zlib >= 0.5 + , tar >= 0.4 && < 0.6 + , unordered-containers +- , yaml >= 0.8 && < 0.9 ++ , yaml >= 0.8 && < 0.12 + , optparse-applicative >= 0.11 + , fsnotify >= 0.0 && < 0.3 + , split >= 0.2 && < 0.3 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.6.0 -PORTREVISION= 1 +PORTVERSION= 1.6.0.1 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 = 1525180776 -SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd -SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935 +TIMESTAMP = 1546104685 +SHA256 (cabal/yesod-persistent-1.6.0.1.tar.gz) = 748acc0a08e371548920a1b5e2e8b2c95b95014becd63acf259712d306a9bd4f +SIZE (cabal/yesod-persistent-1.6.0.1.tar.gz) = 5028 Index: x11-toolkits/hs-GLUT/Makefile =================================================================== --- x11-toolkits/hs-GLUT/Makefile +++ x11-toolkits/hs-GLUT/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= GLUT -PORTVERSION= 2.7.0.12 -PORTREVISION= 3 +PORTVERSION= 2.7.0.14 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell Index: x11-toolkits/hs-GLUT/distinfo =================================================================== --- x11-toolkits/hs-GLUT/distinfo +++ x11-toolkits/hs-GLUT/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499625638 -SHA256 (cabal/GLUT-2.7.0.12.tar.gz) = 66f516bd9f836e5252fe0186e447b68a61b594d9247466c502b74994d3e9f1b5 -SIZE (cabal/GLUT-2.7.0.12.tar.gz) = 656592 +TIMESTAMP = 1545837059 +SHA256 (cabal/GLUT-2.7.0.14.tar.gz) = 5cf8f7700a6b6ac33e39b2d7bd300679a245ff7c1498eb423901134f9d302106 +SIZE (cabal/GLUT-2.7.0.14.tar.gz) = 655029 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.1 -PORTREVISION= 1 +PORTVERSION= 3.0.2.2 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell Index: x11-toolkits/hs-OpenGL/distinfo =================================================================== --- x11-toolkits/hs-OpenGL/distinfo +++ x11-toolkits/hs-OpenGL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524406154 -SHA256 (cabal/OpenGL-3.0.2.1.tar.gz) = 7acb891b911de8bb6933afeaa7f8c5291cc986da5557c922c0fc1717c5a559bf -SIZE (cabal/OpenGL-3.0.2.1.tar.gz) = 130703 +TIMESTAMP = 1545656184 +SHA256 (cabal/OpenGL-3.0.2.2.tar.gz) = 4cba40fe8eecee67c8251556b4c05d9e98256c11d49c20e914f8232bfae67da7 +SIZE (cabal/OpenGL-3.0.2.2.tar.gz) = 130711 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.3.0.0 -PORTREVISION= 1 +PORTVERSION= 3.3.1.0 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org Index: x11-toolkits/hs-OpenGLRaw/distinfo =================================================================== --- x11-toolkits/hs-OpenGLRaw/distinfo +++ x11-toolkits/hs-OpenGLRaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523444916 -SHA256 (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 17889867ae2bd67b98bc7d74f5df3b82abc4f01807c4d24d2efde84d9423b290 -SIZE (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 857906 +TIMESTAMP = 1545561651 +SHA256 (cabal/OpenGLRaw-3.3.1.0.tar.gz) = 6b0745f6d421f658b57c13bfdbae014c0aa6871a98e11e98908d4a04461f1cf5 +SIZE (cabal/OpenGLRaw-3.3.1.0.tar.gz) = 858858 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= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org Index: x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal =================================================================== --- x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal +++ x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal @@ -1,6 +1,6 @@ ---- wxdirect.cabal.orig 2018-04-16 18:38:04 UTC +--- wxdirect.cabal.orig 2018-12-23 10:54:50 UTC +++ wxdirect.cabal -@@ -53,7 +53,7 @@ executable wxdirect +@@ -53,12 +53,12 @@ executable wxdirect strict, time >= 1.0, filepath < 1.5, @@ -9,3 +9,9 @@ if flag(splitBase) build-depends: + base >= 4 && < 5, +- containers >= 0.2 && < 0.6 ++ containers >= 0.2 && < 0.7 + else + build-depends: + base >= 3 && < 4, Index: x11/hs-xmobar/Makefile =================================================================== --- x11/hs-xmobar/Makefile +++ x11/hs-xmobar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xmobar -PORTVERSION= 0.28 +PORTVERSION= 0.29.4 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,8 @@ LICENSE= BSD3CLAUSE -USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 regex-compat X11>=1.6.1 parsec-numbers +USE_CABAL= HTTP>=4000.2.4 async extensible-exceptions mtl>=2.1 regex-compat\ + X11>=1.6.1 parsec-numbers USE_XORG= xpm EXECUTABLE= xmobar @@ -19,7 +20,7 @@ OPTIONS_DEFINE= EXAMPLES -INSTALL_PORTEXAMPLES= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config \ +INSTALL_PORTEXAMPLES= ${INSTALL_DATA} ${WRKSRC}/examples/xmobar.config \ ${STAGEDIR}${EXAMPLESDIR} FLAGS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED @@ -51,5 +52,9 @@ # Disable unsupported options FLAGS_DISABLE= with_mpris with_dbus with_iwlib with_alsa +post-extract: + ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs + ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: x11/hs-xmobar/distinfo =================================================================== --- x11/hs-xmobar/distinfo +++ x11/hs-xmobar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538849019 -SHA256 (cabal/xmobar-0.28.tar.gz) = ed1338bed8f8a2fafeeb30462a44e0bacf45bcf76fb47377d66578f4b43a08f6 -SIZE (cabal/xmobar-0.28.tar.gz) = 102694 +TIMESTAMP = 1546020535 +SHA256 (cabal/xmobar-0.29.4.tar.gz) = 59378f117d41dbf5312bd1eaaf7b2d82d09e95652c6d777b64e300de2fd17122 +SIZE (cabal/xmobar-0.29.4.tar.gz) = 115342