summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2018-05-25 21:44:12 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2018-05-25 21:44:12 +0000
commitfff1aa535b4a18a05d872de7c9afb3dbf9f6013b (patch)
tree86e71c0056b8414191c8b421101694a177fec03e
parentRename net/bird-devel to net/bird2 (diff)
Update lang/ghc 8.4.2 and the hs-* ports the newer versions
* Update lang/ghc to 8.4.2 * Update the boostrap compiler to 8.4.1 * Update the many hs-* ports * Bump the rest Thanks a lot to arrowd for doing all the heavy lifting :) PR: 227968 Exp-run by: antoine Submitted by: arrowd Differential Revision: https://reviews.freebsd.org/D15005
Notes
Notes: svn path=/head/; revision=470870
-rw-r--r--MOVED3
-rw-r--r--archivers/hs-tar/Makefile3
-rw-r--r--archivers/hs-tar/distinfo6
-rw-r--r--archivers/hs-zip-archive/Makefile5
-rw-r--r--archivers/hs-zip-archive/distinfo6
-rw-r--r--archivers/hs-zlib-bindings/Makefile2
-rw-r--r--archivers/hs-zlib-enum/Makefile2
-rw-r--r--archivers/hs-zlib/Makefile2
-rw-r--r--audio/hs-ALUT/Makefile2
-rw-r--r--audio/hs-OpenAL/Makefile2
-rw-r--r--audio/hs-libmpd/Makefile5
-rw-r--r--audio/hs-libmpd/distinfo6
-rw-r--r--benchmarks/hs-criterion/Makefile11
-rw-r--r--benchmarks/hs-criterion/distinfo6
-rw-r--r--converters/hs-aeson-compat/Makefile5
-rw-r--r--converters/hs-aeson-compat/distinfo6
-rw-r--r--converters/hs-aeson-compat/files/patch-aeson-compat.cabal29
-rw-r--r--converters/hs-aeson-pretty/Makefile5
-rw-r--r--converters/hs-aeson-pretty/distinfo6
-rw-r--r--converters/hs-aeson/Makefile5
-rw-r--r--converters/hs-aeson/distinfo6
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-json/Makefile5
-rw-r--r--converters/hs-json/distinfo5
-rw-r--r--converters/hs-sandi/Makefile3
-rw-r--r--converters/hs-sandi/distinfo6
-rw-r--r--databases/hs-esqueleto/Makefile6
-rw-r--r--databases/hs-hedis/Makefile6
-rw-r--r--databases/hs-hedis/distinfo6
-rw-r--r--databases/hs-mysql/Makefile5
-rw-r--r--databases/hs-mysql/distinfo6
-rw-r--r--databases/hs-persistent-sqlite/Makefile5
-rw-r--r--databases/hs-persistent-sqlite/distinfo6
-rw-r--r--databases/hs-persistent-template/Makefile5
-rw-r--r--databases/hs-persistent-template/distinfo6
-rw-r--r--databases/hs-persistent-template/files/patch-persistent-template.cabal6
-rw-r--r--databases/hs-persistent/Makefile11
-rw-r--r--databases/hs-persistent/distinfo6
-rw-r--r--deskutils/hs-fdo-notify/Makefile2
-rw-r--r--devel/Makefile19
-rw-r--r--devel/hs-BNFC/Makefile21
-rw-r--r--devel/hs-BNFC/distinfo3
-rw-r--r--devel/hs-BNFC/pkg-descr11
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-BoundedChan/Makefile2
-rw-r--r--devel/hs-ConfigFile/Makefile4
-rw-r--r--devel/hs-DrIFT/distinfo3
-rw-r--r--devel/hs-DrIFT/files/patch-src_ParseLib2.hs25
-rw-r--r--devel/hs-DrIFT/pkg-descr13
-rw-r--r--devel/hs-EdisonAPI/Makefile2
-rw-r--r--devel/hs-EdisonCore/Makefile7
-rw-r--r--devel/hs-EdisonCore/distinfo6
-rw-r--r--devel/hs-Glob/Makefile2
-rw-r--r--devel/hs-HUnit/Makefile2
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-List/Makefile3
-rw-r--r--devel/hs-List/distinfo6
-rw-r--r--devel/hs-ListLike/Makefile5
-rw-r--r--devel/hs-ListLike/distinfo6
-rw-r--r--devel/hs-MemoTrie/Makefile3
-rw-r--r--devel/hs-MemoTrie/distinfo6
-rw-r--r--devel/hs-MissingH/Makefile4
-rw-r--r--devel/hs-MonadRandom/Makefile2
-rw-r--r--devel/hs-ObjectName/Makefile2
-rw-r--r--devel/hs-Only/Makefile2
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-PSQueue/files/patch-Data_PSQueue.hs11
-rw-r--r--devel/hs-QuickCheck/Makefile2
-rw-r--r--devel/hs-ReadArgs/Makefile4
-rw-r--r--devel/hs-STMonadTrans/Makefile2
-rw-r--r--devel/hs-SafeSemaphore/Makefile4
-rw-r--r--devel/hs-ShellCheck/Makefile4
-rw-r--r--devel/hs-StateVar/Makefile4
-rw-r--r--devel/hs-Stream/Makefile2
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-abstract-deque/Makefile2
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-activehs-base/Makefile2
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal3
-rw-r--r--devel/hs-alex/Makefile2
-rw-r--r--devel/hs-ansi-terminal/Makefile5
-rw-r--r--devel/hs-ansi-terminal/distinfo6
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile5
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo6
-rw-r--r--devel/hs-arrows/Makefile3
-rw-r--r--devel/hs-arrows/distinfo6
-rw-r--r--devel/hs-asn1-data/Makefile4
-rw-r--r--devel/hs-asn1-encoding/Makefile2
-rw-r--r--devel/hs-asn1-parse/Makefile2
-rw-r--r--devel/hs-asn1-types/Makefile2
-rw-r--r--devel/hs-async/Makefile4
-rw-r--r--devel/hs-async/distinfo6
-rw-r--r--devel/hs-atomic-primops/Makefile3
-rw-r--r--devel/hs-atomic-primops/distinfo6
-rw-r--r--devel/hs-auto-update/Makefile2
-rw-r--r--devel/hs-base-compat-batteries/Makefile15
-rw-r--r--devel/hs-base-compat-batteries/distinfo3
-rw-r--r--devel/hs-base-compat-batteries/pkg-descr11
-rw-r--r--devel/hs-base-compat/Makefile3
-rw-r--r--devel/hs-base-compat/distinfo6
-rw-r--r--devel/hs-base-orphans/Makefile2
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/Makefile2
-rw-r--r--devel/hs-basement/Makefile (renamed from devel/hs-text/Makefile)7
-rw-r--r--devel/hs-basement/distinfo3
-rw-r--r--devel/hs-basement/pkg-descr12
-rw-r--r--devel/hs-basic-prelude/Makefile7
-rw-r--r--devel/hs-basic-prelude/distinfo6
-rw-r--r--devel/hs-bifunctors/Makefile6
-rw-r--r--devel/hs-bifunctors/distinfo6
-rw-r--r--devel/hs-bifunctors/files/patch-bifunctors.cabal11
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile2
-rw-r--r--devel/hs-blaze-builder/Makefile5
-rw-r--r--devel/hs-blaze-builder/distinfo6
-rw-r--r--devel/hs-blaze-textual/Makefile4
-rw-r--r--devel/hs-bloomfilter/Makefile2
-rw-r--r--devel/hs-boxes/Makefile3
-rw-r--r--devel/hs-boxes/distinfo6
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-byteable/Makefile2
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-bytestring-lexing/Makefile2
-rw-r--r--devel/hs-bytestring-mmap/Makefile2
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-bytestring-show/Makefile2
-rw-r--r--devel/hs-c2hs/Makefile4
-rw-r--r--devel/hs-cabal-install/Makefile9
-rw-r--r--devel/hs-cabal-install/distinfo6
-rw-r--r--devel/hs-call-stack/Makefile2
-rw-r--r--devel/hs-cereal/Makefile3
-rw-r--r--devel/hs-cereal/distinfo6
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-chunked-data/Makefile6
-rw-r--r--devel/hs-chunked-data/distinfo6
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile3
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo6
-rw-r--r--devel/hs-classy-prelude/Makefile5
-rw-r--r--devel/hs-classy-prelude/distinfo6
-rw-r--r--devel/hs-clock/Makefile2
-rw-r--r--devel/hs-cmdargs/Makefile3
-rw-r--r--devel/hs-cmdargs/distinfo6
-rw-r--r--devel/hs-code-page/Makefile2
-rw-r--r--devel/hs-colour/Makefile3
-rw-r--r--devel/hs-colour/distinfo6
-rw-r--r--devel/hs-concurrent-output/Makefile4
-rw-r--r--devel/hs-concurrent-output/distinfo6
-rw-r--r--devel/hs-concurrent-output/files/patch-concurrent-output.cabal11
-rw-r--r--devel/hs-conduit-combinators/Makefile5
-rw-r--r--devel/hs-conduit-combinators/distinfo6
-rw-r--r--devel/hs-conduit-extra/Makefile4
-rw-r--r--devel/hs-conduit-extra/distinfo6
-rw-r--r--devel/hs-conduit/Makefile7
-rw-r--r--devel/hs-conduit/distinfo6
-rw-r--r--devel/hs-configurator/Makefile5
-rw-r--r--devel/hs-constraints/Makefile5
-rw-r--r--devel/hs-constraints/distinfo6
-rw-r--r--devel/hs-convertible/Makefile4
-rw-r--r--devel/hs-cpphs/Makefile2
-rw-r--r--devel/hs-darcs/Makefile9
-rw-r--r--devel/hs-darcs/distinfo6
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal11
-rw-r--r--devel/hs-data-default-class/Makefile2
-rw-r--r--devel/hs-data-default-instances-base/Makefile2
-rw-r--r--devel/hs-data-default-instances-containers/Makefile2
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile2
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile2
-rw-r--r--devel/hs-data-default/Makefile2
-rw-r--r--devel/hs-data-endian/Makefile2
-rw-r--r--devel/hs-data-hash/Makefile2
-rw-r--r--devel/hs-data-ordlist/Makefile2
-rw-r--r--devel/hs-data-pprint/files/patch-Data_PPrint.hs9
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal12
-rw-r--r--devel/hs-date-cache/Makefile2
-rw-r--r--devel/hs-datetime/Makefile2
-rw-r--r--devel/hs-dbus/Makefile6
-rw-r--r--devel/hs-dbus/distinfo6
-rw-r--r--devel/hs-deepseq-generics/Makefile14
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal10
-rw-r--r--devel/hs-directory-tree/Makefile2
-rw-r--r--devel/hs-dlist-instances/Makefile2
-rw-r--r--devel/hs-dlist/Makefile2
-rw-r--r--devel/hs-easy-file/Makefile2
-rw-r--r--devel/hs-echo/Makefile13
-rw-r--r--devel/hs-echo/distinfo3
-rw-r--r--devel/hs-echo/files/patch-echo.cabal11
-rw-r--r--devel/hs-echo/pkg-descr6
-rw-r--r--devel/hs-edit-distance/Makefile2
-rw-r--r--devel/hs-either/Makefile3
-rw-r--r--devel/hs-either/distinfo6
-rw-r--r--devel/hs-either/files/patch-either.cabal14
-rw-r--r--devel/hs-enclosed-exceptions/Makefile2
-rw-r--r--devel/hs-enumerator/Makefile4
-rw-r--r--devel/hs-equivalence/Makefile2
-rw-r--r--devel/hs-errors/Makefile5
-rw-r--r--devel/hs-errors/distinfo6
-rw-r--r--devel/hs-exceptions/Makefile4
-rw-r--r--devel/hs-exceptions/distinfo6
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extra/Makefile3
-rw-r--r--devel/hs-extra/distinfo6
-rw-r--r--devel/hs-fast-logger/Makefile5
-rw-r--r--devel/hs-fast-logger/distinfo6
-rw-r--r--devel/hs-fgl/Makefile2
-rw-r--r--devel/hs-file-embed/Makefile2
-rw-r--r--devel/hs-filemanip/Makefile2
-rw-r--r--devel/hs-filestore/Makefile6
-rw-r--r--devel/hs-filestore/distinfo6
-rw-r--r--devel/hs-fmlist/Makefile3
-rw-r--r--devel/hs-fmlist/distinfo6
-rw-r--r--devel/hs-foundation/Makefile5
-rw-r--r--devel/hs-foundation/distinfo6
-rw-r--r--devel/hs-free/Makefile5
-rw-r--r--devel/hs-free/distinfo6
-rw-r--r--devel/hs-free/files/patch-free.cabal11
-rw-r--r--devel/hs-fsnotify/Makefile5
-rw-r--r--devel/hs-fsnotify/distinfo6
-rw-r--r--devel/hs-gconf/Makefile4
-rw-r--r--devel/hs-generic-deriving/Makefile3
-rw-r--r--devel/hs-generic-deriving/distinfo6
-rw-r--r--devel/hs-generic-deriving/files/patch-generic-deriving.cabal11
-rw-r--r--devel/hs-geniplate-mirror/Makefile3
-rw-r--r--devel/hs-geniplate-mirror/distinfo6
-rw-r--r--devel/hs-ghc-events/Makefile5
-rw-r--r--devel/hs-ghc-events/distinfo6
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-gio/Makefile2
-rw-r--r--devel/hs-git-annex/Makefile2
-rw-r--r--devel/hs-gitrev/Makefile2
-rw-r--r--devel/hs-glib/Makefile5
-rw-r--r--devel/hs-glib/distinfo6
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile3
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo6
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs10
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal11
-rw-r--r--devel/hs-haddock-api/Makefile3
-rw-r--r--devel/hs-haddock-api/distinfo6
-rw-r--r--devel/hs-haddock-library/Makefile5
-rw-r--r--devel/hs-haddock-library/distinfo6
-rw-r--r--devel/hs-haddock-library/files/patch-haddock-library.cabal45
-rw-r--r--devel/hs-haddock/Makefile3
-rw-r--r--devel/hs-haddock/distinfo6
-rw-r--r--devel/hs-happy/Makefile2
-rw-r--r--devel/hs-hashable/Makefile5
-rw-r--r--devel/hs-hashable/distinfo6
-rw-r--r--devel/hs-hashed-storage/Makefile2
-rw-r--r--devel/hs-hashtables/Makefile3
-rw-r--r--devel/hs-hashtables/distinfo6
-rw-r--r--devel/hs-haskell-lexer/Makefile2
-rw-r--r--devel/hs-haskell-src-exts/Makefile3
-rw-r--r--devel/hs-haskell-src-exts/distinfo6
-rw-r--r--devel/hs-haskell-src-meta/Makefile (renamed from devel/hs-DrIFT/Makefile)11
-rw-r--r--devel/hs-haskell-src-meta/distinfo3
-rw-r--r--devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal16
-rw-r--r--devel/hs-haskell-src-meta/pkg-descr4
-rw-r--r--devel/hs-haskell-src/Makefile3
-rw-r--r--devel/hs-haskell-src/distinfo6
-rw-r--r--devel/hs-hasktags/Makefile2
-rw-r--r--devel/hs-hastache/Makefile20
-rw-r--r--devel/hs-hastache/distinfo3
-rw-r--r--devel/hs-hastache/files/patch-hastache.cabal29
-rw-r--r--devel/hs-hastache/pkg-descr5
-rw-r--r--devel/hs-hex/Makefile2
-rw-r--r--devel/hs-hinotify/Makefile4
-rw-r--r--devel/hs-hinotify/distinfo6
-rw-r--r--devel/hs-hint/Makefile2
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile2
-rw-r--r--devel/hs-hoogle/Makefile7
-rw-r--r--devel/hs-hoogle/distinfo6
-rw-r--r--devel/hs-hourglass/Makefile3
-rw-r--r--devel/hs-hourglass/distinfo6
-rw-r--r--devel/hs-hsb2hs/Makefile2
-rw-r--r--devel/hs-hslogger/Makefile2
-rw-r--r--devel/hs-hslua-module-text/Makefile (renamed from devel/hs-monadplus/Makefile)11
-rw-r--r--devel/hs-hslua-module-text/distinfo3
-rw-r--r--devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal18
-rw-r--r--devel/hs-hslua-module-text/pkg-descr3
-rw-r--r--devel/hs-hslua/Makefile5
-rw-r--r--devel/hs-hslua/distinfo6
-rw-r--r--devel/hs-hslua/files/patch-hslua.cabal12
-rw-r--r--devel/hs-hspec-core/Makefile5
-rw-r--r--devel/hs-hspec-core/distinfo6
-rw-r--r--devel/hs-hspec-discover/Makefile3
-rw-r--r--devel/hs-hspec-discover/distinfo6
-rw-r--r--devel/hs-hspec-expectations/Makefile2
-rw-r--r--devel/hs-hspec/Makefile3
-rw-r--r--devel/hs-hspec/distinfo6
-rw-r--r--devel/hs-io-streams-haproxy/Makefile3
-rw-r--r--devel/hs-io-streams-haproxy/distinfo6
-rw-r--r--devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal16
-rw-r--r--devel/hs-io-streams/Makefile5
-rw-r--r--devel/hs-io-streams/distinfo6
-rw-r--r--devel/hs-io-streams/files/patch-io-streams.cabal10
-rw-r--r--devel/hs-js-flot/Makefile2
-rw-r--r--devel/hs-js-jquery/Makefile2
-rw-r--r--devel/hs-keys/Makefile3
-rw-r--r--devel/hs-keys/distinfo6
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal16
-rw-r--r--devel/hs-language-c/Makefile3
-rw-r--r--devel/hs-language-c/distinfo6
-rw-r--r--devel/hs-language-javascript/Makefile3
-rw-r--r--devel/hs-language-javascript/distinfo6
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lens/Makefile7
-rw-r--r--devel/hs-lens/distinfo6
-rw-r--r--devel/hs-lifted-async/Makefile3
-rw-r--r--devel/hs-lifted-async/distinfo6
-rw-r--r--devel/hs-lifted-base/Makefile2
-rw-r--r--devel/hs-logict/Makefile2
-rw-r--r--devel/hs-map-syntax/Makefile3
-rw-r--r--devel/hs-map-syntax/distinfo6
-rw-r--r--devel/hs-memory/Makefile5
-rw-r--r--devel/hs-memory/distinfo6
-rw-r--r--devel/hs-microlens-th/Makefile5
-rw-r--r--devel/hs-microlens-th/distinfo6
-rw-r--r--devel/hs-microlens/Makefile3
-rw-r--r--devel/hs-microlens/distinfo6
-rw-r--r--devel/hs-microstache/Makefile5
-rw-r--r--devel/hs-microstache/distinfo6
-rw-r--r--devel/hs-microstache/files/patch-microstache.cabal11
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-mmorph/Makefile2
-rw-r--r--devel/hs-monad-control/Makefile2
-rw-r--r--devel/hs-monad-logger/Makefile4
-rw-r--r--devel/hs-monad-logger/distinfo6
-rw-r--r--devel/hs-monad-loops/Makefile2
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par/Makefile2
-rw-r--r--devel/hs-monad-unlift/Makefile2
-rw-r--r--devel/hs-monadplus/distinfo3
-rw-r--r--devel/hs-monadplus/pkg-descr5
-rw-r--r--devel/hs-monads-tf/Makefile2
-rw-r--r--devel/hs-mono-traversable-instances/Makefile2
-rw-r--r--devel/hs-mono-traversable/Makefile5
-rw-r--r--devel/hs-mono-traversable/distinfo6
-rw-r--r--devel/hs-mtl/Makefile2
-rw-r--r--devel/hs-mueval/Makefile2
-rw-r--r--devel/hs-murmur-hash/Makefile2
-rw-r--r--devel/hs-mutable-containers/Makefile2
-rw-r--r--devel/hs-ncurses/Makefile3
-rw-r--r--devel/hs-newtype-generics/Makefile3
-rw-r--r--devel/hs-newtype-generics/distinfo6
-rw-r--r--devel/hs-newtype/Makefile2
-rw-r--r--devel/hs-old-locale/Makefile2
-rw-r--r--devel/hs-old-locale/files/patch-git_15fea2d2
-rw-r--r--devel/hs-old-time/Makefile2
-rw-r--r--devel/hs-old-time/files/patch-git_82790af2
-rw-r--r--devel/hs-optparse-applicative/Makefile2
-rw-r--r--devel/hs-parallel/files/patch-parallel.cabal10
-rw-r--r--devel/hs-pcre-light/Makefile2
-rw-r--r--devel/hs-prelude-extras/Makefile2
-rw-r--r--devel/hs-preprocessor-tools/Makefile4
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-primitive/Makefile3
-rw-r--r--devel/hs-primitive/distinfo6
-rw-r--r--devel/hs-process-extras/Makefile5
-rw-r--r--devel/hs-process-extras/distinfo6
-rw-r--r--devel/hs-profunctors/Makefile3
-rw-r--r--devel/hs-profunctors/distinfo6
-rw-r--r--devel/hs-profunctors/files/patch-git_c0574c22
-rw-r--r--devel/hs-project-template/Makefile5
-rw-r--r--devel/hs-project-template/distinfo6
-rw-r--r--devel/hs-psqueues/Makefile3
-rw-r--r--devel/hs-psqueues/distinfo6
-rw-r--r--devel/hs-quickcheck-io/Makefile2
-rw-r--r--devel/hs-random/Makefile2
-rw-r--r--devel/hs-readable/Makefile4
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-refact/Makefile2
-rw-r--r--devel/hs-reflection/Makefile3
-rw-r--r--devel/hs-reflection/distinfo6
-rw-r--r--devel/hs-resource-pool/Makefile6
-rw-r--r--devel/hs-resourcet/Makefile6
-rw-r--r--devel/hs-resourcet/distinfo6
-rw-r--r--devel/hs-safe-exceptions/Makefile3
-rw-r--r--devel/hs-safe-exceptions/distinfo6
-rw-r--r--devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal13
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-say/Makefile4
-rw-r--r--devel/hs-scientific/Makefile5
-rw-r--r--devel/hs-scientific/distinfo6
-rw-r--r--devel/hs-securemem/Makefile5
-rw-r--r--devel/hs-securemem/distinfo6
-rw-r--r--devel/hs-setenv/Makefile2
-rw-r--r--devel/hs-setlocale/Makefile3
-rw-r--r--devel/hs-setlocale/distinfo6
-rw-r--r--devel/hs-shake/Makefile5
-rw-r--r--devel/hs-shake/distinfo6
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile2
-rw-r--r--devel/hs-simple-reflect/Makefile3
-rw-r--r--devel/hs-simple-reflect/distinfo6
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-split/Makefile3
-rw-r--r--devel/hs-split/distinfo6
-rw-r--r--devel/hs-stm-chans/Makefile4
-rw-r--r--devel/hs-stm/distinfo3
-rw-r--r--devel/hs-stm/pkg-descr3
-rw-r--r--devel/hs-storable-record/Makefile15
-rw-r--r--devel/hs-storable-record/distinfo3
-rw-r--r--devel/hs-storable-record/pkg-descr6
-rw-r--r--devel/hs-storable-tuple/Makefile15
-rw-r--r--devel/hs-storable-tuple/distinfo3
-rw-r--r--devel/hs-storable-tuple/pkg-descr6
-rw-r--r--devel/hs-streaming-commons/Makefile4
-rw-r--r--devel/hs-streaming-commons/distinfo6
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile3
-rw-r--r--devel/hs-syb-with-class/distinfo6
-rw-r--r--devel/hs-syb/Makefile2
-rw-r--r--devel/hs-system-fileio/Makefile4
-rw-r--r--devel/hs-system-filepath/Makefile5
-rw-r--r--devel/hs-system-filepath/distinfo6
-rw-r--r--devel/hs-tagged/Makefile2
-rw-r--r--devel/hs-tagged/files/patch-tagged.cabal2
-rw-r--r--devel/hs-temporary/Makefile2
-rw-r--r--devel/hs-terminal-size/Makefile2
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile2
-rw-r--r--devel/hs-test-framework/Makefile3
-rw-r--r--devel/hs-test-framework/distinfo6
-rw-r--r--devel/hs-test-framework/files/patch-test-framework.cabal11
-rw-r--r--devel/hs-text-icu/Makefile4
-rw-r--r--devel/hs-text-short/Makefile5
-rw-r--r--devel/hs-text-short/distinfo6
-rw-r--r--devel/hs-text/distinfo3
-rw-r--r--devel/hs-text/pkg-descr16
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-th-abstraction/Makefile3
-rw-r--r--devel/hs-th-abstraction/distinfo6
-rw-r--r--devel/hs-th-abstraction/files/patch-th-abstraction.cabal11
-rw-r--r--devel/hs-th-expand-syns/Makefile15
-rw-r--r--devel/hs-th-expand-syns/distinfo3
-rw-r--r--devel/hs-th-expand-syns/pkg-descr3
-rw-r--r--devel/hs-th-lift-instances/Makefile4
-rw-r--r--devel/hs-th-lift/Makefile3
-rw-r--r--devel/hs-th-lift/distinfo6
-rw-r--r--devel/hs-th-orphans/Makefile15
-rw-r--r--devel/hs-th-orphans/distinfo3
-rw-r--r--devel/hs-th-orphans/pkg-descr5
-rw-r--r--devel/hs-th-reify-many/Makefile15
-rw-r--r--devel/hs-th-reify-many/distinfo3
-rw-r--r--devel/hs-th-reify-many/pkg-descr6
-rw-r--r--devel/hs-threads/Makefile4
-rw-r--r--devel/hs-threads/distinfo6
-rw-r--r--devel/hs-threadscope/Makefile6
-rw-r--r--devel/hs-time-compat/Makefile2
-rw-r--r--devel/hs-time-locale-compat/Makefile2
-rw-r--r--devel/hs-timezone-olson/Makefile3
-rw-r--r--devel/hs-timezone-olson/distinfo6
-rw-r--r--devel/hs-timezone-series/Makefile2
-rw-r--r--devel/hs-transformers-base/Makefile4
-rw-r--r--devel/hs-transformers-compat/Makefile2
-rw-r--r--devel/hs-typed-process/Makefile4
-rw-r--r--devel/hs-typed-process/distinfo6
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-unexceptionalio/Makefile2
-rw-r--r--devel/hs-unicode-show/Makefile (renamed from devel/hs-stm/Makefile)7
-rw-r--r--devel/hs-unicode-show/distinfo3
-rw-r--r--devel/hs-unicode-show/pkg-descr4
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-time/Makefile3
-rw-r--r--devel/hs-unix-time/distinfo6
-rw-r--r--devel/hs-unliftio-core/Makefile13
-rw-r--r--devel/hs-unliftio-core/distinfo3
-rw-r--r--devel/hs-unliftio-core/files/patch-unliftio-core.cabal11
-rw-r--r--devel/hs-unliftio-core/pkg-descr4
-rw-r--r--devel/hs-unliftio/Makefile15
-rw-r--r--devel/hs-unliftio/distinfo3
-rw-r--r--devel/hs-unliftio/pkg-descr4
-rw-r--r--devel/hs-unordered-containers/Makefile3
-rw-r--r--devel/hs-unordered-containers/distinfo6
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile3
-rw-r--r--devel/hs-uuagc-cabal/distinfo6
-rw-r--r--devel/hs-uuagc/Makefile2
-rw-r--r--devel/hs-uuid-types/Makefile4
-rw-r--r--devel/hs-uuid/Makefile4
-rw-r--r--devel/hs-uuid/files/patch-uuid.cabal10
-rw-r--r--devel/hs-uulib/Makefile3
-rw-r--r--devel/hs-uulib/distinfo6
-rw-r--r--devel/hs-uulib/files/patch-src_UU_PPrint.hs11
-rw-r--r--devel/hs-vault/Makefile5
-rw-r--r--devel/hs-vault/distinfo6
-rw-r--r--devel/hs-vector-algorithms/Makefile2
-rw-r--r--devel/hs-vector-binary-instances/Makefile5
-rw-r--r--devel/hs-vector-binary-instances/distinfo6
-rw-r--r--devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal10
-rw-r--r--devel/hs-vector-instances/Makefile2
-rw-r--r--devel/hs-vector-th-unbox/Makefile2
-rw-r--r--devel/hs-vector/files/patch-vector.cabal11
-rw-r--r--devel/hs-void/Makefile2
-rw-r--r--devel/hs-wl-pprint-text/Makefile5
-rw-r--r--devel/hs-wl-pprint-text/distinfo6
-rw-r--r--devel/hs-word8/Makefile2
-rw-r--r--devel/stack/Makefile15
-rw-r--r--devel/stack/distinfo10
-rw-r--r--dns/hs-dns/Makefile8
-rw-r--r--dns/hs-dns/distinfo6
-rw-r--r--dns/hs-dns/files/patch-dns.cabal34
-rw-r--r--dns/hs-gnuidn/Makefile3
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--games/hs-scroll/Makefile5
-rw-r--r--games/hs-scroll/distinfo6
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/hs-HGL/Makefile17
-rw-r--r--graphics/hs-HGL/distinfo2
-rw-r--r--graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs22
-rw-r--r--graphics/hs-HGL/pkg-descr8
-rw-r--r--graphics/hs-JuicyPixels/Makefile3
-rw-r--r--graphics/hs-JuicyPixels/distinfo6
-rw-r--r--graphics/hs-cairo/Makefile5
-rw-r--r--graphics/hs-cairo/distinfo6
-rw-r--r--graphics/hs-dia-base/Makefile2
-rw-r--r--graphics/hs-dia-base/files/patch-dia-base.cabal10
-rw-r--r--graphics/hs-dia-functions/Makefile2
-rw-r--r--graphics/hs-graphviz/Makefile4
-rw-r--r--graphics/hs-svgcairo/Makefile4
-rw-r--r--lang/ghc/Makefile57
-rw-r--r--lang/ghc/bsd.cabal.options.mk4
-rw-r--r--lang/ghc/bsd.hackage.mk27
-rw-r--r--lang/ghc/distinfo18
-rw-r--r--lang/ghc/files/patch-compiler_main_SysTools.hs12
-rw-r--r--lang/ghc/files/patch-configure.ac22
-rw-r--r--lang/ghc/files/patch-ghc.mk10
-rw-r--r--lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h22
-rw-r--r--lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs11
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs12
-rw-r--r--lang/ghc/files/patch-rts_Linker.c11
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-unlambda/Makefile2
-rw-r--r--mail/hs-email-validate/Makefile3
-rw-r--r--mail/hs-email-validate/distinfo6
-rw-r--r--mail/hs-mime-mail/Makefile6
-rw-r--r--mail/hs-mime-mail/distinfo6
-rw-r--r--mail/hs-mime-types/Makefile4
-rw-r--r--mail/hs-mime/Makefile4
-rw-r--r--math/hs-Agda-stdlib/Makefile2
-rw-r--r--math/hs-Agda/Makefile6
-rw-r--r--math/hs-NumInstances/Makefile2
-rw-r--r--math/hs-adjunctions/Makefile3
-rw-r--r--math/hs-adjunctions/distinfo6
-rw-r--r--math/hs-categories/Makefile2
-rw-r--r--math/hs-comonad/Makefile3
-rw-r--r--math/hs-comonad/distinfo6
-rw-r--r--math/hs-contravariant/Makefile2
-rw-r--r--math/hs-data-lens-template/files/patch-data-lens-template.cabal11
-rw-r--r--math/hs-data-lens/Makefile2
-rw-r--r--math/hs-distributive/Makefile3
-rw-r--r--math/hs-distributive/distinfo6
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-fixed/Makefile2
-rw-r--r--math/hs-half/Makefile2
-rw-r--r--math/hs-ieee754/Makefile2
-rw-r--r--math/hs-integer-logarithms/Makefile3
-rw-r--r--math/hs-integer-logarithms/distinfo6
-rw-r--r--math/hs-kan-extensions/Makefile3
-rw-r--r--math/hs-kan-extensions/distinfo6
-rw-r--r--math/hs-kan-extensions/files/patch-kan-extensions.cabal8
-rw-r--r--math/hs-math-functions/Makefile2
-rw-r--r--math/hs-mwc-random/Makefile2
-rw-r--r--math/hs-pointed/Makefile7
-rw-r--r--math/hs-probability/Makefile2
-rw-r--r--math/hs-semigroupoids/Makefile3
-rw-r--r--math/hs-semigroupoids/distinfo6
-rw-r--r--math/hs-semigroups/Makefile5
-rw-r--r--math/hs-semigroups/distinfo6
-rw-r--r--math/hs-statistics/Makefile2
-rw-r--r--math/hs-vector-space/Makefile3
-rw-r--r--math/hs-vector-space/distinfo6
-rw-r--r--net-im/hs-haskell-xmpp/Makefile4
-rw-r--r--net-p2p/hs-torrent/Makefile2
-rw-r--r--net/Makefile2
-rw-r--r--net/hs-aws/Makefile7
-rw-r--r--net/hs-aws/distinfo6
-rw-r--r--net/hs-aws/files/patch-aws.cabal11
-rw-r--r--net/hs-bsb-http-chunked/Makefile13
-rw-r--r--net/hs-bsb-http-chunked/distinfo3
-rw-r--r--net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal9
-rw-r--r--net/hs-bsb-http-chunked/pkg-descr4
-rw-r--r--net/hs-connection/Makefile2
-rw-r--r--net/hs-gsasl/Makefile2
-rw-r--r--net/hs-hoauth2/Makefile7
-rw-r--r--net/hs-hoauth2/distinfo6
-rw-r--r--net/hs-hoauth2/files/patch-hoauth2.cabal97
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-iproute/Makefile2
-rw-r--r--net/hs-maccatcher/Makefile4
-rw-r--r--net/hs-network-info/Makefile2
-rw-r--r--net/hs-network-multicast/Makefile2
-rw-r--r--net/hs-network-protocol-xmpp/Makefile4
-rw-r--r--net/hs-network-uri/Makefile4
-rw-r--r--net/hs-network/Makefile2
-rw-r--r--net/hs-pcap/Makefile2
-rw-r--r--net/hs-publicsuffixlist/Makefile4
-rw-r--r--net/hs-resolv/Makefile15
-rw-r--r--net/hs-resolv/distinfo3
-rw-r--r--net/hs-resolv/files/patch-resolv.cabal11
-rw-r--r--net/hs-resolv/pkg-descr5
-rw-r--r--net/hs-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/Makefile2
-rw-r--r--net/hs-socks/Makefile2
-rw-r--r--ports-mgmt/hs-porte/Makefile2
-rw-r--r--print/hs-hscolour/Makefile1
-rw-r--r--print/hs-hscolour/distinfo6
-rw-r--r--science/Makefile1
-rw-r--r--science/hs-bio/Makefile19
-rw-r--r--science/hs-bio/distinfo2
-rw-r--r--science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs7
-rw-r--r--science/hs-bio/files/patch-bio.cabal11
-rw-r--r--science/hs-bio/pkg-descr13
-rw-r--r--security/Makefile1
-rw-r--r--security/hs-Crypto/Makefile2
-rw-r--r--security/hs-DRBG/Makefile2
-rw-r--r--security/hs-HsOpenSSL/Makefile3
-rw-r--r--security/hs-HsOpenSSL/distinfo6
-rw-r--r--security/hs-RSA/Makefile2
-rw-r--r--security/hs-SHA/Makefile2
-rw-r--r--security/hs-certificate/Makefile2
-rw-r--r--security/hs-cipher-aes/Makefile2
-rw-r--r--security/hs-cipher-aes128/Makefile2
-rw-r--r--security/hs-cipher-blowfish/Makefile2
-rw-r--r--security/hs-cipher-camellia/Makefile2
-rw-r--r--security/hs-cipher-des/Makefile2
-rw-r--r--security/hs-cipher-rc4/Makefile2
-rw-r--r--security/hs-clientsession/Makefile2
-rw-r--r--security/hs-cprng-aes/Makefile2
-rw-r--r--security/hs-crypto-api/Makefile2
-rw-r--r--security/hs-crypto-cipher-types/Makefile2
-rw-r--r--security/hs-crypto-conduit/files/patch-crypto-conduit.cabal7
-rw-r--r--security/hs-crypto-numbers/Makefile2
-rw-r--r--security/hs-crypto-pubkey-types/Makefile2
-rw-r--r--security/hs-crypto-pubkey/Makefile2
-rw-r--r--security/hs-crypto-random-api/Makefile2
-rw-r--r--security/hs-crypto-random/Makefile2
-rw-r--r--security/hs-cryptocipher/Makefile2
-rw-r--r--security/hs-cryptohash-conduit/Makefile2
-rw-r--r--security/hs-cryptohash-cryptoapi/Makefile2
-rw-r--r--security/hs-cryptohash-md5/Makefile2
-rw-r--r--security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal11
-rw-r--r--security/hs-cryptohash-sha1/Makefile14
-rw-r--r--security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal11
-rw-r--r--security/hs-cryptohash-sha256/Makefile13
-rw-r--r--security/hs-cryptohash-sha256/distinfo6
-rw-r--r--security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal11
-rw-r--r--security/hs-cryptohash/Makefile2
-rw-r--r--security/hs-cryptonite-conduit/Makefile15
-rw-r--r--security/hs-cryptonite-conduit/distinfo3
-rw-r--r--security/hs-cryptonite-conduit/pkg-descr5
-rw-r--r--security/hs-cryptonite/Makefile2
-rw-r--r--security/hs-digest/Makefile2
-rw-r--r--security/hs-ed25519/Makefile2
-rw-r--r--security/hs-entropy/Makefile2
-rw-r--r--security/hs-gnutls/Makefile2
-rw-r--r--security/hs-hackage-security/Makefile5
-rw-r--r--security/hs-hackage-security/distinfo6
-rw-r--r--security/hs-hackage-security/files/patch-hackage-security.cabal10
-rw-r--r--security/hs-monadcryptorandom/Makefile3
-rw-r--r--security/hs-monadcryptorandom/distinfo6
-rw-r--r--security/hs-nonce/Makefile6
-rw-r--r--security/hs-nonce/distinfo6
-rw-r--r--security/hs-pem/Makefile2
-rw-r--r--security/hs-pureMD5/Makefile2
-rw-r--r--security/hs-pwstore-fast/Makefile2
-rw-r--r--security/hs-skein/Makefile2
-rw-r--r--security/hs-tls-session-manager/Makefile2
-rw-r--r--security/hs-tls/Makefile3
-rw-r--r--security/hs-tls/distinfo6
-rw-r--r--security/hs-x509-store/Makefile3
-rw-r--r--security/hs-x509-store/distinfo6
-rw-r--r--security/hs-x509-system/Makefile3
-rw-r--r--security/hs-x509-system/distinfo6
-rw-r--r--security/hs-x509-validation/Makefile3
-rw-r--r--security/hs-x509-validation/distinfo6
-rw-r--r--security/hs-x509/Makefile3
-rw-r--r--security/hs-x509/distinfo6
-rw-r--r--shells/hs-shelly/Makefile5
-rw-r--r--shells/hs-shelly/distinfo6
-rw-r--r--sysutils/hs-angel/Makefile4
-rw-r--r--sysutils/hs-cpu/Makefile2
-rw-r--r--sysutils/hs-disk-free-space/Makefile2
-rw-r--r--sysutils/hs-ekg-core/Makefile5
-rw-r--r--sysutils/hs-ekg-core/distinfo6
-rw-r--r--sysutils/hs-ekg-core/files/patch-ekg-core.cabal11
-rw-r--r--sysutils/hs-ekg-json/Makefile5
-rw-r--r--sysutils/hs-ekg-json/distinfo6
-rw-r--r--sysutils/hs-ekg-json/files/patch-ekg-json.cabal13
-rw-r--r--sysutils/hs-ekg/Makefile5
-rw-r--r--sysutils/hs-ekg/distinfo6
-rw-r--r--sysutils/hs-ekg/files/patch-ekg.cabal11
-rw-r--r--sysutils/hs-mountpoints/Makefile2
-rw-r--r--textproc/Makefile4
-rw-r--r--textproc/cgrep/Makefile33
-rw-r--r--textproc/cgrep/distinfo5
-rw-r--r--textproc/cgrep/files/patch-src_Main.hs32
-rw-r--r--textproc/cgrep/pkg-plist2
-rw-r--r--textproc/hs-Diff/Makefile2
-rw-r--r--textproc/hs-HStringTemplate/Makefile5
-rw-r--r--textproc/hs-HStringTemplate/distinfo6
-rw-r--r--textproc/hs-HaXml/Makefile2
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile4
-rw-r--r--textproc/hs-attoparsec-iso8601/Makefile4
-rw-r--r--textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal10
-rw-r--r--textproc/hs-attoparsec/Makefile5
-rw-r--r--textproc/hs-attoparsec/distinfo6
-rw-r--r--textproc/hs-bencode/Makefile4
-rw-r--r--textproc/hs-blaze-html/Makefile4
-rw-r--r--textproc/hs-blaze-markup/Makefile5
-rw-r--r--textproc/hs-blaze-markup/distinfo6
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile5
-rw-r--r--textproc/hs-case-insensitive/distinfo6
-rw-r--r--textproc/hs-cassava/Makefile5
-rw-r--r--textproc/hs-cassava/distinfo6
-rw-r--r--textproc/hs-cmark-gfm/Makefile13
-rw-r--r--textproc/hs-cmark-gfm/distinfo3
-rw-r--r--textproc/hs-cmark-gfm/pkg-descr6
-rw-r--r--textproc/hs-cmark/Makefile5
-rw-r--r--textproc/hs-cmark/distinfo6
-rw-r--r--textproc/hs-csv/Makefile4
-rw-r--r--textproc/hs-doctemplates/Makefile7
-rw-r--r--textproc/hs-doctemplates/distinfo6
-rw-r--r--textproc/hs-double-conversion/Makefile9
-rw-r--r--textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal12
-rw-r--r--textproc/hs-feed/Makefile8
-rw-r--r--textproc/hs-feed/distinfo6
-rw-r--r--textproc/hs-feed/files/patch-feed.cabal31
-rw-r--r--textproc/hs-hexpat/Makefile4
-rw-r--r--textproc/hs-highlighting-kate/Makefile6
-rw-r--r--textproc/hs-hs-bibutils/Makefile3
-rw-r--r--textproc/hs-hs-bibutils/distinfo6
-rw-r--r--textproc/hs-html-conduit/Makefile5
-rw-r--r--textproc/hs-html-conduit/distinfo6
-rw-r--r--textproc/hs-html-conduit/files/patch-html-conduit.cabal11
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile4
-rw-r--r--textproc/hs-hxt-unicode/Makefile2
-rw-r--r--textproc/hs-hxt/Makefile5
-rw-r--r--textproc/hs-lhs2tex/Makefile3
-rw-r--r--textproc/hs-lhs2tex/distinfo6
-rw-r--r--textproc/hs-lhs2tex/files/patch-Setup.hs8
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Document.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Main.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Math.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_NewCode.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs10
-rw-r--r--textproc/hs-libxml-sax/Makefile4
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-magic/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile7
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo6
-rw-r--r--textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal38
-rw-r--r--textproc/hs-pandoc-types/Makefile4
-rw-r--r--textproc/hs-pandoc-types/distinfo6
-rw-r--r--textproc/hs-pandoc-types/files/patch-pandoc-types.cabal24
-rw-r--r--textproc/hs-pandoc/Makefile17
-rw-r--r--textproc/hs-pandoc/distinfo6
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal83
-rw-r--r--textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs14
-rw-r--r--textproc/hs-parsec/distinfo3
-rw-r--r--textproc/hs-parsec/pkg-descr7
-rw-r--r--textproc/hs-polyparse/Makefile4
-rw-r--r--textproc/hs-pretty-show/Makefile3
-rw-r--r--textproc/hs-pretty-show/distinfo6
-rw-r--r--textproc/hs-regex-applicative/Makefile2
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile2
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-pcre/Makefile2
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-tdfa/Makefile5
-rw-r--r--textproc/hs-regex-tdfa/distinfo6
-rw-r--r--textproc/hs-rfc5051/Makefile2
-rw-r--r--textproc/hs-scanner/Makefile2
-rw-r--r--textproc/hs-skylighting-core/Makefile16
-rw-r--r--textproc/hs-skylighting-core/distinfo3
-rw-r--r--textproc/hs-skylighting-core/pkg-descr7
-rw-r--r--textproc/hs-skylighting/Makefile8
-rw-r--r--textproc/hs-skylighting/distinfo6
-rw-r--r--textproc/hs-stringsearch/Makefile2
-rw-r--r--textproc/hs-tagsoup/Makefile5
-rw-r--r--textproc/hs-tagsoup/distinfo6
-rw-r--r--textproc/hs-tagstream-conduit/Makefile4
-rw-r--r--textproc/hs-texmath/Makefile6
-rw-r--r--textproc/hs-texmath/distinfo6
-rw-r--r--textproc/hs-texmath/files/patch-texmath.cabal20
-rw-r--r--textproc/hs-uri-bytestring-aeson/Makefile5
-rw-r--r--textproc/hs-uri-bytestring-aeson/distinfo6
-rw-r--r--textproc/hs-uri-bytestring/Makefile3
-rw-r--r--textproc/hs-uri-bytestring/distinfo6
-rw-r--r--textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal10
-rw-r--r--textproc/hs-uri-encode/Makefile (renamed from textproc/hs-parsec/Makefile)9
-rw-r--r--textproc/hs-uri-encode/distinfo3
-rw-r--r--textproc/hs-uri-encode/pkg-descr3
-rw-r--r--textproc/hs-uri/Makefile4
-rw-r--r--textproc/hs-xml-conduit/Makefile5
-rw-r--r--textproc/hs-xml-conduit/distinfo6
-rw-r--r--textproc/hs-xml-hamlet/Makefile5
-rw-r--r--textproc/hs-xml-hamlet/distinfo6
-rw-r--r--textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal11
-rw-r--r--textproc/hs-xml-types/Makefile4
-rw-r--r--textproc/hs-xml/Makefile4
-rw-r--r--textproc/hs-xmlhtml/Makefile6
-rw-r--r--textproc/hs-xmlhtml/distinfo6
-rw-r--r--textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs30
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal17
-rw-r--r--textproc/hs-yaml/Makefile7
-rw-r--r--textproc/hs-yaml/distinfo6
-rw-r--r--www/hs-DAV/Makefile3
-rw-r--r--www/hs-DAV/distinfo6
-rw-r--r--www/hs-HTTP/Makefile6
-rw-r--r--www/hs-HTTP/distinfo6
-rw-r--r--www/hs-activehs/Makefile4
-rw-r--r--www/hs-authenticate/Makefile5
-rw-r--r--www/hs-authenticate/distinfo6
-rw-r--r--www/hs-cgi/Makefile4
-rw-r--r--www/hs-cgi/files/patch-cgi.cabal16
-rw-r--r--www/hs-cookie/Makefile5
-rw-r--r--www/hs-cookie/distinfo6
-rw-r--r--www/hs-css-text/Makefile5
-rw-r--r--www/hs-css-text/distinfo6
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-gitit/Makefile8
-rw-r--r--www/hs-hS3/Makefile2
-rw-r--r--www/hs-happstack-server/Makefile9
-rw-r--r--www/hs-happstack-server/distinfo6
-rw-r--r--www/hs-happstack/Makefile2
-rw-r--r--www/hs-heist/Makefile5
-rw-r--r--www/hs-heist/distinfo6
-rw-r--r--www/hs-heist/files/patch-heist.cabal29
-rw-r--r--www/hs-hjsmin/Makefile4
-rw-r--r--www/hs-http-api-data/Makefile7
-rw-r--r--www/hs-http-api-data/distinfo6
-rw-r--r--www/hs-http-client-tls/Makefile2
-rw-r--r--www/hs-http-client/Makefile7
-rw-r--r--www/hs-http-client/distinfo6
-rw-r--r--www/hs-http-conduit/Makefile3
-rw-r--r--www/hs-http-conduit/distinfo6
-rw-r--r--www/hs-http-date/Makefile2
-rw-r--r--www/hs-http-reverse-proxy/Makefile5
-rw-r--r--www/hs-http-reverse-proxy/distinfo6
-rw-r--r--www/hs-http-server/Makefile4
-rw-r--r--www/hs-http-types/Makefile5
-rw-r--r--www/hs-http-types/distinfo6
-rw-r--r--www/hs-http2/Makefile4
-rw-r--r--www/hs-multipart/Makefile4
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-path-pieces/Makefile4
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo6
-rw-r--r--www/hs-snap-core/Makefile5
-rw-r--r--www/hs-snap-core/distinfo6
-rw-r--r--www/hs-snap-server/Makefile5
-rw-r--r--www/hs-snap-server/distinfo6
-rw-r--r--www/hs-snap/Makefile6
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-wai-app-static/Makefile5
-rw-r--r--www/hs-wai-app-static/distinfo6
-rw-r--r--www/hs-wai-extra/Makefile5
-rw-r--r--www/hs-wai-extra/distinfo6
-rw-r--r--www/hs-wai-logger/Makefile3
-rw-r--r--www/hs-wai-logger/distinfo6
-rw-r--r--www/hs-wai/Makefile5
-rw-r--r--www/hs-wai/distinfo6
-rw-r--r--www/hs-wai/files/patch-wai.cabal10
-rw-r--r--www/hs-warp-tls/Makefile2
-rw-r--r--www/hs-warp/Makefile9
-rw-r--r--www/hs-warp/distinfo6
-rw-r--r--www/hs-warp/files/patch-warp.cabal18
-rw-r--r--www/hs-webkit/Makefile4
-rw-r--r--www/hs-xss-sanitize/Makefile4
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile5
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo6
-rw-r--r--www/hs-yesod-auth/Makefile5
-rw-r--r--www/hs-yesod-auth/distinfo6
-rw-r--r--www/hs-yesod-bin/Makefile8
-rw-r--r--www/hs-yesod-core/Makefile7
-rw-r--r--www/hs-yesod-core/distinfo6
-rw-r--r--www/hs-yesod-form/Makefile5
-rw-r--r--www/hs-yesod-form/distinfo6
-rw-r--r--www/hs-yesod-persistent/Makefile3
-rw-r--r--www/hs-yesod-persistent/distinfo6
-rw-r--r--www/hs-yesod-persistent/files/patch-yesod-persistent.cabal13
-rw-r--r--www/hs-yesod-static/Makefile13
-rw-r--r--www/hs-yesod-static/distinfo6
-rw-r--r--www/hs-yesod-test/Makefile5
-rw-r--r--www/hs-yesod-test/distinfo6
-rw-r--r--www/hs-yesod/Makefile5
-rw-r--r--www/hs-yesod/distinfo6
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile3
-rw-r--r--x11-toolkits/hs-GLURaw/distinfo6
-rw-r--r--x11-toolkits/hs-GLUT/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile6
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo6
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile5
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo6
-rw-r--r--x11-toolkits/hs-gtk/Makefile5
-rw-r--r--x11-toolkits/hs-gtk/distinfo6
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/hs-pango/Makefile5
-rw-r--r--x11-toolkits/hs-pango/distinfo6
-rw-r--r--x11-toolkits/hs-vte/Makefile2
-rw-r--r--x11-toolkits/hs-wx/Makefile4
-rw-r--r--x11-toolkits/hs-wxc/Makefile2
-rw-r--r--x11-toolkits/hs-wxcore/Makefile4
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile4
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal11
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile4
-rw-r--r--x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support95
-rw-r--r--x11-wm/hs-xmonad/Makefile4
-rw-r--r--x11-wm/hs-xmonad/files/patch-8.4.1-support61
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile2
-rw-r--r--x11/hs-xmobar/Makefile5
-rw-r--r--x11/hs-xmobar/distinfo6
930 files changed, 2736 insertions, 2721 deletions
diff --git a/MOVED b/MOVED
index d48087a6fc4d..c640a6dc6137 100644
--- a/MOVED
+++ b/MOVED
@@ -10198,3 +10198,6 @@ editors/lazarus-lcl-qt|editors/lazarus-qt4|2018-05-25|Removed, no longer needed
editors/lazarus-lcl-qt5|editors/lazarus-qt5|2018-05-25|Removed, no longer needed
editors/lazarus-lcl-units||2018-05-25|Removed, no longer needed
net/bird-devel|net/bird2|2018-05-25|There are now muliple versions of bird
+devel/hs-BNFC||2018-05-25|Removed, no longer supported
+graphics/hs-HGL||2018-05-25|Removed, no longer supported
+devel/hs-DrIFT||2018-05-25|Removed, no longer supported
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index b1d2dcc1281c..7cec31e24b93 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tar
-PORTVERSION= 0.5.0.3
-PORTREVISION= 1
+PORTVERSION= 0.5.1.0
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo
index 9ac9e98c54a1..265e3e449909 100644
--- a/archivers/hs-tar/distinfo
+++ b/archivers/hs-tar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499611841
-SHA256 (cabal/tar-0.5.0.3.tar.gz) = d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3
-SIZE (cabal/tar-0.5.0.3.tar.gz) = 38764
+TIMESTAMP = 1523301281
+SHA256 (cabal/tar-0.5.1.0.tar.gz) = c89d697b6472b739db50e61201251fcaf8a8f5b595b1d9a488d395d7d5ce4b68
+SIZE (cabal/tar-0.5.1.0.tar.gz) = 39271
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index bb92a4b4bcf4..a7ba4930d77a 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.3.1.1
-PORTREVISION= 1
+PORTVERSION= 0.3.2.4
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Library for creating and modifying zip archives
LICENSE= BSD3CLAUSE
-USE_CABAL= digest>=0.0.0.1 mtl old-time text>=0.11 zlib
+USE_CABAL= digest>=0.0.0.1 mtl old-time zlib
FLAGS_DEFINE= EXECUTABLE
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 07ec19cd0301..33032289f8d2 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499611845
-SHA256 (cabal/zip-archive-0.3.1.1.tar.gz) = 9e868e649e6fd06cf50c2f0f1e480ce36640494449e415abf2509f9347f08325
-SIZE (cabal/zip-archive-0.3.1.1.tar.gz) = 16107
+TIMESTAMP = 1523638345
+SHA256 (cabal/zip-archive-0.3.2.4.tar.gz) = 20612ed34d8d14deef120440c75f951a5c92c9f39f0de1b82ebac6d5923b3785
+SIZE (cabal/zip-archive-0.3.2.4.tar.gz) = 18370
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 074d319055a8..d9af93895218 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 9577dc2c6550..998024bd12b4 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index f4a7257f59eb..e8b011890f56 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zlib
PORTVERSION= 0.6.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index b030d6a25cd8..b1d6ec6c94e9 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ALUT
PORTVERSION= 2.4.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index a19b94fbd14a..8b8dc555c08a 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenAL
PORTVERSION= 1.7.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index 6f3461255784..e83ac6a635ce 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.9.0.6
-PORTREVISION= 1
+PORTVERSION= 0.9.0.8
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= MPD client library
LICENSE= MIT
USE_CABAL= attoparsec>=0.10.1 data-default-class>=0.0.1 mtl>=2.0 \
- network>=2.1 old-locale>=1.0 text>=0.11 utf8-string>=0.3.1
+ network>=2.1 old-locale>=1.0 utf8-string>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 6a36eac296bd..4a520cedd255 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538914
-SHA256 (cabal/libmpd-0.9.0.6.tar.gz) = bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937
-SIZE (cabal/libmpd-0.9.0.6.tar.gz) = 38707
+TIMESTAMP = 1524150587
+SHA256 (cabal/libmpd-0.9.0.8.tar.gz) = 582b0a405e39148d3a5046e8ad00c9e217688e60c70393eb36cd651e1991ed4e
+SIZE (cabal/libmpd-0.9.0.8.tar.gz) = 38932
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 550b7f6bfc80..c35b25cb3bdf 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.4.1.0
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,10 @@ COMMENT= Robust, reliable performance measurement and analysis
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson ansi-wl-pprint base-compat cassava code-page \
- exceptions Glob js-flot js-jquery microstache mtl mwc-random \
- optparse-applicative parsec statistics text transformers-compat \
- vector vector-algorithms
+USE_CABAL= aeson ansi-wl-pprint base-compat base-compat-batteries \
+ cassava code-page exceptions Glob js-flot js-jquery \
+ microstache mtl mwc-random optparse-applicative statistics \
+ transformers-compat vector vector-algorithms
INSTALL_PORTEXAMPLES= \
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index c6ecf2f20f28..89a0e29d642b 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499613825
-SHA256 (cabal/criterion-1.2.1.0.tar.gz) = d9f4bb88a8762f91ce305896cd7e964d25f007949f7e05514503eec59ca97041
-SIZE (cabal/criterion-1.2.1.0.tar.gz) = 126663
+TIMESTAMP = 1525009665
+SHA256 (cabal/criterion-1.4.1.0.tar.gz) = c49306676aa7927c3ca3c1807b081d1e86771eb8da99c8391f9c4dacb24a826c
+SIZE (cabal/criterion-1.4.1.0.tar.gz) = 130976
diff --git a/converters/hs-aeson-compat/Makefile b/converters/hs-aeson-compat/Makefile
index 4a0a107ae1ec..e46500b3aa6e 100644
--- a/converters/hs-aeson-compat/Makefile
+++ b/converters/hs-aeson-compat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson-compat
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.7.1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Fast JSON parsing and encoding
LICENSE= BSD3CLAUSE
USE_CABAL= aeson attoparsec attoparsec-iso8601 base-compat exceptions \
- hashable scientific semigroups tagged text time-locale-compat \
+ hashable scientific semigroups tagged time-locale-compat \
unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/converters/hs-aeson-compat/distinfo b/converters/hs-aeson-compat/distinfo
index e22062605592..c857e8367439 100644
--- a/converters/hs-aeson-compat/distinfo
+++ b/converters/hs-aeson-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499691052
-SHA256 (cabal/aeson-compat-0.3.7.tar.gz) = 1bf2c2a3d38caba5d3336757f60702afb5dcac6a77aa3d86c9d55f81e4517c14
-SIZE (cabal/aeson-compat-0.3.7.tar.gz) = 6900
+TIMESTAMP = 1524342688
+SHA256 (cabal/aeson-compat-0.3.7.1.tar.gz) = 59740dc1e37b08e60abb47f38b87de5b9805611a1b468cd18294d5982a1dcacb
+SIZE (cabal/aeson-compat-0.3.7.1.tar.gz) = 6913
diff --git a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
index 8b11ebe2fea3..ece7354ed571 100644
--- a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
+++ b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
@@ -1,18 +1,21 @@
---- aeson-compat.cabal.orig 2017-06-07 12:52:36 UTC
+--- aeson-compat.cabal.orig 2017-07-24 12:29:50 UTC
+++ aeson-compat.cabal
-@@ -42,7 +42,6 @@ library
+@@ -31,14 +31,14 @@ library
+ src
+ ghc-options: -Wall
+ build-depends:
+- base >=4.6 && <4.11
+- , base-compat >=0.6.0 && <0.10
+- , aeson >=0.7.0.6 && <1.3
++ base >=4.6 && <4.12
++ , base-compat >=0.6.0 && <0.11
++ , aeson >=0.7.0.6 && <1.4
+ , attoparsec >=0.12 && <0.14
+ , attoparsec-iso8601 >=1.0.0.0 && <1.1
+ , bytestring >=0.10 && <0.11
, containers >=0.5 && <0.6
- , exceptions >=0.8 && <0.9
+- , exceptions >=0.8 && <0.9
++ , exceptions >=0.8 && <0.11
, hashable >=1.2 && <1.3
-- , nats >=1 && <1.2
, scientific >=0.3 && <0.4
, text >=1.2 && <1.3
- , time >=1.4.2 && <1.9
-@@ -70,7 +69,6 @@ test-suite aeson-compat-test
- , containers
- , exceptions
- , hashable
-- , nats
- , scientific
- , text
- , time
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
index 99584c0638db..a6ac165ca995 100644
--- a/converters/hs-aeson-pretty/Makefile
+++ b/converters/hs-aeson-pretty/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson-pretty
-PORTVERSION= 0.8.5
-PORTREVISION= 1
+PORTVERSION= 0.8.7
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= JSON pretty-printing library and command-line tool
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson attoparsec base-compat cmdargs scientific text \
+USE_CABAL= aeson attoparsec base-compat cmdargs scientific \
unordered-containers vector
FLAGS_DISABLE= lib-only
diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo
index 1ee8ffeee3c1..d47f61e70d91 100644
--- a/converters/hs-aeson-pretty/distinfo
+++ b/converters/hs-aeson-pretty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499545723
-SHA256 (cabal/aeson-pretty-0.8.5.tar.gz) = dd17e86c64b3fe2efb7a855b27b0e5490e42dc58194ae1809d8b662d4e42a9f9
-SIZE (cabal/aeson-pretty-0.8.5.tar.gz) = 5568
+TIMESTAMP = 1524342480
+SHA256 (cabal/aeson-pretty-0.8.7.tar.gz) = c1c1ecc5e3abd004a6c4c256ee6f61da2a43d7f1452ffa391dee250df43b27d5
+SIZE (cabal/aeson-pretty-0.8.7.tar.gz) = 5610
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 9e9e6b74bbfd..eeaf65c73b9b 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.3.1.0
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Fast JSON parsing and encoding
LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.13.0.1 base-compat>=0.9.1 dlist>=0.6 hashable>=1.1.2.0 \
- scientific>=0.3.1 syb tagged text>=1.1.1.0 time-locale-compat>=0.1.1 \
+ scientific>=0.3.1 tagged th-abstraction time-locale-compat>=0.1.1 \
unordered-containers>=0.2.3.0 uuid-types>=1.0.3 vector>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index 5de020c43d3c..b659c49c7de8 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499459814
-SHA256 (cabal/aeson-1.2.1.0.tar.gz) = 96170fdbed9bf52357bd6eada0173c4ae8086df01522ed2b8a070f2f51148a73
-SIZE (cabal/aeson-1.2.1.0.tar.gz) = 272206
+TIMESTAMP = 1523782803
+SHA256 (cabal/aeson-1.3.1.0.tar.gz) = 3977f17b1588bd530755e3517d272024229e72d8a110f15b5b78fc15df6c5652
+SIZE (cabal/aeson-1.3.1.0.tar.gz) = 261732
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 9157131f9646..e259f8724438 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 5940686ca09d..246c0dffdb03 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= json
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.9.2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Support for serialising Haskell to and from JSON
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl parsec syb text
+USE_CABAL= mtl syb
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-json/distinfo b/converters/hs-json/distinfo
index 81625decc0a4..70a6dab8dbe0 100644
--- a/converters/hs-json/distinfo
+++ b/converters/hs-json/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/json-0.9.1.tar.gz) = 96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2
-SIZE (cabal/json-0.9.1.tar.gz) = 22568
+TIMESTAMP = 1523994029
+SHA256 (cabal/json-0.9.2.tar.gz) = e6bb16fa791cc3833ae7b459b7e7885c1c2b11b0d294b7e095287c54fa73738e
+SIZE (cabal/json-0.9.2.tar.gz) = 22650
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
index c348ef67450a..885ca8273b37 100644
--- a/converters/hs-sandi/Makefile
+++ b/converters/hs-sandi/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= sandi
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.4.2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
index d21da2d3c0c8..81db367b0bcd 100644
--- a/converters/hs-sandi/distinfo
+++ b/converters/hs-sandi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499619802
-SHA256 (cabal/sandi-0.4.0.tar.gz) = 40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea
-SIZE (cabal/sandi-0.4.0.tar.gz) = 19319
+TIMESTAMP = 1524431120
+SHA256 (cabal/sandi-0.4.2.tar.gz) = 2bc1fc4f8e71009adc9f38304f63684f2795c31077670214147f261bd2bc7337
+SIZE (cabal/sandi-0.4.2.tar.gz) = 19198
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
index 3101a60bc2f4..9649100342cd 100644
--- a/databases/hs-esqueleto/Makefile
+++ b/databases/hs-esqueleto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= esqueleto
PORTVERSION= 2.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,9 @@ COMMENT= Type-safe EDSL for SQL queries on persistent backends
LICENSE= BSD3CLAUSE
USE_CABAL= blaze-html conduit monad-logger persistent \
- resourcet tagged text unordered-containers
+ resourcet tagged unordered-containers
+
+IGNORE= Doesn't build with recent Persistent
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile
index 25d3d9820360..81ecbe4ddf70 100644
--- a/databases/hs-hedis/Makefile
+++ b/databases/hs-hedis/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hedis
-PORTVERSION= 0.9.8
+PORTVERSION= 0.10.1
PORTREVISION= 1
CATEGORIES= databases haskell
@@ -11,8 +11,8 @@ COMMENT= Client library for the Redis datastore
LICENSE= BSD3CLAUSE
-USE_CABAL= async bytestring-lexing mtl network resource-pool scanner stm \
- text unordered-containers vector
+USE_CABAL= async bytestring-lexing errors HTTP mtl network network-uri \
+ resource-pool scanner unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-hedis/distinfo b/databases/hs-hedis/distinfo
index 45ae6d783f31..399fe1ec2c40 100644
--- a/databases/hs-hedis/distinfo
+++ b/databases/hs-hedis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499619995
-SHA256 (cabal/hedis-0.9.8.tar.gz) = 822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62
-SIZE (cabal/hedis-0.9.8.tar.gz) = 40058
+TIMESTAMP = 1524158122
+SHA256 (cabal/hedis-0.10.1.tar.gz) = 56afcf52d8b32f23a79de7c50bcaf309f0dfd610cceacb6174dfdce0c051f5f7
+SIZE (cabal/hedis-0.10.1.tar.gz) = 42203
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index 40396cde5d5c..510c8306b029 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.1.5
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Low-level MySQL client library
LICENSE= BSD3CLAUSE
-USE_MYSQL= yes
+USES= mysql ssl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo
index 9df0cddfc532..784ee195e863 100644
--- a/databases/hs-mysql/distinfo
+++ b/databases/hs-mysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450806
-SHA256 (cabal/mysql-0.1.4.tar.gz) = 9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e
-SIZE (cabal/mysql-0.1.4.tar.gz) = 16219
+TIMESTAMP = 1524151121
+SHA256 (cabal/mysql-0.1.5.tar.gz) = 49b367d07f6d93fd4cbd08390f83bbf8e40c66156a1d2b0f570b68921e6f3075
+SIZE (cabal/mysql-0.1.5.tar.gz) = 16389
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index 44e8f2f8503e..410c0d24542a 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 2.6.2
-PORTREVISION= 1
+PORTVERSION= 2.8.1.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
USE_CABAL= aeson conduit microlens-th monad-control monad-logger \
- old-locale persistent resource-pool resourcet text \
+ old-locale persistent resource-pool resourcet \
unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 18e946c2798a..0151970acef4 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499620122
-SHA256 (cabal/persistent-sqlite-2.6.2.tar.gz) = 6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf
-SIZE (cabal/persistent-sqlite-2.6.2.tar.gz) = 3568400
+TIMESTAMP = 1525169028
+SHA256 (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2f7157f3830370f60c7c36490ea49b7c52caf0f2a7349f86cf47970189f9ad0c
+SIZE (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2044695
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 15460be92087..5094ba53bfc5 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 2.5.2
-PORTREVISION= 1
+PORTVERSION= 2.5.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
USE_CABAL= aeson aeson-compat http-api-data monad-control monad-logger \
- path-pieces persistent tagged text unordered-containers
+ path-pieces persistent tagged unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 351c8ead4fb0..c2e94a6f3ab5 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499620138
-SHA256 (cabal/persistent-template-2.5.2.tar.gz) = de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011
-SIZE (cabal/persistent-template-2.5.2.tar.gz) = 20403
+TIMESTAMP = 1525178560
+SHA256 (cabal/persistent-template-2.5.4.tar.gz) = 4cae740ce92f98cb3ae9e092e740753394d5687b887399ee5f87af7f3c730a01
+SIZE (cabal/persistent-template-2.5.4.tar.gz) = 21079
diff --git a/databases/hs-persistent-template/files/patch-persistent-template.cabal b/databases/hs-persistent-template/files/patch-persistent-template.cabal
index 9d1b31b66c25..be71582a8075 100644
--- a/databases/hs-persistent-template/files/patch-persistent-template.cabal
+++ b/databases/hs-persistent-template/files/patch-persistent-template.cabal
@@ -1,11 +1,11 @@
---- persistent-template.cabal.orig 2017-07-10 13:31:32 UTC
+--- persistent-template.cabal.orig 2018-05-01 13:03:22 UTC
+++ persistent-template.cabal
@@ -23,7 +23,7 @@ library
, text >= 0.5
, transformers >= 0.2 && < 0.6
, containers
-- , aeson >= 0.7 && < 1.2
-+ , aeson >= 0.7 && < 1.3
+- , aeson >= 0.7 && < 1.3
++ , aeson >= 0.7 && < 1.4
, aeson-compat >= 0.3.2.0 && < 0.4
, monad-logger
, unordered-containers
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 3dca5c1299f6..e4bff1f9a26d 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 2.7.0
-PORTREVISION= 1
+PORTVERSION= 2.8.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +11,10 @@ LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \
- fast-logger>=2.1 http-api-data lifted-base>=0.1 monad-control>=0.3 \
- monad-logger>=0.3 mtl old-locale path-pieces>=0.1 resource-pool \
- resourcet>=1.1 scientific silently tagged text>=0.8 \
- transformers-base unordered-containers vector
+ fast-logger>=2.1 haskell-src-meta http-api-data lifted-base \
+ monad-control>=0.3 monad-logger>=0.3 mtl old-locale \
+ path-pieces>=0.1 resource-pool resourcet>=1.1 scientific \
+ silently tagged transformers-base unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index 2f8e6adf207d..95e379803d48 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499620101
-SHA256 (cabal/persistent-2.7.0.tar.gz) = cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea
-SIZE (cabal/persistent-2.7.0.tar.gz) = 69320
+TIMESTAMP = 1524929752
+SHA256 (cabal/persistent-2.8.2.tar.gz) = 696bb279259e307778dc7fbd49565c48a66429f14e793a41a13cfae0968c1ec0
+SIZE (cabal/persistent-2.8.2.tar.gz) = 58648
diff --git a/deskutils/hs-fdo-notify/Makefile b/deskutils/hs-fdo-notify/Makefile
index 16b243000251..8415fa9e582d 100644
--- a/deskutils/hs-fdo-notify/Makefile
+++ b/deskutils/hs-fdo-notify/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fdo-notify
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index 01252e0421d5..8b4826eb8d7f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -914,11 +914,9 @@
SUBDIR += horde-whups
SUBDIR += hp48cc
SUBDIR += hp48xgcc
- SUBDIR += hs-BNFC
SUBDIR += hs-Boolean
SUBDIR += hs-BoundedChan
SUBDIR += hs-ConfigFile
- SUBDIR += hs-DrIFT
SUBDIR += hs-EdisonAPI
SUBDIR += hs-EdisonCore
SUBDIR += hs-Glob
@@ -955,10 +953,12 @@
SUBDIR += hs-atomic-primops
SUBDIR += hs-auto-update
SUBDIR += hs-base-compat
+ SUBDIR += hs-base-compat-batteries
SUBDIR += hs-base-orphans
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
+ SUBDIR += hs-basement
SUBDIR += hs-basic-prelude
SUBDIR += hs-bifunctors
SUBDIR += hs-bits-atomic
@@ -1013,6 +1013,7 @@
SUBDIR += hs-dlist
SUBDIR += hs-dlist-instances
SUBDIR += hs-easy-file
+ SUBDIR += hs-echo
SUBDIR += hs-edit-distance
SUBDIR += hs-either
SUBDIR += hs-enclosed-exceptions
@@ -1052,8 +1053,8 @@
SUBDIR += hs-haskell-lexer
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
+ SUBDIR += hs-haskell-src-meta
SUBDIR += hs-hasktags
- SUBDIR += hs-hastache
SUBDIR += hs-hex
SUBDIR += hs-hinotify
SUBDIR += hs-hint
@@ -1064,6 +1065,7 @@
SUBDIR += hs-hsb2hs
SUBDIR += hs-hslogger
SUBDIR += hs-hslua
+ SUBDIR += hs-hslua-module-text
SUBDIR += hs-hspec
SUBDIR += hs-hspec-core
SUBDIR += hs-hspec-discover
@@ -1095,7 +1097,6 @@
SUBDIR += hs-monad-par
SUBDIR += hs-monad-par-extras
SUBDIR += hs-monad-unlift
- SUBDIR += hs-monadplus
SUBDIR += hs-monads-tf
SUBDIR += hs-mono-traversable
SUBDIR += hs-mono-traversable-instances
@@ -1140,8 +1141,9 @@
SUBDIR += hs-simple-reflect
SUBDIR += hs-smallcheck
SUBDIR += hs-split
- SUBDIR += hs-stm
SUBDIR += hs-stm-chans
+ SUBDIR += hs-storable-record
+ SUBDIR += hs-storable-tuple
SUBDIR += hs-streaming-commons
SUBDIR += hs-strict
SUBDIR += hs-syb
@@ -1154,13 +1156,15 @@
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
- SUBDIR += hs-text
SUBDIR += hs-text-icu
SUBDIR += hs-text-short
SUBDIR += hs-tf-random
SUBDIR += hs-th-abstraction
+ SUBDIR += hs-th-expand-syns
SUBDIR += hs-th-lift
SUBDIR += hs-th-lift-instances
+ SUBDIR += hs-th-orphans
+ SUBDIR += hs-th-reify-many
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
@@ -1175,6 +1179,9 @@
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
SUBDIR += hs-unix-time
+ SUBDIR += hs-unliftio
+ SUBDIR += hs-unliftio-core
+ SUBDIR += hs-unicode-show
SUBDIR += hs-unordered-containers
SUBDIR += hs-utf8-light
SUBDIR += hs-utf8-string
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
deleted file mode 100644
index 64d5afacbff2..000000000000
--- a/devel/hs-BNFC/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Kai Wang <kaiw27@gmail.com>
-# $FreeBSD$
-
-PORTNAME= BNFC
-PORTVERSION= 2.8.1
-PORTREVISION= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Compiler front-end generator
-
-LICENSE= GPLv2
-
-USE_CABAL= mtl
-USE_ALEX= yes
-USE_HAPPY= yes
-
-EXECUTABLE= bnfc
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
deleted file mode 100644
index 2ef77ad5a36d..000000000000
--- a/devel/hs-BNFC/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499627811
-SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920
-SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015
diff --git a/devel/hs-BNFC/pkg-descr b/devel/hs-BNFC/pkg-descr
deleted file mode 100644
index 52774eaa606d..000000000000
--- a/devel/hs-BNFC/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-The BNF Converter is a compiler construction tool generating a compiler
-front-end from a Labelled BNF grammar. It was originally written to generate
-Haskell, but starting from Version 2.0, it can also be used for generating
-Java, C++, and C. Given a Labelled BNF grammar the tool produces: an
-abstract syntax as a Haskell/C++/C module or Java directory, a case skeleton
-for the abstract syntax in the same language, an Alex, JLex, or Flex lexer
-generator file, a Happy, CUP, or Bison parser generator file, a pretty-printer
-as a Haskell/Java/C++/C module, a Latex file containing a readable
-specification of the language.
-
-WWW: http://bnfc.digitalgrammars.com/
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index d2ca5c28ff5b..ac1967116ea3 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Boolean
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index a8057714c8c1..1c76649d13bf 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 844307c37d4a..e2801ff68eef 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Configuration file reading and writing
LICENSE= BSD3CLAUSE
-USE_CABAL= MissingH>=1.0.0 mtl parsec
+USE_CABAL= MissingH>=1.0.0 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo
deleted file mode 100644
index bfedcf3f127c..000000000000
--- a/devel/hs-DrIFT/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499627812
-SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0
-SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676
diff --git a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
deleted file mode 100644
index 19cfa80fac8d..000000000000
--- a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/ParseLib2.hs.orig 2013-11-11 15:22:00 UTC
-+++ src/ParseLib2.hs
-@@ -32,6 +32,7 @@ module ParseLib2
- opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
-
- import Data.Char
-+import Control.Applicative (Alternative, empty, (<|>))
- import Control.Monad
-
- infixr 5 +++
-@@ -62,6 +63,14 @@ instance MonadPlus Parser where
- -- mplus :: Parser a -> Parser a -> Parser a
- (P p) `mplus` (P q) = P (\pos inp -> (p pos inp ++ q pos inp))
-
-+instance Applicative Parser where
-+ pure = return
-+ (<*>) = ap
-+
-+instance Alternative Parser where
-+ empty = mzero
-+ (<|>) = mplus
-+
- -- bits which donn't fit into Haskell's type classes just yet :-(
-
- env :: Parser Pos
diff --git a/devel/hs-DrIFT/pkg-descr b/devel/hs-DrIFT/pkg-descr
deleted file mode 100644
index 74154e989adb..000000000000
--- a/devel/hs-DrIFT/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-DrIFT is a type sensitive preprocessor for Haskell. It extracts type
-declarations and directives from modules. The directives cause rules to
-be fired on the parsed type declarations, generating new code which is
-then appended to the bottom of the input file. The rules are expressed
-as Haskell code, and it is intended that the user can add new rules as
-required. DrIFT automates instance derivation for classes that aren't
-supported by the standard compilers. In addition, instances can be
-produced in separate modules to that containing the type declaration.
-This allows instances to be derived for a type after the original module
-has been compiled. As a bonus, simple utility functions can also be
-produced from a type.
-
-WWW: http://repetae.net/computer/haskell/DrIFT/
diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile
index 706e6c05dd5c..3a3fb87e44b8 100644
--- a/devel/hs-EdisonAPI/Makefile
+++ b/devel/hs-EdisonAPI/Makefile
@@ -2,7 +2,7 @@
PORTNAME= EdisonAPI
PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile
index 4b6aa5af2ca5..c844423fc403 100644
--- a/devel/hs-EdisonCore/Makefile
+++ b/devel/hs-EdisonCore/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= EdisonCore
-PORTVERSION= 1.3.1.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A library of efficent, purely-functional data structures (Core Implementations)
-USE_CABAL= EdisonAPI mtl QuickCheck
+LICENSE= MIT
+
+USE_CABAL= EdisonAPI mtl semigroups QuickCheck
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-EdisonCore/distinfo b/devel/hs-EdisonCore/distinfo
index 539ff6b5ab70..fe96dc6c9d48 100644
--- a/devel/hs-EdisonCore/distinfo
+++ b/devel/hs-EdisonCore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500996696
-SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b
-SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699
+TIMESTAMP = 1523469795
+SHA256 (cabal/EdisonCore-1.3.2.1.tar.gz) = 73c6014d07107a9ed21df76a59f70c9d68d64ac84cced35f7b628f1d792cf239
+SIZE (cabal/EdisonCore-1.3.2.1.tar.gz) = 82522
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index c17b8950f8af..de9b839e8bad 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Glob
PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 81f967b0ef91..71f1fde0f14d 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HUnit
PORTVERSION= 1.6.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 7b42733e699d..efac3892067e 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index c5ac8d85fde0..eca883d0e201 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= List
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index c9acc7f2cffd..df1c4c11899c 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627813
-SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889
-SIZE (cabal/List-0.6.0.tar.gz) = 6189
+TIMESTAMP = 1523654714
+SHA256 (cabal/List-0.6.2.tar.gz) = c4b92be1202fc59112018f76d5b17cd3a659ebc36384a46e000ab2fbaf99b878
+SIZE (cabal/List-0.6.2.tar.gz) = 7128
diff --git a/devel/hs-ListLike/Makefile b/devel/hs-ListLike/Makefile
index 1bd733adefe5..dcd6b5d2a9d5 100644
--- a/devel/hs-ListLike/Makefile
+++ b/devel/hs-ListLike/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ListLike
-PORTVERSION= 4.5.1
-PORTREVISION= 1
+PORTVERSION= 4.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Generic support for list-like structures in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= dlist fmlist text utf8-string vector
+USE_CABAL= dlist fmlist primitive utf8-string vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ListLike/distinfo b/devel/hs-ListLike/distinfo
index 010c4cdb2e97..97543316c3d6 100644
--- a/devel/hs-ListLike/distinfo
+++ b/devel/hs-ListLike/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499719758
-SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d
-SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600
+TIMESTAMP = 1523448782
+SHA256 (cabal/ListLike-4.6.tar.gz) = c1cdec79a5f585a5839eea26a2afe6a37aab5ed2f402a16e7d59fe9a4e925a9a
+SIZE (cabal/ListLike-4.6.tar.gz) = 30544
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index fcb86164a2c2..8b79cd4db172 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= MemoTrie
-PORTVERSION= 0.6.8
-PORTREVISION= 1
+PORTVERSION= 0.6.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index 1962e7a19fc2..496227e98259 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627814
-SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4
-SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399
+TIMESTAMP = 1523960769
+SHA256 (cabal/MemoTrie-0.6.9.tar.gz) = 1d6045b8fdf7b89ed6b495e535613f5091cdfc9cdfe05a862207e76ce205f794
+SIZE (cabal/MemoTrie-0.6.9.tar.gz) = 8436
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index d2ffed42dbd0..15a5d0bb7ac4 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MissingH
PORTVERSION= 1.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Large utility library
LICENSE= BSD3CLAUSE
-USE_CABAL= hslogger HUnit mtl network old-time parsec random regex-compat
+USE_CABAL= hslogger HUnit mtl network old-time random regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index 8a18b3a29820..52b11fa595a4 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MonadRandom
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index f75557565b78..a5e7989fe8f1 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ObjectName
PORTVERSION= 1.1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Only/Makefile b/devel/hs-Only/Makefile
index 5d77163bb39a..7dacac796409 100644
--- a/devel/hs-Only/Makefile
+++ b/devel/hs-Only/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Only
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d6ed60ba8582..00886e2e8f86 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -10,5 +10,7 @@ COMMENT= Priority Search Queue
LICENSE= BSD3CLAUSE
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-PSQueue/files/patch-Data_PSQueue.hs b/devel/hs-PSQueue/files/patch-Data_PSQueue.hs
new file mode 100644
index 000000000000..eee077a2b7b2
--- /dev/null
+++ b/devel/hs-PSQueue/files/patch-Data_PSQueue.hs
@@ -0,0 +1,11 @@
+--- Data/PSQueue.hs.orig 2018-04-19 15:27:45 UTC
++++ Data/PSQueue.hs
+@@ -62,7 +62,7 @@ module Data.PSQueue
+ , foldl
+ ) where
+
+-import Prelude hiding (lookup,null,foldl,foldr)
++import Prelude hiding (lookup,null,foldl,foldr,(<>))
+ import qualified Prelude as P
+
+ {-
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index ed96cd9d9954..51fe870e7b3d 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= QuickCheck
PORTVERSION= 2.10.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index fe5b8982035d..fb710a6b8db6 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ReadArgs
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Simple command line argument parsing
LICENSE= BSD3CLAUSE
-USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13
+USE_CABAL= system-filepath>=0.4.7
EXECUTABLE= ReadArgsEx
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index fdee27f9454d..f5c6448d4e6b 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -2,7 +2,7 @@
PORTNAME= STMonadTrans
PORTVERSION= 0.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 129b6e90b68d..b05cdc265dbe 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Much safer replacement for QSemN, QSem, and SampleVar
LICENSE= BSD3CLAUSE
-USE_CABAL= stm
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 12d0c0da17b4..47f88a148a76 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -11,9 +11,11 @@ COMMENT= Shell script analysis tool
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_CABAL= json mtl>=2.2.1 parsec QuickCheck>=2.7.4 regex-tdfa
+USE_CABAL= json mtl>=2.2.1 QuickCheck>=2.7.4 regex-tdfa
EXECUTABLE= shellcheck
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 5179dd6cc89c..9619f9b5779d 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= StateVar
PORTVERSION= 1.1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= State variables
LICENSE= BSD3CLAUSE
-USE_CABAL= stm
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 540ce0015c13..52c10e10e84b 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index da62bd91791f..39b600c47a23 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -13,5 +13,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= base-orphans
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 878826c83854..07182550c5bf 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index 60be578063bc..e367e07a5415 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 35b7242462c4..a34f6fc803f9 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 47ab808ddeba..0dfb929b58a4 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -3,8 +3,9 @@
@@ -22,6 +22,6 @@ Library
ActiveHs.Base
Build-Depends:
- base >= 4.0 && < 4.10,
+- base >= 4.0 && < 4.10,
- QuickCheck >= 2.4 && < 2.9
++ base >= 4.0 && < 4.12,
+ QuickCheck >= 2.4 && < 2.11
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index fdd37916c310..8696cdc7891e 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alex
PORTVERSION= 3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index b97f2fbab4fa..85dc5cf94605 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6.3.1
-PORTREVISION= 1
+PORTVERSION= 0.8.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +9,8 @@ COMMENT= Simple ANSI terminal support, with Windows compatibility
LICENSE= BSD3CLAUSE
+USE_CABAL= colour
+
FLAGS_DISABLE= Example
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 3455706769c7..f7ed0682250d 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627818
-SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095
-SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199
+TIMESTAMP = 1524847331
+SHA256 (cabal/ansi-terminal-0.8.0.2.tar.gz) = 891ac933759fee1f6aad8b38ffc718efd685edf35cbe5283cc304d3a290af0fa
+SIZE (cabal/ansi-terminal-0.8.0.2.tar.gz) = 29359
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index ef4f75536971..8f0f65f5f3ef 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.7.3
-PORTREVISION= 2
+PORTVERSION= 0.6.8.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Wadler/Leijen Pretty Printer for colored ANSI terminal output
LICENSE= BSD3CLAUSE
-USE_CABAL= ansi-terminal>=0.4.0
+USE_CABAL= ansi-terminal>=0.4.0 semigroups>=0.1
FLAGS_DISABLE= Example
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index 2e0a4c19b235..acf94020c757 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627819
-SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
-SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
+TIMESTAMP = 1523129349
+SHA256 (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = a630721bd57678c3bfeb6c703f8249e434cbf85f40daceec4660fb8c6725cb3e
+SIZE (cabal/ansi-wl-pprint-0.6.8.2.tar.gz) = 16491
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index c63decd159a2..8cd202eba589 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= arrows
-PORTVERSION= 0.4.4.1
-PORTREVISION= 11
+PORTVERSION= 0.4.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index 800754e96563..bfd6dccd8767 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627819
-SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2
-SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261
+TIMESTAMP = 1524150955
+SHA256 (cabal/arrows-0.4.4.2.tar.gz) = f65ac93306629e70ae0d92914cc04d6ab499de3168036f0623aba3fffd22ab09
+SIZE (cabal/arrows-0.4.4.2.tar.gz) = 12701
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 4dfa2bcab558..a50de4d1ad2a 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= ASN1 data reader and writer in RAW, BER, and DER forms
LICENSE= BSD3CLAUSE
-USE_CABAL= cereal mtl text>=0.11
+USE_CABAL= cereal mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index 72188e32ca0d..36b06bf6817f 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-encoding
PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index 43576f3db3f0..07b3ab53aa37 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-parse
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index 1aba4f4a9997..b5eb324b9eda 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-types
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index de15fffb3aff..08538d74491a 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.1.1.1
+PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Run IO operations asynchronously and wait for their results
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.2
+USE_CABAL= hashable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index 4955e17e4c19..54880d5fd297 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444628
-SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2
-SIZE (cabal/async-2.1.1.1.tar.gz) = 10608
+TIMESTAMP = 1523292698
+SHA256 (cabal/async-2.2.1.tar.gz) = 8f0b86022a1319d3c1c68655790da4b7f98017982e27ec3f3dbfe01029d39027
+SIZE (cabal/async-2.2.1.tar.gz) = 12775
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index 00e249efebc6..617ea80a1117 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= atomic-primops
-PORTVERSION= 0.8.0.4
-PORTREVISION= 1
+PORTVERSION= 0.8.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index b74ee8e82196..4f802a51533a 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450732
-SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864
-SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075
+TIMESTAMP = 1524158958
+SHA256 (cabal/atomic-primops-0.8.2.tar.gz) = 67f8872e0c1e634d819a967365eb4ad514e9b2cde967fbc710da7cdc4d17d933
+SIZE (cabal/atomic-primops-0.8.2.tar.gz) = 36157
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index 98acb31a2376..191a617b2e45 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -2,7 +2,7 @@
PORTNAME= auto-update
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-compat-batteries/Makefile b/devel/hs-base-compat-batteries/Makefile
new file mode 100644
index 000000000000..15b8c4c65d7d
--- /dev/null
+++ b/devel/hs-base-compat-batteries/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= base-compat-batteries
+PORTVERSION= 0.10.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= base-compat with extra batteries
+
+LICENSE= MIT
+
+USE_CABAL= base-compat
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-compat-batteries/distinfo b/devel/hs-base-compat-batteries/distinfo
new file mode 100644
index 000000000000..fbe9b386fda6
--- /dev/null
+++ b/devel/hs-base-compat-batteries/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525010214
+SHA256 (cabal/base-compat-batteries-0.10.1.tar.gz) = 15578bafe45db81f7c7ad33253b2b047dab9b6df4ca7ca57f541d64084f113c9
+SIZE (cabal/base-compat-batteries-0.10.1.tar.gz) = 15813
diff --git a/devel/hs-base-compat-batteries/pkg-descr b/devel/hs-base-compat-batteries/pkg-descr
new file mode 100644
index 000000000000..8070cfe9be6b
--- /dev/null
+++ b/devel/hs-base-compat-batteries/pkg-descr
@@ -0,0 +1,11 @@
+Provides functions available in later versions of base to a wider range of
+compilers, without requiring you to use CPP pragmas in your code. See the README
+for what is covered. Also see the changelog for recent changes.
+
+Note that base-compat does not add any orphan instances. There is a separate
+package, base-orphans, for that.
+
+In addition, base-compat does not backport any data types or type classes.
+See this section of the README for more info.
+
+WWW: https://github.com/haskell-compat/base-compat
diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile
index 4a8dbb39143b..4d90c1fc1b65 100644
--- a/devel/hs-base-compat/Makefile
+++ b/devel/hs-base-compat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= base-compat
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo
index 30eaf35ba24b..fc4342052a2a 100644
--- a/devel/hs-base-compat/distinfo
+++ b/devel/hs-base-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499541026
-SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210
-SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632
+TIMESTAMP = 1525011068
+SHA256 (cabal/base-compat-0.10.1.tar.gz) = b2ec2193d4a76a92c0ddcd69bb1b5879d50c98dd38422b0d86f85aea3112bb6d
+SIZE (cabal/base-compat-0.10.1.tar.gz) = 31954
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
index 9aaa2cc3db25..1ac659697266 100644
--- a/devel/hs-base-orphans/Makefile
+++ b/devel/hs-base-orphans/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-orphans
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index e93ce1e696fc..65afc322681d 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 0a3faeab44db..8988e4fa2578 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 6fc672adb598..085b9c1298ad 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/Makefile b/devel/hs-basement/Makefile
index b7e1dcdc5de3..3ccf118a1451 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-basement/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
-PORTNAME= text
-PORTVERSION= 1.2.2.2
-PORTREVISION= 1
+PORTNAME= basement
+PORTVERSION= 0.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Efficient packed Unicode text type
+COMMENT= Foundation most basic primitives without any dependencies
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-basement/distinfo b/devel/hs-basement/distinfo
new file mode 100644
index 000000000000..a99967e24fac
--- /dev/null
+++ b/devel/hs-basement/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523131438
+SHA256 (cabal/basement-0.0.7.tar.gz) = b501b9b378f35b80c60321031dbbf9ed7af46c66353f072e00f00abdd2244f70
+SIZE (cabal/basement-0.0.7.tar.gz) = 133178
diff --git a/devel/hs-basement/pkg-descr b/devel/hs-basement/pkg-descr
new file mode 100644
index 000000000000..38f7cc1da12d
--- /dev/null
+++ b/devel/hs-basement/pkg-descr
@@ -0,0 +1,12 @@
+This package has the following goals:
+ * provide a base like sets of modules that provide a consistent set of
+ features and bugfixes across multiple versions of GHC (unlike base).
+ * provide a better and more efficient prelude than base's prelude.
+ * be self-sufficient: no external dependencies apart from base.
+ * provide better data-types: packed unicode string by default, arrays.
+ * Better numerical classes that better represent mathematical thing
+ (No more all-in-one Num).
+ * Better I/O system with less Lazy IO
+ * Usual partial functions distinguished through type system
+
+WWW: https://hackage.haskell.org/package/foundation
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index d2b1a4609876..0bae08d4b984 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.6.1.1
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Enhanced core prelude; a common foundation for alternate preludes
LICENSE= MIT
-USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe text \
- unordered-containers vector
+USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe unordered-containers \
+ vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 4ed645814eec..2f92747dd228 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627821
-SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7
-SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009
+TIMESTAMP = 1524414505
+SHA256 (cabal/basic-prelude-0.7.0.tar.gz) = 10755f892548faa956b81b40d1d03ec6e94609fd8ec8e92be09b4453b7ad9379
+SIZE (cabal/basic-prelude-0.7.0.tar.gz) = 6471
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 0765d55cd6be..9697900d8583 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 5.4.2
-PORTREVISION= 1
+PORTVERSION= 5.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Bifunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3
+USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3 \
+ th-abstraction
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index 8dce950a9667..ef67a3242c6a 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499542053
-SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d
-SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535
+TIMESTAMP = 1523787744
+SHA256 (cabal/bifunctors-5.5.2.tar.gz) = 332bb2ea19e77dac55282daff8046d89f69514ced5b987779d887e53b5d7cb11
+SIZE (cabal/bifunctors-5.5.2.tar.gz) = 37983
diff --git a/devel/hs-bifunctors/files/patch-bifunctors.cabal b/devel/hs-bifunctors/files/patch-bifunctors.cabal
new file mode 100644
index 000000000000..02e2dfd47322
--- /dev/null
+++ b/devel/hs-bifunctors/files/patch-bifunctors.cabal
@@ -0,0 +1,11 @@
+--- bifunctors.cabal.orig 2018-04-15 11:07:07 UTC
++++ bifunctors.cabal
+@@ -43,7 +43,7 @@ library
+ base-orphans >= 0.5.2 && < 1,
+ comonad >= 4 && < 6,
+ containers >= 0.1 && < 0.6,
+- template-haskell >= 2.4 && < 2.13,
++ template-haskell >= 2.4 && < 2.14,
+ th-abstraction >= 0.2.2 && < 0.3,
+ transformers >= 0.2 && < 0.6,
+ transformers-compat >= 0.5 && < 0.6
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index ae0c821d5045..cb2f5d7734c0 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 2f48c551f233..95e4a2b5d0d7 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 3ccc19c98062..c02ec0fb2739 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.4.0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Efficient buffered output
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.10
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 30274144b35e..a7f33d463cdb 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499546087
-SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4
-SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681
+TIMESTAMP = 1523427415
+SHA256 (cabal/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814
+SIZE (cabal/blaze-builder-0.4.1.0.tar.gz) = 61365
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index 0d1813e79f84..0073d0cb8ae5 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Fast rendering of common datatypes
LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1.4 double-conversion>=0.2.0.1 \
- old-locale text>=0.11.0.2 vector
+ old-locale vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 796a913e5a4c..6a7b9b84a9b4 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 2.0.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index d71a3d7699d1..d70b9a6587d8 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= boxes
-PORTVERSION= 0.1.4
-PORTREVISION= 2
+PORTVERSION= 0.1.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index 19bce67a016a..6b983eadebce 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627822
-SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8
-SIZE (cabal/boxes-0.1.4.tar.gz) = 6481
+TIMESTAMP = 1523955976
+SHA256 (cabal/boxes-0.1.5.tar.gz) = 38e1782e8a458f342a0acbb74af8f55cb120756bc3af7ee7220d955812af56c3
+SIZE (cabal/boxes-0.1.5.tar.gz) = 7598
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index f22d2f1b3ff1..bd7f2e7c90ba 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index f354fde0c029..8008d39c7449 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 64881611e304..b73ebe7dc760 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index f21d045e2206..2b43fe6c23bf 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-lexing
PORTVERSION= 0.5.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
index 8f12c4c07da8..f09d0c98f516 100644
--- a/devel/hs-bytestring-mmap/Makefile
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-mmap
PORTVERSION= 0.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 6c6a57cf4c0e..150da33faf6d 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index 00f4860e5fc2..a145ce96afea 100644
--- a/devel/hs-bytestring-show/Makefile
+++ b/devel/hs-bytestring-show/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-show
PORTVERSION= 0.3.5.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index d4617587f647..e94e28718df8 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= c2hs
PORTVERSION= 0.28.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= C->Haskell FFI tool that gives some cross-language type safety
LICENSE= GPLv2
-USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 text yaml>=0.8
+USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 yaml>=0.8
XMLDOCS= doc/users_guide:html
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 148b5991085f..967b433cfcc9 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.24.0.2
+PORTVERSION= 2.2.0.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,9 +10,10 @@ COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD3CLAUSE
-USE_CABAL= async base16-bytestring cryptohash-sha256 hackage-security \
- hashable HTTP mtl network network-uri old-time random stm \
- tar zlib
+USE_CABAL= async base16-bytestring base64-bytestring \
+ cryptohash-sha256 echo ed25519 edit-distance \
+ hackage-security hashable HTTP mtl network network-uri \
+ random resolv tar zlib
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index e357bb419c56..f3b8a3bc4d12 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499540276
-SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0
-SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937
+TIMESTAMP = 1523277454
+SHA256 (cabal/cabal-install-2.2.0.0.tar.gz) = c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9
+SIZE (cabal/cabal-install-2.2.0.0.tar.gz) = 662421
diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile
index 551ce32664b7..0257948590b5 100644
--- a/devel/hs-call-stack/Makefile
+++ b/devel/hs-call-stack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= call-stack
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index f81280934796..e244738b806b 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.5.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index f99ee80b5cec..a6983e6d323a 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627824
-SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7
-SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504
+TIMESTAMP = 1523129318
+SHA256 (cabal/cereal-0.5.5.0.tar.gz) = 0b97320ffbfa6df2e5679022215dbd0fe6e3b5ae8428c2ff4310d9e1acf16822
+SIZE (cabal/cereal-0.5.5.0.tar.gz) = 19832
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index d625a7093021..7e9d1b9e80c2 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -3,7 +3,7 @@
PORTNAME= checkers
PORTVERSION= 0.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index 7f1720d0062e..269ba3feb43a 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= chunked-data
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Typeclasses for dealing with various chunked data representations
LICENSE= MIT
-USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups text>=0.11 \
- vector
+USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
index 08ac2c815ca5..c0c027508670 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627825
-SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f
-SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349
+TIMESTAMP = 1524413491
+SHA256 (cabal/chunked-data-0.3.1.tar.gz) = f710c581aee1f899e807fc9e6cba721b27d53dc9d56986f1922bc7ccddf1a79a
+SIZE (cabal/chunked-data-0.3.1.tar.gz) = 4605
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 1d0bcf01b49d..ce7242281ec1 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index f6816aa3392e..f4cfe351a028 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627826
-SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f
-SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735
+TIMESTAMP = 1525092204
+SHA256 (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 39ef2567a3542ebf91f6ebc103cc4afb64c2a4ec051c7ce578b577ef9931c424
+SIZE (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 1979
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index c9b2da16364c..61f2f688fd8d 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 1.2.0.1
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= async basic-prelude bifunctors chunked-data dlist \
exceptions hashable lifted-async lifted-base monad-unlift \
mono-traversable mono-traversable-instances mtl \
mutable-containers primitive safe-exceptions say semigroups \
- stm stm-chans text time-locale-compat transformers-base \
+ stm-chans time-locale-compat transformers-base unliftio \
unordered-containers vector vector-instances
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index e72567fe62a0..0b2a4726f7fd 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627825
-SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34
-SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017
+TIMESTAMP = 1525004675
+SHA256 (cabal/classy-prelude-1.4.0.tar.gz) = 2b3b255676ab0fdeb39aebafa3543535ddd684d00c645b643e50cb9e2d25f9e0
+SIZE (cabal/classy-prelude-1.4.0.tar.gz) = 12056
diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile
index a929f26e23f8..9fccf3769786 100644
--- a/devel/hs-clock/Makefile
+++ b/devel/hs-clock/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clock
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 52458e6bcf6a..9feb8c71b6c2 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.17
-PORTREVISION= 1
+PORTVERSION= 0.10.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index 8509d2ff8fcf..e1e68f30d7a0 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499596679
-SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da
-SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440
+TIMESTAMP = 1523129483
+SHA256 (cabal/cmdargs-0.10.20.tar.gz) = 0e269dc48c3d4c0447c96ffd772a6fe69dfa1260c323f4cd7bf171cbf2ab7331
+SIZE (cabal/cmdargs-0.10.20.tar.gz) = 64550
diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile
index ed81f483259c..43010a0b6510 100644
--- a/devel/hs-code-page/Makefile
+++ b/devel/hs-code-page/Makefile
@@ -2,7 +2,7 @@
PORTNAME= code-page
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile
index 6ae2f165dc61..7d08609773bc 100644
--- a/devel/hs-colour/Makefile
+++ b/devel/hs-colour/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= colour
-PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTVERSION= 2.3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-colour/distinfo b/devel/hs-colour/distinfo
index db94588f4d62..6ac4ad7ae042 100644
--- a/devel/hs-colour/distinfo
+++ b/devel/hs-colour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499547650
-SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2
-SIZE (cabal/colour-2.3.3.tar.gz) = 20392
+TIMESTAMP = 1523129642
+SHA256 (cabal/colour-2.3.4.tar.gz) = 0f439f00b322ce3d551f28a4dd1520aa2c91d699de4cdc6d485b9b04be0dc5eb
+SIZE (cabal/colour-2.3.4.tar.gz) = 20418
diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile
index d7883325b977..189ec57b6772 100644
--- a/devel/hs-concurrent-output/Makefile
+++ b/devel/hs-concurrent-output/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= concurrent-output
-PORTVERSION= 1.10.0
+PORTVERSION= 1.10.5
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Ungarble output from several threads or commands
LICENSE= BSD2CLAUSE
-USE_CABAL= text async stm exceptions ansi-terminal terminal-size
+USE_CABAL= async exceptions ansi-terminal terminal-size
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo
index f3d0b41e12c9..1d3fd4ffc09a 100644
--- a/devel/hs-concurrent-output/distinfo
+++ b/devel/hs-concurrent-output/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501333173
-SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2
-SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764
+TIMESTAMP = 1523694433
+SHA256 (cabal/concurrent-output-1.10.5.tar.gz) = 98c096228664d591eb2c352080955a202e883cdab8452efae3cae407e30fa5c3
+SIZE (cabal/concurrent-output-1.10.5.tar.gz) = 21970
diff --git a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
deleted file mode 100644
index a517c388b924..000000000000
--- a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- concurrent-output.cabal.orig 2017-05-19 15:55:09 UTC
-+++ concurrent-output.cabal
-@@ -34,7 +34,7 @@ Library
- , text (>= 0.11.0 && < 1.3.0)
- , async (>= 2.0 && < 2.2)
- , stm (>= 2.0 && < 2.5)
-- , process (>= 1.6.0 && < 1.7.0)
-+ , process
- , directory (>= 1.2.0 && < 1.4.0)
- , transformers (>= 0.3.0 && < 0.6.0)
- , exceptions (>= 0.6.0 && < 0.9.0)
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index 2ccb0eff61d6..0ef74f01a282 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-combinators
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= base16-bytestring base64-bytestring>=0.1.1.1 chunked-data \
conduit>=1.2.2 conduit-extra>=1.1.1 monad-control \
mono-traversable>=0.4 mwc-random primitive resourcet \
- text transformers-base unix-compat vector void
+ transformers-base unix-compat vector void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
index 28904c912a66..f9858acb773d 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627827
-SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918
-SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380
+TIMESTAMP = 1525004319
+SHA256 (cabal/conduit-combinators-1.3.0.tar.gz) = 9717d916a0422a7fb7cc262302333269607530d40cd0bea3be947872f906e7d3
+SIZE (cabal/conduit-combinators-1.3.0.tar.gz) = 2204
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index c73417eaa9fa..bfaf8d980691 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-extra
-PORTVERSION= 1.1.16
+PORTVERSION= 1.3.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -12,7 +12,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \
monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \
- stm streaming-commons>=0.1.11 text transformers-base
+ streaming-commons>=0.1.11 transformers-base typed-process
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
index bb3c610cd933..27b1aad9f74c 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627827
-SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5
-SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402
+TIMESTAMP = 1523897535
+SHA256 (cabal/conduit-extra-1.3.0.tar.gz) = 2c41c925fc53d9ba2e640c7cdca72c492b28c0d45f1a82e94baef8dfa65922ae
+SIZE (cabal/conduit-extra-1.3.0.tar.gz) = 32716
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index 5db2c85d4d73..36afa5a6528a 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.2.11
-PORTREVISION= 1
+PORTVERSION= 1.3.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Streaming data processing library
LICENSE= MIT
-USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mtl resourcet>=1.1 \
- transformers-base>=0.4.1 void>=0.5.5
+USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mono-traversable mtl \
+ resourcet>=1.1 transformers-base>=0.4.1 vector void>=0.5.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index 0ede71efa0c2..046779142376 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543753
-SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7
-SIZE (cabal/conduit-1.2.11.tar.gz) = 50240
+TIMESTAMP = 1523696712
+SHA256 (cabal/conduit-1.3.0.2.tar.gz) = c0f099d242504e65a78e1cbb54c18afad45fe2c9297d1d918ce28ae7dc4a1e5b
+SIZE (cabal/conduit-1.3.0.2.tar.gz) = 86664
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 9ec1491cec87..f59f74dbc177 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,7 @@ COMMENT= Configuration management
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.0.2 hashable text>=0.11.1.0 unix-compat \
- unordered-containers
+USE_CABAL= attoparsec>=0.10.0.2 hashable unix-compat unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
index a9c7c3ee0aa3..3103143f0f42 100644
--- a/devel/hs-constraints/Makefile
+++ b/devel/hs-constraints/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= constraints
-PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTVERSION= 0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Constraint manipulation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable mtl transformers-compat
+USE_CABAL= hashable mtl semigroups transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
index 33ab50904526..eda0daed2a9b 100644
--- a/devel/hs-constraints/distinfo
+++ b/devel/hs-constraints/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444670
-SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785
-SIZE (cabal/constraints-0.9.1.tar.gz) = 18503
+TIMESTAMP = 1523445706
+SHA256 (cabal/constraints-0.10.tar.gz) = c224b82e53c21791083c83fed2f2c938bd715a63c8efa90a5abcc3d8859126c6
+SIZE (cabal/constraints-0.10.tar.gz) = 19703
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index f111fa33dc3a..1d28d45aa2da 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,7 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Typeclasses and instances for converting between types
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl old-locale old-time text>=0.8
+USE_CABAL= mtl old-locale old-time
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 0f0b6a01a297..3997c51a541c 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cpphs
PORTVERSION= 1.20.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 2b5f28695d78..15926cb0267f 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.12.5
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,13 +12,15 @@ LICENSE= GPLv2
USE_CABAL= async attoparsec base16-bytestring cryptohash \
data-ordlist dataenc fgl graphviz hashable html HTTP \
- mmap mtl parsec random \
+ mmap mtl random \
regex-applicative regex-compat-tdfa sandi tar \
- text transformers-compat unix-compat \
+ transformers-compat unix-compat \
utf8-string vector zip-archive zlib
EXECUTABLE= darcs
+IGNORE= Depends on graphics/hs-graphviz, which doesn't compile with recent GHC
+
MAN1PAGES= darcs.1
FLAGS_DEFINE= STATIC TERMINFO THREADED
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index b1637f2cebd2..78c410049662 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538866
-SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553
-SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698
+TIMESTAMP = 1525013682
+SHA256 (cabal/darcs-2.14.0.tar.gz) = 19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803
+SIZE (cabal/darcs-2.14.0.tar.gz) = 1063067
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
deleted file mode 100644
index 18095e40a87a..000000000000
--- a/devel/hs-darcs/files/patch-darcs.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- darcs.cabal.orig 2017-07-11 16:28:16 UTC
-+++ darcs.cabal
-@@ -400,7 +400,7 @@ Library
- transformers-compat >= 0.4 && < 0.6,
- parsec >= 3.1 && < 3.2,
- fgl >= 5.5.0.1 && < 5.6,
-- graphviz >= 2999.17.0.1 && < 2999.19,
-+ graphviz >= 2999.17.0.1 && < 2999.20,
- html >= 1.0.1.2 && < 1.1,
- filepath >= 1.3.0.1 && < 1.5.0.0,
- haskeline >= 0.6.3 && < 0.8,
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index 80a1be790671..93806eee7fbd 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-class
PORTVERSION= 0.1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index cfd840eaaf03..7607f52e3c71 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 5355b8bf596d..fa610c0227c1 100644
--- a/devel/hs-data-default-instances-containers/Makefile
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index 94b2f4c386b7..c97f3288e154 100644
--- a/devel/hs-data-default-instances-dlist/Makefile
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index c021b29e35ed..43047104a48d 100644
--- a/devel/hs-data-default-instances-old-locale/Makefile
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 41dcfa8bbbdf..c238d99cc8e6 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default
PORTVERSION= 0.7.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile
index 8b4bb77da093..148302687130 100644
--- a/devel/hs-data-endian/Makefile
+++ b/devel/hs-data-endian/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-endian
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index 8df8401ae5e6..a7697577cd4a 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-hash
PORTVERSION= 0.2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
index bf8f82fd21c0..905388bfadaf 100644
--- a/devel/hs-data-ordlist/Makefile
+++ b/devel/hs-data-ordlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-ordlist
PORTVERSION= 0.4.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/files/patch-Data_PPrint.hs b/devel/hs-data-pprint/files/patch-Data_PPrint.hs
new file mode 100644
index 000000000000..f517231270e5
--- /dev/null
+++ b/devel/hs-data-pprint/files/patch-Data_PPrint.hs
@@ -0,0 +1,9 @@
+--- Data/PPrint.hs.orig 2018-04-13 19:36:43 UTC
++++ Data/PPrint.hs
+@@ -60,6 +60,6 @@ a === b = do
+ showBotts :: [(String, String)] -> Doc
+ showBotts es = vcat $ map f es
+ where
+- f (i, e) = text i <> text ":" <+> vcat (map text $ lines e)
++ f (i, e) = text i Text.PrettyPrint.HughesPJ.<> text ":" <+> vcat (map text $ lines e)
+
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
index a63eb3a49419..7540b55da347 100644
--- a/devel/hs-data-pprint/files/patch-data-pprint.cabal
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -1,10 +1,14 @@
---- data-pprint.cabal.orig 2017-07-10 15:51:41 UTC
+--- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC
+++ data-pprint.cabal
-@@ -72,6 +72,6 @@ library
+@@ -68,10 +68,10 @@ library
+ System.IO.Parallel
+ other-modules:
+ build-depends:
+- base >= 4.0 && < 4.10,
++ base >= 4.0 && < 4.12,
pretty >= 1.0 && < 1.2,
mtl >= 2.0 && < 2.3,
deepseq >= 1.1 && < 1.5,
- time >= 1.2 && < 1.6,
-+ time >= 1.2 && < 1.7,
++ time >= 1.2 && < 1.9,
parallel >= 3.1 && < 3.3
-
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 731b61f8673b..cf72a6193e14 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index d2683024f8b7..aa50ab687a06 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile
index 3f8dd4b53133..21483daafbca 100644
--- a/devel/hs-dbus/Makefile
+++ b/devel/hs-dbus/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dbus
-PORTVERSION= 0.10.13
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= A client library for the D-Bus IPC system
LICENSE= GPLv3
-USE_CABAL= cereal libxml-sax network parsec random text vector xml-types
+USE_CABAL= cereal lens libxml-sax network random split th-lift vector \
+ xml-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-dbus/distinfo b/devel/hs-dbus/distinfo
index 14245bed4930..d259b22642ae 100644
--- a/devel/hs-dbus/distinfo
+++ b/devel/hs-dbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501342515
-SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca
-SIZE (cabal/dbus-0.10.13.tar.gz) = 75603
+TIMESTAMP = 1524595525
+SHA256 (cabal/dbus-1.0.1.tar.gz) = a325b5c6958a343b30fd378d54ac01f9db889a4d7cadb14b2103da7ef4e7e8f5
+SIZE (cabal/dbus-1.0.1.tar.gz) = 77535
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index b304c7b60356..06a3c2ea7f34 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
-PORTNAME= deepseq-generics
-PORTVERSION= 0.2.0.0
-PORTREVISION= 1
-CATEGORIES= devel haskell
+PORTNAME= deepseq-generics
+PORTVERSION= 0.2.0.0
+PORTREVISION= 2
+CATEGORIES= devel haskell
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation
-LICENSE= BSD3CLAUSE
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
new file mode 100644
index 000000000000..0a299b3510fe
--- /dev/null
+++ b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
@@ -0,0 +1,10 @@
+--- deepseq-generics.cabal.orig 2018-04-11 11:03:49 UTC
++++ deepseq-generics.cabal
+@@ -42,7 +42,7 @@ source-repository head
+ library
+ default-language: Haskell2010
+ exposed-modules: Control.DeepSeq.Generics
+- build-depends: base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
++ build-depends: base >= 4.5 && < 4.12, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
+ other-extensions: BangPatterns, FlexibleContexts, TypeOperators
+ ghc-options: -Wall
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index bce313f4ba55..d07bd5d3a725 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -2,7 +2,7 @@
PORTNAME= directory-tree
PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index 99f4a5d4e0f2..a2b8dc3f142d 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dlist-instances
PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index b96deb5ec130..bcfd5271606a 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dlist
PORTVERSION= 0.8.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
index 359e686e78b8..cb4796d2bb54 100644
--- a/devel/hs-easy-file/Makefile
+++ b/devel/hs-easy-file/Makefile
@@ -2,7 +2,7 @@
PORTNAME= easy-file
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-echo/Makefile b/devel/hs-echo/Makefile
new file mode 100644
index 000000000000..14af7c959783
--- /dev/null
+++ b/devel/hs-echo/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= echo
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cross-platform and cross-console library to handle echoing terminal input
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-echo/distinfo b/devel/hs-echo/distinfo
new file mode 100644
index 000000000000..a7cf34b1ea25
--- /dev/null
+++ b/devel/hs-echo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523290399
+SHA256 (cabal/echo-0.1.3.tar.gz) = 704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef
+SIZE (cabal/echo-0.1.3.tar.gz) = 5373
diff --git a/devel/hs-echo/files/patch-echo.cabal b/devel/hs-echo/files/patch-echo.cabal
new file mode 100644
index 000000000000..515e4e8df566
--- /dev/null
+++ b/devel/hs-echo/files/patch-echo.cabal
@@ -0,0 +1,11 @@
+--- echo.cabal.orig 2018-04-09 16:19:02 UTC
++++ echo.cabal
+@@ -39,7 +39,7 @@ library
+ System.IO.Echo.Internal
+
+ build-depends: base >= 4.3 && < 5
+- , process >= 1.0.1.1 && < 1.5
++ , process >= 1.0.1.1 && < 1.7
+ if os(windows)
+ cpp-options: "-DWINDOWS"
+ build-depends: mintty >= 0.1 && < 0.2
diff --git a/devel/hs-echo/pkg-descr b/devel/hs-echo/pkg-descr
new file mode 100644
index 000000000000..e36e97fe3764
--- /dev/null
+++ b/devel/hs-echo/pkg-descr
@@ -0,0 +1,6 @@
+The base Haskell library exposes the hGetEcho and hSetEcho functions for
+querying and setting echo status, but unfortunately, neither function works
+with MinTTY consoles on Windows. This library provides an alternative interface
+which works with both MinTTY and other consoles.
+
+WWW: https://github.com/RyanGlScott/echo
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index e18bc7647f9c..26a790956fbf 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,7 +2,7 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index a9a00c4c1695..97016147fa8f 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 4.4.1.1
-PORTREVISION= 1
+PORTVERSION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 69815b6ae8a3..0cd4aea4ad82 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627832
-SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3
-SIZE (cabal/either-4.4.1.1.tar.gz) = 9376
+TIMESTAMP = 1524406695
+SHA256 (cabal/either-5.tar.gz) = 75cee27641a34f80e6c71f82469a76c7f51d23a522e792e2733269ebf7cbf420
+SIZE (cabal/either-5.tar.gz) = 8637
diff --git a/devel/hs-either/files/patch-either.cabal b/devel/hs-either/files/patch-either.cabal
deleted file mode 100644
index ab50ef682130..000000000000
--- a/devel/hs-either/files/patch-either.cabal
+++ /dev/null
@@ -1,14 +0,0 @@
---- either.cabal.orig 2017-07-10 15:15:32 UTC
-+++ either.cabal
-@@ -32,9 +32,9 @@ library
- exceptions >= 0.5 && < 0.9,
- free >= 4.9 && < 5,
- monad-control >= 0.3.2 && < 1.1,
-- MonadRandom >= 0.1 && < 0.5,
-+ MonadRandom >= 0.1 && < 0.6,
- mtl >= 2.0 && < 2.3,
-- mmorph >= 1.0.0 && < 1.1,
-+ mmorph >= 1.0.0 && < 1.2,
- profunctors >= 4 && < 6,
- semigroups >= 0.8.3.1 && < 1,
- semigroupoids >= 4 && < 6,
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index 1848f1e4cfdc..7f3662e795e2 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enclosed-exceptions
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index 73cdc720f8f0..dc2f0412cec2 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.20
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Reliable, high-performance processing with left-fold enumerators
LICENSE= MIT
-USE_CABAL= text>=0.7
+IGNORE= Doesn't build with recent GHC version
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index 2187c1a0e6b9..f926a4f3889b 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -2,7 +2,7 @@
PORTNAME= equivalence
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index 66ef21668b6d..1230d1473cfd 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTVERSION= 2.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simplified error-handling
LICENSE= BSD3CLAUSE
-USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text
+USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index 0a965efdc044..31be5b46197a 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499451104
-SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531
-SIZE (cabal/errors-2.2.1.tar.gz) = 8821
+TIMESTAMP = 1523996378
+SHA256 (cabal/errors-2.2.5.tar.gz) = e917ca560c5573d792483677fa5ad30d9d1923d21361ce24879cb51e6fbc735c
+SIZE (cabal/errors-2.2.5.tar.gz) = 9030
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index 76d7b5d3dbcc..3adad433c93d 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= exceptions
-PORTVERSION= 0.8.3
+PORTVERSION= 0.10.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Extensible optionally-pure exceptions
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl stm transformers-compat
+USE_CABAL= mtl transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index da74124de563..3482e8b1ae9f 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444351
-SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be
-SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986
+TIMESTAMP = 1523386414
+SHA256 (cabal/exceptions-0.10.0.tar.gz) = 1edd912e5ea5cbda37941b06738597d35214dc247d332b1bfffc82adadfa49d7
+SIZE (cabal/exceptions-0.10.0.tar.gz) = 19460
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 0e147eb5b8b8..d59087a4afc4 100644
--- a/devel/hs-extensible-exceptions/Makefile
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
index e4f73fb5c2c3..7a5d06c5865c 100644
--- a/devel/hs-extra/Makefile
+++ b/devel/hs-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= extra
-PORTVERSION= 1.6
-PORTREVISION= 1
+PORTVERSION= 1.6.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
index a58102038407..ff7299285260 100644
--- a/devel/hs-extra/distinfo
+++ b/devel/hs-extra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627833
-SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df
-SIZE (cabal/extra-1.6.tar.gz) = 36369
+TIMESTAMP = 1525013177
+SHA256 (cabal/extra-1.6.6.tar.gz) = 79996e6a8add465b9ae6253249199afc7fb2e4df475744dbe32b3c0b4573a09d
+SIZE (cabal/extra-1.6.6.tar.gz) = 39499
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 257c4332cafd..dc5e407bcfe6 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 2.4.10
-PORTREVISION= 1
+PORTVERSION= 2.4.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fast logging system
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update easy-file old-locale text unix-time
+USE_CABAL= auto-update easy-file old-locale unix-time
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo
index c05e4df04faa..e8a39e4b4bb7 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627834
-SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d
-SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537
+TIMESTAMP = 1523783540
+SHA256 (cabal/fast-logger-2.4.11.tar.gz) = bbe5deab58f435754dbe938cf0ddf26fc21f317c35fb3431d4bdb96809dea2a9
+SIZE (cabal/fast-logger-2.4.11.tar.gz) = 10326
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 87598b6ba8b1..53cc26e8af51 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fgl
PORTVERSION= 5.5.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 6c680612cf0f..983a8c4ebfdf 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -2,7 +2,7 @@
PORTNAME= file-embed
PORTVERSION= 0.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 807fd066f4f2..dd5a14710312 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,7 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index b90a78d389d0..99e1db8526e9 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.3.1
-PORTREVISION= 1
+PORTVERSION= 0.6.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD3CLAUSE
-USE_CABAL= Diff>=0.2 old-locale>=1.0 parsec>=2 split>=0.1 \
- utf8-string>=0.3 xml>=1.3
+USE_CABAL= Diff>=0.2 old-locale>=1.0 split>=0.1 utf8-string>=0.3 xml>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 6088cc20a8d7..2c868f219743 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627835
-SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de
-SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776
+TIMESTAMP = 1523961106
+SHA256 (cabal/filestore-0.6.3.2.tar.gz) = 1b8090d20c940ac3444dd9649ed71e934601dba9f2fb9579e67fff6dcd32a15b
+SIZE (cabal/filestore-0.6.3.2.tar.gz) = 31870
diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile
index 029224692200..0570b80342a4 100644
--- a/devel/hs-fmlist/Makefile
+++ b/devel/hs-fmlist/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fmlist
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.9.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fmlist/distinfo b/devel/hs-fmlist/distinfo
index dea77335835d..47f0bced9971 100644
--- a/devel/hs-fmlist/distinfo
+++ b/devel/hs-fmlist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499719989
-SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf
-SIZE (cabal/fmlist-0.9.tar.gz) = 4256
+TIMESTAMP = 1523130549
+SHA256 (cabal/fmlist-0.9.2.tar.gz) = 8fc4b55d04e7f216740a01acd2f38293e3bd9409a9495e6042a162580c420609
+SIZE (cabal/fmlist-0.9.2.tar.gz) = 4387
diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile
index dfbc92b46ef8..155b8bd7337b 100644
--- a/devel/hs-foundation/Makefile
+++ b/devel/hs-foundation/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= foundation
-PORTVERSION= 0.0.13
-PORTREVISION= 1
+PORTVERSION= 0.0.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= A custom prelude with no dependencies apart from base
LICENSE= BSD3CLAUSE
+USE_CABAL= basement==0.0.7
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo
index 59ee0c7dfef8..292ff4763860 100644
--- a/devel/hs-foundation/distinfo
+++ b/devel/hs-foundation/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627835
-SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f
-SIZE (cabal/foundation-0.0.13.tar.gz) = 221540
+TIMESTAMP = 1523130712
+SHA256 (cabal/foundation-0.0.20.tar.gz) = ba6ae63a9ce0846bf942af2c3ace56600f051c61e83a0b55dd625de23a78e42d
+SIZE (cabal/foundation-0.0.20.tar.gz) = 122940
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index d901e28e21c7..07164b580108 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= free
-PORTVERSION= 4.12.4
-PORTREVISION= 1
+PORTVERSION= 5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= bifunctors>=4 comonad>=4 distributive>=0.2.1 exceptions>=0.6 \
mtl>=2.0.1.0 prelude-extras>=0.4 profunctors>=4 \
- semigroupoids>=4 semigroups>=0.8.3.1
+ semigroupoids>=4 semigroups>=0.8.3.1 transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index c6c9e393deaf..fa8edc99aba2 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627836
-SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784
-SIZE (cabal/free-4.12.4.tar.gz) = 50601
+TIMESTAMP = 1523821134
+SHA256 (cabal/free-5.0.1.tar.gz) = b75cb592fdcbe11b83d2316c0cb5c8a66621709f57af9f52bbfcc8e4524e6299
+SIZE (cabal/free-5.0.1.tar.gz) = 64069
diff --git a/devel/hs-free/files/patch-free.cabal b/devel/hs-free/files/patch-free.cabal
new file mode 100644
index 000000000000..eb57b615aa32
--- /dev/null
+++ b/devel/hs-free/files/patch-free.cabal
@@ -0,0 +1,11 @@
+--- free.cabal.orig 2018-04-15 20:31:19 UTC
++++ free.cabal
+@@ -84,7 +84,7 @@ library
+ transformers-base < 0.5,
+ transformers-compat >= 0.3 && < 1,
+ template-haskell >= 2.7.0.0 && < 3,
+- exceptions >= 0.6 && < 0.10,
++ exceptions >= 0.6 && < 0.11,
+ containers < 0.6
+
+ exposed-modules:
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 0bfce8087859..4b854a6bcac7 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTVERSION= 0.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Cross-platform library for file system notifications
LICENSE= BSD3CLAUSE
-USE_CABAL= async>=2.0.1 hinotify>=0.3.7 text>=0.11.0 unix-compat>=0.2
+USE_CABAL= async>=2.0.1 hinotify>=0.3.7 unix-compat>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 728dfcc0bee5..ec5492469977 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627836
-SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
-SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
+TIMESTAMP = 1523958991
+SHA256 (cabal/fsnotify-0.2.1.1.tar.gz) = 175a75962ad07c30c031fa8931f8d3e32abc06a96676e73e65cb7207e9d2dc90
+SIZE (cabal/fsnotify-0.2.1.1.tar.gz) = 14695
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index c1a3351a12b2..9337feb1de89 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gconf
PORTVERSION= 0.13.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Binding to the GNOME configuration database system
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools text>=0.11.0.6
+USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools
USE_GNOME= gconf2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index c26738701eb7..31018635b1a6 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.11.2
-PORTREVISION= 1
+PORTVERSION= 1.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index f17dac442933..dfebc6140b6d 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450572
-SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9
-SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546
+TIMESTAMP = 1523447778
+SHA256 (cabal/generic-deriving-1.12.1.tar.gz) = f5fd3f733a20deee5a6e752969edac1e04a90e2ee34e005fccb5d35a5c129473
+SIZE (cabal/generic-deriving-1.12.1.tar.gz) = 67982
diff --git a/devel/hs-generic-deriving/files/patch-generic-deriving.cabal b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal
new file mode 100644
index 000000000000..a23890ada602
--- /dev/null
+++ b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal
@@ -0,0 +1,11 @@
+--- generic-deriving.cabal.orig 2018-04-11 11:59:07 UTC
++++ generic-deriving.cabal
+@@ -77,7 +77,7 @@ library
+
+ build-depends: containers >= 0.1 && < 0.6
+ , ghc-prim < 1
+- , template-haskell >= 2.4 && < 2.13
++ , template-haskell >= 2.4 && < 2.14
+
+ default-language: Haskell2010
+ ghc-options: -Wall
diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile
index 64e778e2878f..85cd3e14c0f3 100644
--- a/devel/hs-geniplate-mirror/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= geniplate-mirror
-PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTVERSION= 0.7.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
index 4559e257c665..5d127d7cd69d 100644
--- a/devel/hs-geniplate-mirror/distinfo
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499447732
-SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f
-SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297
+TIMESTAMP = 1523650498
+SHA256 (cabal/geniplate-mirror-0.7.6.tar.gz) = 4b6b82d0348e79ae4a5e1deac029441251ae87ec15a7667cf0a1de5ff80215f8
+SIZE (cabal/geniplate-mirror-0.7.6.tar.gz) = 9314
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 442c44dc0c19..e1ed89848b7d 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Library and tool for parsing .eventlog files from GHC
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.2.1
+USE_CABAL= mtl>=2.2.1 vector
EXECUTABLE= ghc-events
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index d5b8b4ab4904..df5d18eb0f43 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499451126
-SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769
-SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517
+TIMESTAMP = 1523991488
+SHA256 (cabal/ghc-events-0.7.2.tar.gz) = b01643f72a448fcd63a0b48781d71b21fb0bb22a54967f0b8a39db0e5638ffbf
+SIZE (cabal/ghc-events-0.7.2.tar.gz) = 203071
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 58a05d1f8d93..e79045e204cf 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.2.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 67f57e2fceb6..9b4d42c51d57 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 55209554a67d..83a56f9fb4e2 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gio
PORTVERSION= 0.13.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 0b87ba450366..608145b87b45 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= git-annex
PORTVERSION= 6.20170520
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile
index d4619b7a2b40..3c3405e1e464 100644
--- a/devel/hs-gitrev/Makefile
+++ b/devel/hs-gitrev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gitrev
PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index 1db3463f877d..025a510257da 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.13.4.1
-PORTREVISION= 1
+PORTVERSION= 0.13.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GLIB library for Gtk2Hs
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools text>=1.0.0.0 utf8-string>=0.2
+USE_CABAL= gtk2hs-buildtools utf8-string>=0.2
USE_GNOME= glib20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 6012de34c7a7..89495003481c 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499537811
-SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630
-SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441
+TIMESTAMP = 1524403919
+SHA256 (cabal/glib-0.13.6.0.tar.gz) = 4e71062c6a458440294d820e21449aa4666deed2ea233ef5915da7c1d4aee8eb
+SIZE (cabal/glib-0.13.6.0.tar.gz) = 39809
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 34d0177fc389..362e04174017 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.13.2.2
-PORTREVISION= 1
+PORTVERSION= 0.13.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 8f7d36f1bde7..0660f9d2a5a6 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499539633
-SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b
-SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124
+TIMESTAMP = 1523786090
+SHA256 (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 220f2f4aa1e01b8585fddf35bfc9f3a9dd300f2308d3c2b800c621cdd2ce7154
+SIZE (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 177911
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs
new file mode 100644
index 000000000000..9a31ddab2e46
--- /dev/null
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs
@@ -0,0 +1,10 @@
+--- c2hs/c/CPretty.hs.orig 2018-04-15 10:03:19 UTC
++++ c2hs/c/CPretty.hs
+@@ -34,6 +34,8 @@ module CPretty (
+ -- we are just providing instances to the class `Pretty'
+ ) where
+
++import Prelude hiding ((<>))
++
+ import Idents (Ident, identToLexeme)
+ import Text.PrettyPrint.HughesPJ
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal b/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal
new file mode 100644
index 000000000000..7c3def870f97
--- /dev/null
+++ b/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal
@@ -0,0 +1,11 @@
+--- gtk2hs-buildtools.cabal.orig 2018-04-15 10:01:41 UTC
++++ gtk2hs-buildtools.cabal
+@@ -40,7 +40,7 @@ Library
+ build-depends: base >= 4 && < 5,
+ process, array, pretty,
+ filepath, random,
+- Cabal >= 1.24.0.0 && < 2.1,
++ Cabal >= 1.24.0.0 && < 2.3,
+ filepath >= 1.3.0.0 && < 1.5,
+ directory >= 1.2.0.0 && < 1.4,
+ containers >= 0.5.5.1 && < 0.6
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
index 3cc59a571d81..f547ce7aeb3b 100644
--- a/devel/hs-haddock-api/Makefile
+++ b/devel/hs-haddock-api/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-api
-PORTVERSION= 2.17.4
-PORTREVISION= 1
+PORTVERSION= 2.19.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
index 0dbdea95c108..9162a8f99dba 100644
--- a/devel/hs-haddock-api/distinfo
+++ b/devel/hs-haddock-api/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499452541
-SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601
-SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712
+TIMESTAMP = 1523989416
+SHA256 (cabal/haddock-api-2.19.0.1.tar.gz) = 432be5729450dc1923637d4a3533932582a490e1fe81d48af8be9e2ba93ed130
+SIZE (cabal/haddock-api-2.19.0.1.tar.gz) = 177912
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index 3411d9764caf..3e46ea6e4f8c 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.4.3
-PORTREVISION= 1
+PORTVERSION= 1.5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Library exposing some functionality of Haddock
LICENSE= BSD3CLAUSE
+USE_CABAL= attoparsec
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 2723301ae1e4..c3bd020f4ec1 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499448291
-SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b
-SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863
+TIMESTAMP = 1523633978
+SHA256 (cabal/haddock-library-1.5.0.1.tar.gz) = ff2c10f043524135c809303c0d81c7f27a954f0174784e59a497e75e287aabb2
+SIZE (cabal/haddock-library-1.5.0.1.tar.gz) = 47111
diff --git a/devel/hs-haddock-library/files/patch-haddock-library.cabal b/devel/hs-haddock-library/files/patch-haddock-library.cabal
new file mode 100644
index 000000000000..dc8ed6c8aaba
--- /dev/null
+++ b/devel/hs-haddock-library/files/patch-haddock-library.cabal
@@ -0,0 +1,45 @@
+--- haddock-library.cabal.orig 2018-04-13 16:29:12 UTC
++++ haddock-library.cabal
+@@ -49,42 +49,6 @@ library
+ if impl(ghc >= 8.0)
+ ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+
+-library attoparsec
+- default-language: Haskell2010
+-
+- build-depends:
+- base >= 4.5 && < 4.12
+- , bytestring >= 0.9.2.1 && < 0.11
+- , deepseq >= 1.3 && < 1.5
+-
+- hs-source-dirs: vendor/attoparsec-0.13.1.0
+-
+- -- NB: haddock-library needs only small part of lib:attoparsec
+- -- internally, so we only bundle that subset here
+- exposed-modules:
+- Data.Attoparsec.ByteString
+- Data.Attoparsec.ByteString.Char8
+- Data.Attoparsec.Combinator
+-
+- other-modules:
+- Data.Attoparsec
+- Data.Attoparsec.ByteString.Buffer
+- Data.Attoparsec.ByteString.FastSet
+- Data.Attoparsec.ByteString.Internal
+- Data.Attoparsec.Internal
+- Data.Attoparsec.Internal.Fhthagn
+- Data.Attoparsec.Internal.Types
+- Data.Attoparsec.Number
+-
+- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2
+-
+- ghc-options: -Wall
+- if impl(ghc >= 8.0)
+- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+- else
+- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0
+-
+-
+ test-suite spec
+ type: exitcode-stdio-1.0
+ default-language: Haskell2010
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 36f6f9eef0a7..4fafa5fd647a 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.17.5
-PORTREVISION= 1
+PORTVERSION= 2.19.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 3191273deadb..fea2027f0c71 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538938
-SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3
-SIZE (cabal/haddock-2.17.5.tar.gz) = 244683
+TIMESTAMP = 1524638302
+SHA256 (cabal/haddock-2.19.0.1.tar.gz) = 6769a3fae0a7c2c7ebb41029d4d3c7916eb7d75fe6f307a0f7d00b07814c32bc
+SIZE (cabal/haddock-2.19.0.1.tar.gz) = 276623
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 801616a2a271..31feb832dba6 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.19.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 92173f40c455..17cf3dee4423 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.6.1
-PORTREVISION= 1
+PORTVERSION= 1.2.7.0
PORTEPOCH= 1
CATEGORIES= devel haskell
@@ -11,8 +10,6 @@ COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.0.5 vector
-
FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41
FLAGS_DEFAULT= INTEGER_GMP SSE2
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 6ac7cd366364..9c8ed5b1f252 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444230
-SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a
-SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305
+TIMESTAMP = 1523295742
+SHA256 (cabal/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf
+SIZE (cabal/hashable-1.2.7.0.tar.gz) = 30182
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 866c9afd7141..82ff07e1942f 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index ee08f82e9d2f..c0c25c263e26 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.2.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index 5b17209d1054..19284d783f92 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499459894
-SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951
-SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674
+TIMESTAMP = 1523445335
+SHA256 (cabal/hashtables-1.2.3.0.tar.gz) = f956b4bb6113f30193c9d85caebeda5000c29d8acf4f4994af650d3748bf73a5
+SIZE (cabal/hashtables-1.2.3.0.tar.gz) = 57335
diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile
index 7ea5ea6fdac2..9d90f185fc2f 100644
--- a/devel/hs-haskell-lexer/Makefile
+++ b/devel/hs-haskell-lexer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-lexer
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index bb4101eb9259..87d182b96bdc 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.19.1
-PORTREVISION= 1
+PORTVERSION= 1.20.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index 6be8325d27cb..ff44be61de7c 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501416565
-SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971
-SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952
+TIMESTAMP = 1523958315
+SHA256 (cabal/haskell-src-exts-1.20.2.tar.gz) = 9f6686e8bc8b849991207304e524747b0d1dcedfea351ac073ce971b36f9a3ea
+SIZE (cabal/haskell-src-exts-1.20.2.tar.gz) = 1387571
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-haskell-src-meta/Makefile
index 65afd1f1e63d..2f42bffeabaa 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-haskell-src-meta/Makefile
@@ -1,18 +1,15 @@
# $FreeBSD$
-PORTNAME= DrIFT
-PORTVERSION= 2.4.2
-PORTREVISION= 4
+PORTNAME= haskell-src-meta
+PORTVERSION= 0.8.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Program to derive type class instances
+COMMENT= Parse source to template-haskell abstract syntax
LICENSE= BSD3CLAUSE
-USE_CABAL= old-time random
-
-EXECUTABLE= DrIFT drift-ghc
+USE_CABAL= haskell-src-exts safe syb th-orphans
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-meta/distinfo b/devel/hs-haskell-src-meta/distinfo
new file mode 100644
index 000000000000..d6a3d72b14dc
--- /dev/null
+++ b/devel/hs-haskell-src-meta/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524930351
+SHA256 (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 4b7b143b94fcf147b96bb34822c2feeae29daadd3a22796ee36cadd5ca262c8b
+SIZE (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 20217
diff --git a/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal
new file mode 100644
index 000000000000..d7fb48b310c8
--- /dev/null
+++ b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal
@@ -0,0 +1,16 @@
+--- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC
++++ haskell-src-meta.cabal
+@@ -17,11 +17,11 @@ description: The translation from haskell-src-e
+ extra-source-files: ChangeLog README.md examples/*.hs
+
+ library
+- build-depends: base >= 4.6 && < 4.11,
++ build-depends: base >= 4.6 && < 4.12,
+ haskell-src-exts >= 1.18 && < 1.21,
+ pretty >= 1.0 && < 1.2,
+ syb >= 0.1 && < 0.8,
+- template-haskell >= 2.8 && < 2.13,
++ template-haskell >= 2.8 && < 2.14,
+ th-orphans >= 0.9.1 && < 0.14
+
+ if impl(ghc < 7.8)
diff --git a/devel/hs-haskell-src-meta/pkg-descr b/devel/hs-haskell-src-meta/pkg-descr
new file mode 100644
index 000000000000..7d35074b8eb2
--- /dev/null
+++ b/devel/hs-haskell-src-meta/pkg-descr
@@ -0,0 +1,4 @@
+The translation from haskell-src-exts abstract syntax to template-haskell
+abstract syntax.
+
+WWW: https://github.com/bmillwood/haskell-src-meta/
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index aa6bef0737ca..23d65d63e2b9 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haskell-src
-PORTVERSION= 1.0.2.0
-PORTREVISION= 2
+PORTVERSION= 1.0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 90bac848ea19..3fd728843029 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627839
-SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6
-SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636
+TIMESTAMP = 1524150777
+SHA256 (cabal/haskell-src-1.0.3.0.tar.gz) = b4b4941e8883da32c3f2b93f3ecdd5cff82ff9304cb91e89850b19095c908dbc
+SIZE (cabal/haskell-src-1.0.3.0.tar.gz) = 29863
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 9930b9ae1488..176c905a0800 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hasktags
PORTVERSION= 0.69.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
deleted file mode 100644
index b65716a66228..000000000000
--- a/devel/hs-hastache/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= hastache
-PORTVERSION= 0.6.1
-PORTREVISION= 2
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell implementation of Mustache templates
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= blaze-builder ieee754 mtl syb text
-
-EXECUTABLE= mkReadme
-
-INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
deleted file mode 100644
index 41407ad2d527..000000000000
--- a/devel/hs-hastache/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499627841
-SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
-SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-hastache/files/patch-hastache.cabal b/devel/hs-hastache/files/patch-hastache.cabal
deleted file mode 100644
index cd911a4513d7..000000000000
--- a/devel/hs-hastache/files/patch-hastache.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- hastache.cabal.orig 2014-12-23 10:40:08 UTC
-+++ hastache.cabal
-@@ -27,7 +27,7 @@ extra-source-files:
- executable mkReadme
- main-is: mkReadme.hs
- build-depends: hastache, process,
-- base >=4 && <4.9
-+ base >=4.4 && <4.10
- ,bytestring
- ,mtl
- ,transformers
-@@ -46,7 +46,7 @@ library
- Text.Hastache.Context
-
- build-depends:
-- base >=4 && <4.9
-+ base >=4.4 && <4.10
- ,bytestring
- ,mtl
- ,transformers
-@@ -69,7 +69,7 @@ test-suite test-hastache
-
- build-depends:
- hastache
-- ,base >=4 && <4.9
-+ ,base >=4.4 && <4.10
- ,directory
- ,mtl
- ,HUnit
diff --git a/devel/hs-hastache/pkg-descr b/devel/hs-hastache/pkg-descr
deleted file mode 100644
index 98b30e1f977d..000000000000
--- a/devel/hs-hastache/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Haskell implementation of Mustache templates [1].
-
-[1] http://mustache.github.com/
-
-WWW: https://github.com/lymar/hastache
diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile
index 265718411830..c6fc87868241 100644
--- a/devel/hs-hex/Makefile
+++ b/devel/hs-hex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hex
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 9b395cbe269e..1ca8cd900764 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.9
+PORTVERSION= 0.3.10
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libinotify.so:devel/libinotify
-USE_CABAL= async
+USE_CABAL= async hashable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index 4c22b16eb385..1db0ae299578 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627841
-SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99
-SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021
+TIMESTAMP = 1523460966
+SHA256 (cabal/hinotify-0.3.10.tar.gz) = af2b7d5733ab52ca38f0d9aed1ec37304f1d6964caa0fb556b8215858c1d5d9d
+SIZE (cabal/hinotify-0.3.10.tar.gz) = 9193
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 0d51b836f3dc..7c982aaa6626 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -14,5 +14,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \
mtl random utf8-string
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index e26443557971..ce69ae0b5fde 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index c201da52552c..40baaf63d40e 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -15,5 +15,7 @@ USE_CABAL= ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \
EXECUTABLE= hlint
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 5509c6c6e703..3ee4bd8ccd05 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 5.0.12
-PORTREVISION= 1
+PORTVERSION= 5.0.17.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,8 +13,8 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson cmdargs conduit conduit-extra connection extra \
haskell-src-exts http-conduit http-types js-flot js-jquery \
mmap network network-uri old-locale process-extras QuickCheck \
- resourcet tar text uniplate utf8-string vector wai wai-logger \
- warp warp-tls zlib
+ resourcet storable-tuple tar uniplate utf8-string vector wai \
+ wai-logger warp warp-tls zlib
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index dfbeb4d4eadb..a32055b9277b 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627842
-SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308
-SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464
+TIMESTAMP = 1525080726
+SHA256 (cabal/hoogle-5.0.17.3.tar.gz) = 66bebaf75600fef1c5fc0613ccc55c137aaed4c8f69653cf903f4fb003b98f9c
+SIZE (cabal/hoogle-5.0.17.3.tar.gz) = 86528
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
index 77366b300c98..8ec5d43dac66 100644
--- a/devel/hs-hourglass/Makefile
+++ b/devel/hs-hourglass/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hourglass
-PORTVERSION= 0.2.10
-PORTREVISION= 1
+PORTVERSION= 0.2.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
index 004beeb32729..884a1f43d036 100644
--- a/devel/hs-hourglass/distinfo
+++ b/devel/hs-hourglass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627843
-SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80
-SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417
+TIMESTAMP = 1523386565
+SHA256 (cabal/hourglass-0.2.11.tar.gz) = 18a6bb303fc055275cca45aaffc17b6a04b2e9d7509aa5aa5bb9d9239f4e4f51
+SIZE (cabal/hourglass-0.2.11.tar.gz) = 25904
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
index dc2b7fa90f1d..2fe596c45287 100644
--- a/devel/hs-hsb2hs/Makefile
+++ b/devel/hs-hsb2hs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hsb2hs
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index c45f9b67b5b3..7a6fffdb4085 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hslogger
PORTVERSION= 1.2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monadplus/Makefile b/devel/hs-hslua-module-text/Makefile
index 5fe9ee06cffd..a731eabd6fee 100644
--- a/devel/hs-monadplus/Makefile
+++ b/devel/hs-hslua-module-text/Makefile
@@ -1,12 +1,15 @@
# $FreeBSD$
-PORTNAME= monadplus
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTNAME= hslua-module-text
+PORTVERSION= 0.1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell98 partial maps and filters over MonadPlus
+COMMENT= Lua module for text
+
+LICENSE= MIT
+
+USE_CABAL= hslua
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslua-module-text/distinfo b/devel/hs-hslua-module-text/distinfo
new file mode 100644
index 000000000000..c44e0dfaef4f
--- /dev/null
+++ b/devel/hs-hslua-module-text/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524943044
+SHA256 (cabal/hslua-module-text-0.1.2.1.tar.gz) = aeb384f9743b76360f3779e44065fe297fb60f27519933f203b75bd8c2ba8e2d
+SIZE (cabal/hslua-module-text-0.1.2.1.tar.gz) = 3594
diff --git a/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal b/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal
new file mode 100644
index 000000000000..0cf1a95c964c
--- /dev/null
+++ b/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal
@@ -0,0 +1,18 @@
+--- hslua-module-text.cabal.orig 2018-04-28 19:25:33 UTC
++++ hslua-module-text.cabal
+@@ -20,7 +20,7 @@ source-repository head
+
+ library
+ exposed-modules: Foreign.Lua.Module.Text
+- build-depends: base >= 4.7 && < 4.11
++ build-depends: base >= 4.7 && < 4.12
+ , hslua >= 0.9 && < 0.10
+ , text >= 1 && < 1.3
+ hs-source-dirs: src
+@@ -37,4 +37,4 @@ test-suite test-hslua
+ , hslua-module-text
+ , tasty
+ , tasty-hunit
+- , text
+\ No newline at end of file
++ , text
diff --git a/devel/hs-hslua-module-text/pkg-descr b/devel/hs-hslua-module-text/pkg-descr
new file mode 100644
index 000000000000..59de04cbab38
--- /dev/null
+++ b/devel/hs-hslua-module-text/pkg-descr
@@ -0,0 +1,3 @@
+UTF-8 aware subset of Lua's string module.
+
+WWW: https://github.com/hslua/hslua-module-test
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index dbf7de6d654b..dc944afe4cae 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTVERSION= 0.9.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Lua language interpreter embedding in Haskell
LICENSE= MIT
+USE_CABAL= exceptions
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index c2f863c5136c..e99ab64d26f4 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627844
-SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b
-SIZE (cabal/hslua-0.5.0.tar.gz) = 132155
+TIMESTAMP = 1524940935
+SHA256 (cabal/hslua-0.9.5.1.tar.gz) = 681ffb1775e948143c0dd4be3086259f2eda8a9f7b09ce94016150c57e9d74d0
+SIZE (cabal/hslua-0.9.5.1.tar.gz) = 228252
diff --git a/devel/hs-hslua/files/patch-hslua.cabal b/devel/hs-hslua/files/patch-hslua.cabal
new file mode 100644
index 000000000000..83ac5715b79a
--- /dev/null
+++ b/devel/hs-hslua/files/patch-hslua.cabal
@@ -0,0 +1,12 @@
+--- hslua.cabal.orig 2018-04-28 18:45:32 UTC
++++ hslua.cabal
+@@ -77,8 +77,7 @@ library
+ build-depends: base >= 4.7 && < 5
+ , bytestring >= 0.10.2 && < 0.11
+ , containers >= 0.5 && < 0.6
+- , exceptions >= 0.8 && < 0.10
+- , fail >= 4.9 && < 5
++ , exceptions >= 0.8 && < 0.11
+ , mtl >= 2.2 && < 2.3
+ , text
+ exposed-modules: Foreign.Lua
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
index 7e93d7d33272..5bead25ff8b4 100644
--- a/devel/hs-hspec-core/Makefile
+++ b/devel/hs-hspec-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-core
-PORTVERSION= 2.4.4
-PORTREVISION= 1
+PORTVERSION= 2.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Testing Framework for Haskell
LICENSE= MIT
-USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.7.1 \
+USE_CABAL= ansi-terminal>=0.5 async>=2 clock hspec-expectations>=0.7.1 \
HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random setenv \
tf-random
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
index 4ed332246055..d4be3bf638d8 100644
--- a/devel/hs-hspec-core/distinfo
+++ b/devel/hs-hspec-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627845
-SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf
-SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871
+TIMESTAMP = 1523960255
+SHA256 (cabal/hspec-core-2.5.0.tar.gz) = f2e5e1b6142eccda9dd9a03212cad691ceba6f66c99e01098bdfdd9c55d708dd
+SIZE (cabal/hspec-core-2.5.0.tar.gz) = 55084
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index 405a40b06182..e7c0b714eb58 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-discover
-PORTVERSION= 2.4.4
-PORTREVISION= 1
+PORTVERSION= 2.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
index a21ccef98240..b7e9371a349b 100644
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627846
-SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47
-SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942
+TIMESTAMP = 1525007543
+SHA256 (cabal/hspec-discover-2.5.0.tar.gz) = 3e47c07c9e131c0327ac732b600986d99cfdd42a3b6b68502c01d986617a21e5
+SIZE (cabal/hspec-discover-2.5.0.tar.gz) = 6699
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 7a4f18976dcb..9e8dcf168035 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hspec-expectations
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index c97ba78ed6ec..d88193a362f0 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 2.4.4
-PORTREVISION= 1
+PORTVERSION= 2.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 4bf6e7e7d4ac..152c64e64e65 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627845
-SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21
-SIZE (cabal/hspec-2.4.4.tar.gz) = 10634
+TIMESTAMP = 1525007159
+SHA256 (cabal/hspec-2.5.0.tar.gz) = abeda4a3282b5a1d80809fd17554bcc1593554832a6b11366c7ae3b6d01c779b
+SIZE (cabal/hspec-2.5.0.tar.gz) = 9013
diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile
index 9093c4a0078e..c1ec5ad3ff2d 100644
--- a/devel/hs-io-streams-haproxy/Makefile
+++ b/devel/hs-io-streams-haproxy/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= io-streams-haproxy
-PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-io-streams-haproxy/distinfo b/devel/hs-io-streams-haproxy/distinfo
index 5753d01dfff3..64bff3881fd2 100644
--- a/devel/hs-io-streams-haproxy/distinfo
+++ b/devel/hs-io-streams-haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499716472
-SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f
-SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892
+TIMESTAMP = 1524413753
+SHA256 (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 77814f8258b5c32707a13e0d30ab2e144e7ad073aee821d6def65554024ed086
+SIZE (cabal/io-streams-haproxy-1.0.0.2.tar.gz) = 9888
diff --git a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
index bd2556d4f862..9a29416c3620 100644
--- a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
+++ b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
@@ -1,11 +1,11 @@
---- io-streams-haproxy.cabal.orig 2017-07-10 20:00:53 UTC
+--- io-streams-haproxy.cabal.orig 2018-04-22 16:18:46 UTC
+++ io-streams-haproxy.cabal
-@@ -38,7 +38,7 @@ library
- build-depends: base >= 4.5 && < 4.10,
+@@ -35,7 +35,7 @@ library
+ other-modules: System.IO.Streams.Network.Internal.Address
+ c-sources: cbits/byteorder.c
+
+- build-depends: base >= 4.5 && < 4.11,
++ build-depends: base >= 4.5 && < 4.12,
attoparsec >= 0.7 && < 0.14,
bytestring >= 0.9 && < 0.11,
-- io-streams >= 1.3 && < 1.4,
-+ io-streams >= 1.3 && < 1.5,
- network >= 2.3 && < 2.7,
- transformers >= 0.3 && < 0.6
- default-language: Haskell2010
+ io-streams >= 1.3 && < 1.6,
diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile
index c38d95206f01..0cdf52e14da9 100644
--- a/devel/hs-io-streams/Makefile
+++ b/devel/hs-io-streams/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= io-streams
-PORTVERSION= 1.4.0.0
-PORTREVISION= 1
+PORTVERSION= 1.5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simple and easy-to-use primitives for I/O using streams
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec network primitive text vector zlib-bindings
+USE_CABAL= attoparsec network primitive vector zlib-bindings
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-io-streams/distinfo b/devel/hs-io-streams/distinfo
index 8f375908cf33..c322b5a69087 100644
--- a/devel/hs-io-streams/distinfo
+++ b/devel/hs-io-streams/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499694762
-SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e
-SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422
+TIMESTAMP = 1523904656
+SHA256 (cabal/io-streams-1.5.0.1.tar.gz) = 5dcb3717933197a84f31be74abf545126b3d25eb0e0d64f722c480d3c46b2c8b
+SIZE (cabal/io-streams-1.5.0.1.tar.gz) = 62763
diff --git a/devel/hs-io-streams/files/patch-io-streams.cabal b/devel/hs-io-streams/files/patch-io-streams.cabal
index 41a7921eb24d..c0a4fc6eb045 100644
--- a/devel/hs-io-streams/files/patch-io-streams.cabal
+++ b/devel/hs-io-streams/files/patch-io-streams.cabal
@@ -1,4 +1,4 @@
---- io-streams.cabal.orig 2017-07-10 15:08:37 UTC
+--- io-streams.cabal.orig 2018-04-16 18:57:41 UTC
+++ io-streams.cabal
@@ -122,7 +122,6 @@ Library
Build-depends: base >= 4 && <5,
@@ -8,11 +8,3 @@
network >= 2.3 && <2.7,
primitive >= 0.2 && <0.7,
process >= 1.1 && <1.7,
-@@ -205,7 +204,6 @@ Test-suite testsuite
- Build-depends: base >= 4 && <5,
- attoparsec >= 0.10 && <0.14,
- bytestring >= 0.9 && <0.11,
-- bytestring-builder >= 0.10 && <0.11,
- deepseq >= 1.2 && <1.5,
- directory >= 1.1 && <2,
- filepath >= 1.2 && <2,
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
index faa5f96389e8..41a0dbf8957f 100644
--- a/devel/hs-js-flot/Makefile
+++ b/devel/hs-js-flot/Makefile
@@ -2,7 +2,7 @@
PORTNAME= js-flot
PORTVERSION= 0.8.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
index 789fffeb7c25..e642610375a9 100644
--- a/devel/hs-js-jquery/Makefile
+++ b/devel/hs-js-jquery/Makefile
@@ -2,7 +2,7 @@
PORTNAME= js-jquery
PORTVERSION= 3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index 09134dc00c3b..486cf54c6d65 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.11
-PORTREVISION= 1
+PORTVERSION= 3.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 214b50411120..30170011a0af 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627846
-SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2
-SIZE (cabal/keys-3.11.tar.gz) = 8674
+TIMESTAMP = 1523890076
+SHA256 (cabal/keys-3.12.tar.gz) = d4bfa78ff9df50224f1722925ae148279377193d04277a7dad224a47b34d5e55
+SIZE (cabal/keys-3.12.tar.gz) = 13353
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
new file mode 100644
index 000000000000..fff95670d49a
--- /dev/null
+++ b/devel/hs-kqueue/files/patch-kqueue.cabal
@@ -0,0 +1,16 @@
+--- kqueue.cabal.orig 2018-04-29 14:33:28 UTC
++++ kqueue.cabal
+@@ -21,11 +21,11 @@ Library
+ Hs-Source-Dirs: src
+ Exposed-modules: System.KQueue
+ System.KQueue.HighLevel
+- Build-depends: base >= 4.0 && < 4.10
++ Build-depends: base >= 4.0 && < 4.12
+ , directory >= 1.0 && < 1.4
+ , filepath >= 1.1 && < 1.5
+ , mtl >= 1.1 && < 2.3
+- , time >= 1.1 && < 1.7
++ , time >= 1.1 && < 1.9
+ , unix >= 2.3 && < 2.8
+ Build-tools: c2hs
+ GHC-Options: -Wall
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 2690e39c4ff5..a9ce5c42fd87 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 75b5bc3f40d6..823403e89134 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513181967
-SHA256 (cabal/language-c-0.7.1.tar.gz) = a7447123f9b3bec9319ee2a22b22d97f03acd6566b4f6caf5b9a1f71e4f7a9ca
-SIZE (cabal/language-c-0.7.1.tar.gz) = 181648
+TIMESTAMP = 1523449230
+SHA256 (cabal/language-c-0.7.2.tar.gz) = 63ad22ddd8e51747c8d64239029cf4afd3e7d4060c9b9478145479f5d4d549e5
+SIZE (cabal/language-c-0.7.2.tar.gz) = 121429
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index a32ac3eb2459..44f27ec5317f 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.6.0.10
-PORTREVISION= 1
+PORTVERSION= 0.6.0.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index e6721b6b616d..4395d009e085 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627848
-SHA256 (cabal/language-javascript-0.6.0.10.tar.gz) = caf14c410bf4463fda497af2b9ea750eddff34e55bc1cfc696f2fb4a36983e54
-SIZE (cabal/language-javascript-0.6.0.10.tar.gz) = 101770
+TIMESTAMP = 1523905950
+SHA256 (cabal/language-javascript-0.6.0.11.tar.gz) = d4756e9bc9a180cb93701e964a3157a03d4db4c7cb5a7b6b196067e587cc6143
+SIZE (cabal/language-javascript-0.6.0.11.tar.gz) = 106881
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index a922ae6f166c..296231411005 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -2,7 +2,7 @@
PORTNAME= largeword
PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 9ddcd05fd7cf..cb1afba040af 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index c066e5eda618..0c01c3205bf8 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.15.3
-PORTREVISION= 1
+PORTVERSION= 4.16.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,11 @@ COMMENT= Lenses, Folds and Traversals
LICENSE= BSD3CLAUSE
-USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=4 \
+USE_CABAL= base-orphans>=0.3 bifunctors>=5 call-stack comonad>=4 \
contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \
free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \
parallel>=3.1.0.1 profunctors>=5 reflection>=2 \
- semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \
+ semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 \
th-abstraction transformers-compat>=0.4 unordered-containers>=0.2.4 \
vector>=0.9 void>=0.5
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 448a02506de2..789bb48a2e8b 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627850
-SHA256 (cabal/lens-4.15.3.tar.gz) = a2613bb987792da597b514c979636882931d46c596b37d5fbbcdb63bed30cd7e
-SIZE (cabal/lens-4.15.3.tar.gz) = 985354
+TIMESTAMP = 1524407577
+SHA256 (cabal/lens-4.16.1.tar.gz) = f5bec97b1d5cf3d6487afebc79b927bd5a18f1fd594b104de36a35bf606ea4c6
+SIZE (cabal/lens-4.16.1.tar.gz) = 991132
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
index 2e256e0b35ca..73481a18fabd 100644
--- a/devel/hs-lifted-async/Makefile
+++ b/devel/hs-lifted-async/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-async
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.10.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
index 539c569e4539..881e89c193dc 100644
--- a/devel/hs-lifted-async/distinfo
+++ b/devel/hs-lifted-async/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499608443
-SHA256 (cabal/lifted-async-0.9.3.tar.gz) = 97978307f34c8ab1d765724d723a13fede4112a94fe5fbf3494f00378961b461
-SIZE (cabal/lifted-async-0.9.3.tar.gz) = 10321
+TIMESTAMP = 1523785768
+SHA256 (cabal/lifted-async-0.10.0.1.tar.gz) = 0d925b16fffe6fb3db994165401aeb0752595d1feec3011eba5b8b2c8524c4b1
+SIZE (cabal/lifted-async-0.10.0.1.tar.gz) = 10129
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 56e01dd5cfee..6615ec1fa178 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lifted-base
PORTVERSION= 0.2.3.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index ae97fd948619..650ab9ee1161 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile
index d0354d6c13c4..b766a8994056 100644
--- a/devel/hs-map-syntax/Makefile
+++ b/devel/hs-map-syntax/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= map-syntax
-PORTVERSION= 0.2.0.2
-PORTREVISION= 1
+PORTVERSION= 0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo
index 809123a512af..1b481dc835bb 100644
--- a/devel/hs-map-syntax/distinfo
+++ b/devel/hs-map-syntax/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627850
-SHA256 (cabal/map-syntax-0.2.0.2.tar.gz) = b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a
-SIZE (cabal/map-syntax-0.2.0.2.tar.gz) = 6944
+TIMESTAMP = 1523633771
+SHA256 (cabal/map-syntax-0.3.tar.gz) = 9330065755202de07809fb23605da43d0fd0e25d72915ce22b5c6994526c6d2c
+SIZE (cabal/map-syntax-0.3.tar.gz) = 7104
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
index 51503dc49c11..d7a438c02e45 100644
--- a/devel/hs-memory/Makefile
+++ b/devel/hs-memory/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= memory
-PORTVERSION= 0.14.6
-PORTREVISION= 1
+PORTVERSION= 0.14.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Memory and related abtraction stuff
LICENSE= BSD3CLAUSE
-USE_CABAL= foundation
+USE_CABAL= basement foundation
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
index c5cc22911f6d..baf6072f3420 100644
--- a/devel/hs-memory/distinfo
+++ b/devel/hs-memory/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444278
-SHA256 (cabal/memory-0.14.6.tar.gz) = c7dec070174756f1753010585a6dcd4f958a4360634142c4e387b3475bffc160
-SIZE (cabal/memory-0.14.6.tar.gz) = 37020
+TIMESTAMP = 1523375674
+SHA256 (cabal/memory-0.14.16.tar.gz) = 7bb0834ab28ce1248f3be09df211d49d20d703cdcda3ed16cde99356e2d72b0f
+SIZE (cabal/memory-0.14.16.tar.gz) = 42207
diff --git a/devel/hs-microlens-th/Makefile b/devel/hs-microlens-th/Makefile
index 6cd3114b4350..4496a6b6ff44 100644
--- a/devel/hs-microlens-th/Makefile
+++ b/devel/hs-microlens-th/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= microlens-th
-PORTVERSION= 0.4.1.1
-PORTREVISION= 1
+PORTVERSION= 0.4.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= This package lets you automatically generate lenses for data types
LICENSE= BSD3CLAUSE
-USE_CABAL= microlens
+USE_CABAL= microlens th-abstraction
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-microlens-th/distinfo b/devel/hs-microlens-th/distinfo
index 80e863a6dc7b..ba492245a245 100644
--- a/devel/hs-microlens-th/distinfo
+++ b/devel/hs-microlens-th/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499789717
-SHA256 (cabal/microlens-th-0.4.1.1.tar.gz) = 5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b
-SIZE (cabal/microlens-th-0.4.1.1.tar.gz) = 16406
+TIMESTAMP = 1523954941
+SHA256 (cabal/microlens-th-0.4.2.1.tar.gz) = ec57108e9ab54c085dd316b60ac156e6624078a46682a60ed2462005cae4fc42
+SIZE (cabal/microlens-th-0.4.2.1.tar.gz) = 20972
diff --git a/devel/hs-microlens/Makefile b/devel/hs-microlens/Makefile
index afd4c46018f3..b53560a69590 100644
--- a/devel/hs-microlens/Makefile
+++ b/devel/hs-microlens/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= microlens
-PORTVERSION= 0.4.8.0
-PORTREVISION= 1
+PORTVERSION= 0.4.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-microlens/distinfo b/devel/hs-microlens/distinfo
index 2ab34561f53c..ea768eabb0bf 100644
--- a/devel/hs-microlens/distinfo
+++ b/devel/hs-microlens/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499703416
-SHA256 (cabal/microlens-0.4.8.0.tar.gz) = aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5
-SIZE (cabal/microlens-0.4.8.0.tar.gz) = 24766
+TIMESTAMP = 1523449015
+SHA256 (cabal/microlens-0.4.9.1.tar.gz) = a1401c6f92c142bafea4cf58a1d99cc34af285df808b97f5b64af4bb81fb5648
+SIZE (cabal/microlens-0.4.9.1.tar.gz) = 25185
diff --git a/devel/hs-microstache/Makefile b/devel/hs-microstache/Makefile
index ee776495f61f..f03b6a856723 100644
--- a/devel/hs-microstache/Makefile
+++ b/devel/hs-microstache/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= microstache
-PORTVERSION= 1
-PORTREVISION= 1
+PORTVERSION= 1.0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Mustache templates for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson parsec semigroups text unordered-containers vector
+USE_CABAL= aeson semigroups unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-microstache/distinfo b/devel/hs-microstache/distinfo
index a5f70a866a65..992082da0952 100644
--- a/devel/hs-microstache/distinfo
+++ b/devel/hs-microstache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499618263
-SHA256 (cabal/microstache-1.tar.gz) = e8875bfeac9e54e84d7c91f1f448ee80ec07b9b3db28d5369131fbaa20517164
-SIZE (cabal/microstache-1.tar.gz) = 19859
+TIMESTAMP = 1524430537
+SHA256 (cabal/microstache-1.0.1.1.tar.gz) = 5de98542313eb75f84961366ff8a70ed632387ba6518215035b2dd1b32d6a120
+SIZE (cabal/microstache-1.0.1.1.tar.gz) = 20449
diff --git a/devel/hs-microstache/files/patch-microstache.cabal b/devel/hs-microstache/files/patch-microstache.cabal
new file mode 100644
index 000000000000..f02f657fe665
--- /dev/null
+++ b/devel/hs-microstache/files/patch-microstache.cabal
@@ -0,0 +1,11 @@
+--- microstache.cabal.orig 2018-04-22 20:59:09 UTC
++++ microstache.cabal
+@@ -40,7 +40,7 @@ source-repository head
+
+ library
+ build-depends:
+- aeson >=0.11 && < 1.3,
++ aeson >=0.11 && < 1.4,
+ base >=4.5 && < 5.0,
+ bytestring >=0.9.2.1 && < 0.11,
+ containers >=0.4.2.1 && < 0.6,
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index 77f0a132e9e4..e3867900d32a 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index a0818fd1ce1e..ab89f701257d 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mmorph
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 4202679698da..12c93e38d174 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-control
PORTVERSION= 1.0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index 879c38e9c48b..067e1b9191ca 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.24
+PORTVERSION= 0.3.28.5
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -12,7 +12,7 @@ LICENSE= MIT
USE_CABAL= blaze-builder conduit>=1.0 conduit-extra>=1.0 exceptions \
fast-logger>=2.0 lifted-base monad-control monad-loops \
- mtl resourcet>=0.4 stm stm-chans text transformers-base
+ mtl resourcet>=0.4 stm-chans transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 382f3b033835..cc343381bde4 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499595500
-SHA256 (cabal/monad-logger-0.3.24.tar.gz) = 05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4
-SIZE (cabal/monad-logger-0.3.24.tar.gz) = 9525
+TIMESTAMP = 1524399749
+SHA256 (cabal/monad-logger-0.3.28.5.tar.gz) = 225ed7cd2d0d375c0207d5d3b9faa12b339ca7dd51ca92f96d3eaf2d360027f1
+SIZE (cabal/monad-logger-0.3.28.5.tar.gz) = 10720
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index 5501b0da2f58..0dfa09473271 100644
--- a/devel/hs-monad-loops/Makefile
+++ b/devel/hs-monad-loops/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-loops
PORTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index 480ccc623965..a2087af345eb 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 72bb1dcb9310..71dba0c41d2b 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par
PORTVERSION= 0.3.4.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-unlift/Makefile b/devel/hs-monad-unlift/Makefile
index 912400e7041c..a7199948011f 100644
--- a/devel/hs-monad-unlift/Makefile
+++ b/devel/hs-monad-unlift/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-unlift
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monadplus/distinfo b/devel/hs-monadplus/distinfo
deleted file mode 100644
index 0adffef4e7f5..000000000000
--- a/devel/hs-monadplus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1500997085
-SHA256 (cabal/monadplus-1.4.2.tar.gz) = 366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595
-SIZE (cabal/monadplus-1.4.2.tar.gz) = 3671
diff --git a/devel/hs-monadplus/pkg-descr b/devel/hs-monadplus/pkg-descr
deleted file mode 100644
index 6e70945c31ab..000000000000
--- a/devel/hs-monadplus/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Filtering and folding over arbitrary MonadPlus instances. This package
-generalizes many common stream operations such as filter, catMaybes etc.
-
-WWW: http://hackage.haskell.org/package/monadplus
-
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 00055c0239eb..e0fea0d183f6 100644
--- a/devel/hs-monads-tf/Makefile
+++ b/devel/hs-monads-tf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monads-tf
PORTVERSION= 0.1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable-instances/Makefile b/devel/hs-mono-traversable-instances/Makefile
index 310eb9f816a0..12baa3df9e0e 100644
--- a/devel/hs-mono-traversable-instances/Makefile
+++ b/devel/hs-mono-traversable-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mono-traversable-instances
PORTVERSION= 0.1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index aa321a416e40..6269335319dc 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mono-traversable
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container
LICENSE= MIT
USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \
- semigroupoids>=3.0 semigroups>=0.10 split text>=0.11 \
+ semigroupoids>=3.0 semigroups>=0.10 split \
unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \
vector-instances
diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo
index 43c929c4eac3..f1e4155d8124 100644
--- a/devel/hs-mono-traversable/distinfo
+++ b/devel/hs-mono-traversable/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627851
-SHA256 (cabal/mono-traversable-1.0.2.tar.gz) = aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633
-SIZE (cabal/mono-traversable-1.0.2.tar.gz) = 38239
+TIMESTAMP = 1523892095
+SHA256 (cabal/mono-traversable-1.0.8.1.tar.gz) = 991290797bd77ce2f2e23dd5dea32fb159c6cb9310615f64a0703ea4c6373935
+SIZE (cabal/mono-traversable-1.0.8.1.tar.gz) = 39037
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index c5f88a3a1e19..57c521faac13 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index cc57656ab636..90c250e69210 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mueval
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 0844303558da..6e0522fb6a62 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= murmur-hash
PORTVERSION= 0.1.0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
index 93e126a531e2..2b1993bd3986 100644
--- a/devel/hs-mutable-containers/Makefile
+++ b/devel/hs-mutable-containers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mutable-containers
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ncurses/Makefile b/devel/hs-ncurses/Makefile
index 032d9259ce5d..c9bcae18f3af 100644
--- a/devel/hs-ncurses/Makefile
+++ b/devel/hs-ncurses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncurses
PORTVERSION= 0.2.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,6 @@ COMMENT= Modernised Haskell binding to GNU ncurses
LICENSE= GPLv3
USE_C2HS= yes
-USE_CABAL= text
USES= ncurses
diff --git a/devel/hs-newtype-generics/Makefile b/devel/hs-newtype-generics/Makefile
index 15948e7033e4..6b31742a013c 100644
--- a/devel/hs-newtype-generics/Makefile
+++ b/devel/hs-newtype-generics/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= newtype-generics
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-newtype-generics/distinfo b/devel/hs-newtype-generics/distinfo
index 377a45c1a4b3..8eb50b9807ba 100644
--- a/devel/hs-newtype-generics/distinfo
+++ b/devel/hs-newtype-generics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499700022
-SHA256 (cabal/newtype-generics-0.5.tar.gz) = dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c
-SIZE (cabal/newtype-generics-0.5.tar.gz) = 4490
+TIMESTAMP = 1523473191
+SHA256 (cabal/newtype-generics-0.5.3.tar.gz) = f295f001a86bdbcf759d6b91b9e7ae27cd431ccf41d9b9d34ee1c926b88efe45
+SIZE (cabal/newtype-generics-0.5.3.tar.gz) = 6956
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
index 916a6f08c242..ec00fba0c523 100644
--- a/devel/hs-newtype/Makefile
+++ b/devel/hs-newtype/Makefile
@@ -2,7 +2,7 @@
PORTNAME= newtype
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
index dc4b8ff23f76..03b24bb645a7 100644
--- a/devel/hs-old-locale/Makefile
+++ b/devel/hs-old-locale/Makefile
@@ -2,7 +2,7 @@
PORTNAME= old-locale
PORTVERSION= 1.0.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-locale/files/patch-git_15fea2d b/devel/hs-old-locale/files/patch-git_15fea2d
index 89a56aedd192..c78bf11e3c9a 100644
--- a/devel/hs-old-locale/files/patch-git_15fea2d
+++ b/devel/hs-old-locale/files/patch-git_15fea2d
@@ -16,6 +16,6 @@ index 37057a8..52aa83a 100644
System.Locale
- build-depends: base >= 4.2 && < 4.9
-+ build-depends: base >= 4.2 && < 4.11
++ build-depends: base >= 4.2 && < 4.12
ghc-options: -Wall
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
index 7341b0eab868..333f45db796d 100644
--- a/devel/hs-old-time/Makefile
+++ b/devel/hs-old-time/Makefile
@@ -2,7 +2,7 @@
PORTNAME= old-time
PORTVERSION= 1.1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-time/files/patch-git_82790af b/devel/hs-old-time/files/patch-git_82790af
index d2f1d70132f1..842bf10e1c62 100644
--- a/devel/hs-old-time/files/patch-git_82790af
+++ b/devel/hs-old-time/files/patch-git_82790af
@@ -16,7 +16,7 @@ index d322965..3a0e85c 100644
build-depends:
- base >= 4.7 && < 4.9,
-+ base >= 4.7 && < 4.11,
++ base >= 4.7 && < 4.12,
old-locale == 1.0.*
ghc-options: -Wall
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index b195fe4858eb..b76b16ca9b38 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -2,7 +2,7 @@
PORTNAME= optparse-applicative
PORTVERSION= 0.14.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/files/patch-parallel.cabal b/devel/hs-parallel/files/patch-parallel.cabal
new file mode 100644
index 000000000000..a95e09349d97
--- /dev/null
+++ b/devel/hs-parallel/files/patch-parallel.cabal
@@ -0,0 +1,10 @@
+--- parallel.cabal.orig 2018-04-10 09:45:32 UTC
++++ parallel.cabal
+@@ -34,7 +34,7 @@ library
+
+ build-depends:
+ array >= 0.3 && < 0.6,
+- base >= 4.3 && < 4.11,
++ base >= 4.3 && < 4.12,
+ containers >= 0.4 && < 0.6,
+ deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index d3788c0a1470..7af361e589db 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pcre-light
PORTVERSION= 0.4.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index 55989575fd61..cad81f93c1e5 100644
--- a/devel/hs-prelude-extras/Makefile
+++ b/devel/hs-prelude-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prelude-extras
PORTVERSION= 0.4.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
index b9183cf0c802..8cbe3b2fbd6c 100644
--- a/devel/hs-preprocessor-tools/Makefile
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -10,7 +10,9 @@ COMMENT= Framework for extending Haskell's syntax via quick-and-dirty preprocess
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=1 parsec>=3 syb>=0
+USE_CABAL= mtl>=1 syb>=0
+
+IGNORE= Doesn't build with recent GHC version
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index a71a9377336a..b412a586cc08 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 8b4c9f00fdf6..ea3af1843f38 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.6.2.0
-PORTREVISION= 1
+PORTVERSION= 0.6.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 5b1160e13356..2b25698e8a2d 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444407
-SHA256 (cabal/primitive-0.6.2.0.tar.gz) = b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1
-SIZE (cabal/primitive-0.6.2.0.tar.gz) = 23954
+TIMESTAMP = 1523292481
+SHA256 (cabal/primitive-0.6.3.0.tar.gz) = cddeff804e0f577f1be0179d5d145dfc170f8bfb66f663b9fba67104a45d9555
+SIZE (cabal/primitive-0.6.3.0.tar.gz) = 25336
diff --git a/devel/hs-process-extras/Makefile b/devel/hs-process-extras/Makefile
index bd0747a3583a..f668ce1a15d7 100644
--- a/devel/hs-process-extras/Makefile
+++ b/devel/hs-process-extras/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= process-extras
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 0.7.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Read process input and output as ByteStrings or Text
LICENSE= BSD3CLAUSE
-USE_CABAL= data-default generic-deriving ListLike mtl text
+USE_CABAL= data-default generic-deriving ListLike mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-process-extras/distinfo b/devel/hs-process-extras/distinfo
index 0cd81481a508..ef43c829a1d1 100644
--- a/devel/hs-process-extras/distinfo
+++ b/devel/hs-process-extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499719583
-SHA256 (cabal/process-extras-0.7.2.tar.gz) = e76c1031ec696dcd25b05f1b00611585a40050aa30548394d084a72267a8e958
-SIZE (cabal/process-extras-0.7.2.tar.gz) = 14267
+TIMESTAMP = 1523957985
+SHA256 (cabal/process-extras-0.7.4.tar.gz) = 293e75f849254ce0ce0d7fa659681917e07a557c602505a2f9e20777467e984e
+SIZE (cabal/process-extras-0.7.4.tar.gz) = 14256
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index e8a27dd0df25..d530e0efb21e 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 5.2
-PORTREVISION= 1
+PORTVERSION= 5.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index f23b78305725..2bac91b4fc8d 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499595371
-SHA256 (cabal/profunctors-5.2.tar.gz) = 87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4
-SIZE (cabal/profunctors-5.2.tar.gz) = 23236
+TIMESTAMP = 1523817696
+SHA256 (cabal/profunctors-5.2.2.tar.gz) = e981e6a33ac99d38a947a749179bbea3c294ecf6bfde41660fe6d8d5a2e43768
+SIZE (cabal/profunctors-5.2.2.tar.gz) = 28155
diff --git a/devel/hs-profunctors/files/patch-git_c0574c b/devel/hs-profunctors/files/patch-git_c0574c
deleted file mode 100644
index af645f89acb5..000000000000
--- a/devel/hs-profunctors/files/patch-git_c0574c
+++ /dev/null
@@ -1,22 +0,0 @@
-From c0574c91a459083066d656bec39e67dfa02daf06 Mon Sep 17 00:00:00 2001
-From: Ryan Scott <ryan.gl.scott@gmail.com>
-Date: Mon, 10 Apr 2017 09:41:23 -0400
-Subject: [PATCH] Bump base-orphans upper version bounds
-
----
- profunctors.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/profunctors.cabal b/profunctors.cabal
-index 1233e734..8f94e27c 100644
---- profunctors.cabal
-+++ profunctors.cabal
-@@ -30,7 +30,7 @@ source-repository head
- library
- build-depends:
- base >= 4 && < 5,
-- base-orphans >= 0.4 && < 0.6,
-+ base-orphans >= 0.4 && < 0.7,
- bifunctors >= 5.2 && < 6,
- comonad >= 4 && < 6,
- contravariant >= 1 && < 2,
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index d69dcb232d2b..e8a248e3d026 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Specify Haskell project templates and generate files
LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \
- resourcet>=0.4.3 text>=0.11
+ resourcet>=0.4.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 66526b2a741d..72a719d30516 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627854
-SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310
-SIZE (cabal/project-template-0.2.0.tar.gz) = 8251
+TIMESTAMP = 1524430893
+SHA256 (cabal/project-template-0.2.0.1.tar.gz) = eb52496fa7448f5fed445525c05327b31a45282fc1d0a772c7022a9809e7c9dc
+SIZE (cabal/project-template-0.2.0.1.tar.gz) = 8321
diff --git a/devel/hs-psqueues/Makefile b/devel/hs-psqueues/Makefile
index 07abee5bf875..6e0391a150b3 100644
--- a/devel/hs-psqueues/Makefile
+++ b/devel/hs-psqueues/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= psqueues
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-psqueues/distinfo b/devel/hs-psqueues/distinfo
index 804de738bb55..53726d83d4ae 100644
--- a/devel/hs-psqueues/distinfo
+++ b/devel/hs-psqueues/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499689628
-SHA256 (cabal/psqueues-0.2.3.0.tar.gz) = 25ed95de5de62831d3e1db47aabd0b589ddf71aeec2d53bc3104a9bb663743a7
-SIZE (cabal/psqueues-0.2.3.0.tar.gz) = 26646
+TIMESTAMP = 1523432363
+SHA256 (cabal/psqueues-0.2.6.0.tar.gz) = 9a6a10c99a64617bdab28331bed4a77cdd373283ebc2a6f73eda488462d06958
+SIZE (cabal/psqueues-0.2.6.0.tar.gz) = 27266
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index 0d7772d20b1f..0c4c9d9065a3 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -2,7 +2,7 @@
PORTNAME= quickcheck-io
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index b14284f93979..4f5883a7caf7 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= random
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readable/Makefile b/devel/hs-readable/Makefile
index dea27707cb52..9667f20ca170 100644
--- a/devel/hs-readable/Makefile
+++ b/devel/hs-readable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= readable
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Reading data types from ByteString and Text
LICENSE= BSD3CLAUSE
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 491a49ba43e7..5252125794f3 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-refact/Makefile b/devel/hs-refact/Makefile
index e20c6faaf8c5..9c8b79e2ede2 100644
--- a/devel/hs-refact/Makefile
+++ b/devel/hs-refact/Makefile
@@ -2,7 +2,7 @@
PORTNAME= refact
PORTVERSION= 0.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index b8802f12b114..fc8a768a51c1 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTVERSION= 2.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index cec6f7cf28da..5016d7aa1ae5 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627855
-SHA256 (cabal/reflection-2.1.2.tar.gz) = a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39
-SIZE (cabal/reflection-2.1.2.tar.gz) = 14334
+TIMESTAMP = 1523900374
+SHA256 (cabal/reflection-2.1.3.tar.gz) = 88f81923abd7211e51de7071cd5800b30784e374c193de8cdd7b1c201f8de405
+SIZE (cabal/reflection-2.1.3.tar.gz) = 18085
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 278a023b0d12..8901d9173ee4 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -2,7 +2,7 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT= High-performance striped resource pooling implementation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable monad-control>=0.2.0.1 stm>=2.3 \
- transformers-base>=0.4 vector>=0.7
+USE_CABAL= hashable monad-control>=0.2.0.1 transformers-base>=0.4 \
+ vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 2fb3992a9b12..8c4849ba9fd4 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 1.1.9
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,8 @@ COMMENT= Deterministic allocation and freeing of scarce resources
LICENSE= BSD3CLAUSE
USE_CABAL= exceptions lifted-base mmorph monad-control mtl \
- transformers-base transformers-compat
+ primitive transformers-base transformers-compat \
+ unliftio-core
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index f56286edbe44..cbc436e55e75 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499458469
-SHA256 (cabal/resourcet-1.1.9.tar.gz) = 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5
-SIZE (cabal/resourcet-1.1.9.tar.gz) = 15215
+TIMESTAMP = 1523696873
+SHA256 (cabal/resourcet-1.2.1.tar.gz) = e765c12a6ec0f70efc3c938750060bc17569b99578aa635fd4da0c4d06fcf267
+SIZE (cabal/resourcet-1.2.1.tar.gz) = 16459
diff --git a/devel/hs-safe-exceptions/Makefile b/devel/hs-safe-exceptions/Makefile
index fbc0b18a2730..664947b3f310 100644
--- a/devel/hs-safe-exceptions/Makefile
+++ b/devel/hs-safe-exceptions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= safe-exceptions
-PORTVERSION= 0.1.6.0
-PORTREVISION= 1
+PORTVERSION= 0.1.7.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe-exceptions/distinfo b/devel/hs-safe-exceptions/distinfo
index 651ca5d1f089..3f12e9f4aebe 100644
--- a/devel/hs-safe-exceptions/distinfo
+++ b/devel/hs-safe-exceptions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499717912
-SHA256 (cabal/safe-exceptions-0.1.6.0.tar.gz) = 71d47ce1049465b02d89231f2931e7a1d22b6960e85fca5281162e979cf08d1c
-SIZE (cabal/safe-exceptions-0.1.6.0.tar.gz) = 13447
+TIMESTAMP = 1523650633
+SHA256 (cabal/safe-exceptions-0.1.7.0.tar.gz) = 18cddc587b52b6faa0287fb6ad6c964d1562571ea2c8ff57a194dd54b5fba069
+SIZE (cabal/safe-exceptions-0.1.7.0.tar.gz) = 13533
diff --git a/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal
new file mode 100644
index 000000000000..65a07f779527
--- /dev/null
+++ b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal
@@ -0,0 +1,13 @@
+--- safe-exceptions.cabal.orig 2018-04-13 20:24:13 UTC
++++ safe-exceptions.cabal
+@@ -16,9 +16,9 @@ cabal-version: >=1.10
+ library
+ hs-source-dirs: src
+ exposed-modules: Control.Exception.Safe
+- build-depends: base >= 4.7 && < 4.11
++ build-depends: base >= 4.7 && < 4.12
+ , deepseq >= 1.2 && < 1.5
+- , exceptions >= 0.8 && < 0.9
++ , exceptions >= 0.8 && < 0.11
+ , transformers >= 0.2 && < 0.6
+ default-language: Haskell2010
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index 751f63f2935e..4d37af1a554b 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= safe
PORTVERSION= 0.3.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-say/Makefile b/devel/hs-say/Makefile
index c76b84490658..4fa4329ef0f2 100644
--- a/devel/hs-say/Makefile
+++ b/devel/hs-say/Makefile
@@ -2,7 +2,7 @@
PORTNAME= say
PORTVERSION= 0.1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= The say packagae
LICENSE= BSD3CLAUSE
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index 53cce24769b3..cf9088dfce7f 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= scientific
-PORTVERSION= 0.3.5.1
-PORTREVISION= 1
+PORTVERSION= 0.3.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Numbers represented using scientific notation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.2 text>=0.8 integer-logarithms vector
+USE_CABAL= hashable>=1.1.2 integer-logarithms vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
index c36c330750e5..f19a37289903 100644
--- a/devel/hs-scientific/distinfo
+++ b/devel/hs-scientific/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627855
-SHA256 (cabal/scientific-0.3.5.1.tar.gz) = 5ba6e682cbb6cd5c6444d1c6c35f3b396e316637a14456b18de58c9a33661ba6
-SIZE (cabal/scientific-0.3.5.1.tar.gz) = 20777
+TIMESTAMP = 1523636073
+SHA256 (cabal/scientific-0.3.5.3.tar.gz) = 12a6d13417c24e4b7f905d6cd8dcd1d9ae51f6f7ba3fda13057d521c8fc2c748
+SIZE (cabal/scientific-0.3.5.3.tar.gz) = 21013
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index fcd425c77bea..c14c44a3eff6 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= securemem
-PORTVERSION= 0.1.9
-PORTREVISION= 2
+PORTVERSION= 0.1.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Abstraction to an auto scrubbing and const time eq, memory chunk
LICENSE= BSD3CLAUSE
-USE_CABAL= byteable>=0.1.1 memory>=0.7
+USE_CABAL= basement byteable>=0.1.1 foundation memory>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
index 2cfe81816758..85b54ae11192 100644
--- a/devel/hs-securemem/distinfo
+++ b/devel/hs-securemem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627856
-SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036
-SIZE (cabal/securemem-0.1.9.tar.gz) = 4180
+TIMESTAMP = 1523431880
+SHA256 (cabal/securemem-0.1.10.tar.gz) = 32895a4748508da58207b4867266601af6259b7109af80bbf5d2e9e598e016a6
+SIZE (cabal/securemem-0.1.10.tar.gz) = 3801
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index 501a0fef2901..cf7d9dd72b45 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,7 +2,7 @@
PORTNAME= setenv
PORTVERSION= 0.1.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setlocale/Makefile b/devel/hs-setlocale/Makefile
index fa2ad9188132..aae9201616f7 100644
--- a/devel/hs-setlocale/Makefile
+++ b/devel/hs-setlocale/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= setlocale
-PORTVERSION= 1.0.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setlocale/distinfo b/devel/hs-setlocale/distinfo
index 7faa69e6456a..516f2deb21f9 100644
--- a/devel/hs-setlocale/distinfo
+++ b/devel/hs-setlocale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627856
-SHA256 (cabal/setlocale-1.0.0.5.tar.gz) = 57438491475004eda12d7a73eea0ab1c5fb28774027626e5bbcb142fe57d9ff0
-SIZE (cabal/setlocale-1.0.0.5.tar.gz) = 2108
+TIMESTAMP = 1523637605
+SHA256 (cabal/setlocale-1.0.0.6.tar.gz) = 587af63153c1f3642de2c2f526b3a3c82c46ece3bd09ffd96a0eedbfd1c288e6
+SIZE (cabal/setlocale-1.0.0.6.tar.gz) = 2113
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index f4ceb82429ba..dad555b2a3f6 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shake
-PORTVERSION= 0.15.11
-PORTREVISION= 1
+PORTVERSION= 0.16.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Build system library, like Make, but more accurate dependencies
LICENSE= BSD3CLAUSE
USE_CABAL= extra>=1.3 hashable>=1.1.2.3 js-flot js-jquery old-time \
- random unordered-containers>=0.2.1 utf8-string>=0.3
+ primitive random unordered-containers>=0.2.1 utf8-string>=0.3
EXECUTABLE= shake
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index b7f44b6f0a76..5c68f94d29f4 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544643
-SHA256 (cabal/shake-0.15.11.tar.gz) = 05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb
-SIZE (cabal/shake-0.15.11.tar.gz) = 513926
+TIMESTAMP = 1525012625
+SHA256 (cabal/shake-0.16.4.tar.gz) = b732a3a46ceb3b4545a78c3733e0a7904763e7cd3ee8bf4fe2e1e91f2c9b1436
+SIZE (cabal/shake-0.16.4.tar.gz) = 531091
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 35b24dacba8e..b7a31e7fee56 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index d15c6bec8288..4ff7e865884e 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,7 +2,7 @@
PORTNAME= silently
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 40a47decc930..a32237cae02b 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= simple-reflect
-PORTVERSION= 0.3.2
-PORTREVISION= 4
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
index 5e7ecbf9a708..24fde323ef2b 100644
--- a/devel/hs-simple-reflect/distinfo
+++ b/devel/hs-simple-reflect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627856
-SHA256 (cabal/simple-reflect-0.3.2.tar.gz) = 38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6
-SIZE (cabal/simple-reflect-0.3.2.tar.gz) = 4492
+TIMESTAMP = 1523698837
+SHA256 (cabal/simple-reflect-0.3.3.tar.gz) = 07825ea04c135298008cf080133e3bfc8e04cbacd24719c46ac6a2ca4acfdb2b
+SIZE (cabal/simple-reflect-0.3.3.tar.gz) = 4590
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 731dabdd8cf0..b69a4155fd30 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index e11d8cbb2c40..35ce60f16138 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= split
-PORTVERSION= 0.2.3.2
-PORTREVISION= 1
+PORTVERSION= 0.2.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index 305823326e7d..73bf2e1100b5 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499447103
-SHA256 (cabal/split-0.2.3.2.tar.gz) = 4943eaad0dd473d44b4b97b8b9731c20f05ba86abb8a1fa07f8df819f09eb63a
-SIZE (cabal/split-0.2.3.2.tar.gz) = 15779
+TIMESTAMP = 1523445494
+SHA256 (cabal/split-0.2.3.3.tar.gz) = 1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413
+SIZE (cabal/split-0.2.3.3.tar.gz) = 15681
diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile
index 10844930afa6..d2ca1d26ed5c 100644
--- a/devel/hs-stm-chans/Makefile
+++ b/devel/hs-stm-chans/Makefile
@@ -2,7 +2,7 @@
PORTNAME= stm-chans
PORTVERSION= 3.0.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Additional types of channels for STM
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.4
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
deleted file mode 100644
index 02ce74b1dacf..000000000000
--- a/devel/hs-stm/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1498678463
-SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384
-SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367
diff --git a/devel/hs-stm/pkg-descr b/devel/hs-stm/pkg-descr
deleted file mode 100644
index c980d54cf127..000000000000
--- a/devel/hs-stm/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A modular composable concurrency abstraction.
-
-WWW: http://hackage.haskell.org/package/stm
diff --git a/devel/hs-storable-record/Makefile b/devel/hs-storable-record/Makefile
new file mode 100644
index 000000000000..fc07d07585b3
--- /dev/null
+++ b/devel/hs-storable-record/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= storable-record
+PORTVERSION= 0.0.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Elegant definition of Storable instances for records
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= semigroups utility-ht
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-storable-record/distinfo b/devel/hs-storable-record/distinfo
new file mode 100644
index 000000000000..921d3d4d53fc
--- /dev/null
+++ b/devel/hs-storable-record/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525082358
+SHA256 (cabal/storable-record-0.0.4.tar.gz) = ceffb2f08d8abc37e338ad924b264c230d5e54ecccaf1c22802c3107ea0c5a42
+SIZE (cabal/storable-record-0.0.4.tar.gz) = 7362
diff --git a/devel/hs-storable-record/pkg-descr b/devel/hs-storable-record/pkg-descr
new file mode 100644
index 000000000000..fa272c200890
--- /dev/null
+++ b/devel/hs-storable-record/pkg-descr
@@ -0,0 +1,6 @@
+With this package you can build a Storable instance of a record type from
+Storable instances of its elements in an elegant way. It does not do any magic,
+just a bit arithmetic to compute the right offsets, that would be otherwise
+done manually or by a preprocessor like C2HS.
+
+WWW: http://code.haskell.org/~thielema/storable-record/
diff --git a/devel/hs-storable-tuple/Makefile b/devel/hs-storable-tuple/Makefile
new file mode 100644
index 000000000000..5f57049a9002
--- /dev/null
+++ b/devel/hs-storable-tuple/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= storable-tuple
+PORTVERSION= 0.0.3.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Storable instance for pairs and triples
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base-orphans storable-record utility-ht
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-storable-tuple/distinfo b/devel/hs-storable-tuple/distinfo
new file mode 100644
index 000000000000..19a4001fbb89
--- /dev/null
+++ b/devel/hs-storable-tuple/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525081601
+SHA256 (cabal/storable-tuple-0.0.3.3.tar.gz) = dcfac049527a45c386c80a7c40ec211455b83d74311af88fa686063b5f87df35
+SIZE (cabal/storable-tuple-0.0.3.3.tar.gz) = 2383
diff --git a/devel/hs-storable-tuple/pkg-descr b/devel/hs-storable-tuple/pkg-descr
new file mode 100644
index 000000000000..d64525127433
--- /dev/null
+++ b/devel/hs-storable-tuple/pkg-descr
@@ -0,0 +1,6 @@
+Provides a Storable instance for pair and triple which should be binary
+compatible with C99 and C++. The only purpose of this package is to provide
+a standard location for this instance so that other packages needing this
+instance can play nicely together.
+
+WWW: http://code.haskell.org/~thielema/storable-tuple/
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index cb80c98c4020..16bf2c268f46 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= streaming-commons
-PORTVERSION= 0.1.18
+PORTVERSION= 0.2.0.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Common lower-level functions needed by various streaming data libraries
LICENSE= MIT
-USE_CABAL= async blaze-builder network random stm text zlib
+USE_CABAL= async blaze-builder network random zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo
index d2427bab995d..25dbbaecee47 100644
--- a/devel/hs-streaming-commons/distinfo
+++ b/devel/hs-streaming-commons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627857
-SHA256 (cabal/streaming-commons-0.1.18.tar.gz) = 27af2efb901a003c83fc6c71563eb70f45b4823516c299759d800a48d9f083cb
-SIZE (cabal/streaming-commons-0.1.18.tar.gz) = 87832
+TIMESTAMP = 1523696417
+SHA256 (cabal/streaming-commons-0.2.0.0.tar.gz) = f4e2b8460325c133c83d04048e334fb502ba3627f41ffc85c05f81f1f38ace5f
+SIZE (cabal/streaming-commons-0.2.0.0.tar.gz) = 86501
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 469870770a21..1896ec8ce016 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 6159390389da..db6a584d04fe 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.7
-PORTREVISION= 1
+PORTVERSION= 0.6.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 19544d142ad6..9aac13185178 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499448315
-SHA256 (cabal/syb-with-class-0.6.1.7.tar.gz) = 5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb
-SIZE (cabal/syb-with-class-0.6.1.7.tar.gz) = 12524
+TIMESTAMP = 1524154298
+SHA256 (cabal/syb-with-class-0.6.1.9.tar.gz) = 06a96de923d9e67e4399fab5ddcc792cefcc7e87d5c6b72a648ba6c0fedffbaa
+SIZE (cabal/syb-with-class-0.6.1.9.tar.gz) = 12526
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index e42b5b1e5102..1fb94b331a3e 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 4c7d8e620cd6..7588f92728c9 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= system-fileio
PORTVERSION= 0.3.16.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Consistent filesystem interaction across GHC versions
LICENSE= MIT
-USE_CABAL= system-filepath>=0.3.1 text>=0.7.1
+USE_CABAL= system-filepath>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 45149c5a7468..66a74046e361 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-filepath
-PORTVERSION= 0.4.13.4
-PORTREVISION= 2
+PORTVERSION= 0.4.14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= High-level, byte-based file and directory path manipulations
LICENSE= MIT
-USE_CABAL= text>=0.11.0.6
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index 50074e72a946..3137249f93ce 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627858
-SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb
-SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590
+TIMESTAMP = 1523433190
+SHA256 (cabal/system-filepath-0.4.14.tar.gz) = 1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993
+SIZE (cabal/system-filepath-0.4.14.tar.gz) = 16663
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 92ed8dfab14d..a9202b7f1745 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tagged
PORTVERSION= 0.8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/files/patch-tagged.cabal b/devel/hs-tagged/files/patch-tagged.cabal
index ed0eb7c3ac4d..2028756a946c 100644
--- a/devel/hs-tagged/files/patch-tagged.cabal
+++ b/devel/hs-tagged/files/patch-tagged.cabal
@@ -5,7 +5,7 @@
if impl(ghc>=7.6)
exposed-modules: Data.Proxy.TH
- build-depends: template-haskell >= 2.8 && < 2.12
-+ build-depends: template-haskell >= 2.8 && < 2.13
++ build-depends: template-haskell >= 2.8 && < 2.14
if flag(deepseq)
build-depends: deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index 745176b4b5b5..a7925f7d4783 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,7 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-terminal-size/Makefile b/devel/hs-terminal-size/Makefile
index 196f5f118202..b0e235b21440 100644
--- a/devel/hs-terminal-size/Makefile
+++ b/devel/hs-terminal-size/Makefile
@@ -2,7 +2,7 @@
PORTNAME= terminal-size
PORTVERSION= 0.3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 7329c459e08d..f36576414212 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 71adbc08b3ed..3e938f070a8a 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.3.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 575ea9fdf39e..92c70f243dc1 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework
-PORTVERSION= 0.8.1.1
-PORTREVISION= 2
+PORTVERSION= 0.8.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index c3edb1f25d57..4db6c80e9119 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627859
-SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273
-SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900
+TIMESTAMP = 1523960922
+SHA256 (cabal/test-framework-0.8.2.0.tar.gz) = f5aec7a15dbcb39e951bcf6502606fd99d751197b5510f41706899aa7e660ac2
+SIZE (cabal/test-framework-0.8.2.0.tar.gz) = 21317
diff --git a/devel/hs-test-framework/files/patch-test-framework.cabal b/devel/hs-test-framework/files/patch-test-framework.cabal
deleted file mode 100644
index 9f4db483b1df..000000000000
--- a/devel/hs-test-framework/files/patch-test-framework.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- test-framework.cabal.orig 2017-07-08 19:34:13 UTC
-+++ test-framework.cabal
-@@ -50,7 +50,7 @@ Library
- base >= 4.3 && < 5, random >= 1.0, containers >= 0.1,
- regex-posix >= 0.72,
- old-locale >= 1.0,
-- time >= 1.1.2 && < 1.6,
-+ time >= 1.1.2 && < 1.7,
- xml >= 1.3.5, hostname >= 1.0
-
- Extensions: CPP
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 9011e34f245c..7fb721bc711a 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= text-icu
PORTVERSION= 0.7.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Bindings to the ICU library
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.9.1.0
-
LIB_DEPENDS+= libicui18n.so:devel/icu
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-text-short/Makefile b/devel/hs-text-short/Makefile
index 1fc7f094220c..bdd351dd033b 100644
--- a/devel/hs-text-short/Makefile
+++ b/devel/hs-text-short/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= text-short
-PORTVERSION= 0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= This package provides the ShortText type which is suitable for keeping
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable semigroups text
+USE_CABAL= hashable semigroups
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-text-short/distinfo b/devel/hs-text-short/distinfo
index 061c1b8f838f..5243b094f921 100644
--- a/devel/hs-text-short/distinfo
+++ b/devel/hs-text-short/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499546701
-SHA256 (cabal/text-short-0.1.tar.gz) = c06af3e53c345fa50df8e30589d854c84d212787eba648e6ded9b794e0df937e
-SIZE (cabal/text-short-0.1.tar.gz) = 6048
+TIMESTAMP = 1523958157
+SHA256 (cabal/text-short-0.1.2.tar.gz) = b3f2b867d14c7c2586ea580028606b6662293ad080726d5241def937e5e31167
+SIZE (cabal/text-short-0.1.2.tar.gz) = 23454
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
deleted file mode 100644
index 2be66835e568..000000000000
--- a/devel/hs-text/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499546607
-SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9
-SIZE (cabal/text-1.2.2.2.tar.gz) = 151048
diff --git a/devel/hs-text/pkg-descr b/devel/hs-text/pkg-descr
deleted file mode 100644
index a910cc70fda6..000000000000
--- a/devel/hs-text/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-An efficient packed, immutable Unicode text type (both strict and lazy),
-with a powerful loop fusion optimization framework.
-
-The Text type represents Unicode character strings, in a time and
-space-efficient manner. This package provides text processing
-capabilities that are optimized for performance critical use, both in
-terms of large data quantities and high speed.
-
-The Text type provides character-encoding, type-safe case conversion via
-whole-string case conversion functions. It also provides a range of
-functions for converting Text values to and from ByteStrings, using
-several standard encodings.
-
-Efficient locale-sensitive support for text IO is also supported.
-
-WWW: https://github.com/bos/text
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 160021d12738..ae0c824f3333 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-abstraction/Makefile b/devel/hs-th-abstraction/Makefile
index 345e3f856728..7fde8265a51a 100644
--- a/devel/hs-th-abstraction/Makefile
+++ b/devel/hs-th-abstraction/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= th-abstraction
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-abstraction/distinfo b/devel/hs-th-abstraction/distinfo
index 7ba65f2abd89..70bd629dfdaf 100644
--- a/devel/hs-th-abstraction/distinfo
+++ b/devel/hs-th-abstraction/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499694293
-SHA256 (cabal/th-abstraction-0.2.3.0.tar.gz) = 954bf25a4d558242970b2085333b2fb8811d2a926354a5d237a2db9c0718de03
-SIZE (cabal/th-abstraction-0.2.3.0.tar.gz) = 22183
+TIMESTAMP = 1523446140
+SHA256 (cabal/th-abstraction-0.2.6.0.tar.gz) = e52e289a547d68f203d65f2e63ec2d87a3c613007d2fe873615c0969b981823c
+SIZE (cabal/th-abstraction-0.2.6.0.tar.gz) = 23406
diff --git a/devel/hs-th-abstraction/files/patch-th-abstraction.cabal b/devel/hs-th-abstraction/files/patch-th-abstraction.cabal
new file mode 100644
index 000000000000..02a07dfac45e
--- /dev/null
+++ b/devel/hs-th-abstraction/files/patch-th-abstraction.cabal
@@ -0,0 +1,11 @@
+--- th-abstraction.cabal.orig 2018-04-11 11:32:45 UTC
++++ th-abstraction.cabal
+@@ -28,7 +28,7 @@ library
+ other-modules: Language.Haskell.TH.Datatype.Internal
+ build-depends: base >=4.3 && <5,
+ ghc-prim,
+- template-haskell >=2.5 && <2.13,
++ template-haskell >=2.5 && <2.14,
+ containers >=0.4 && <0.6
+ hs-source-dirs: src
+ default-language: Haskell2010
diff --git a/devel/hs-th-expand-syns/Makefile b/devel/hs-th-expand-syns/Makefile
new file mode 100644
index 000000000000..6541c1996680
--- /dev/null
+++ b/devel/hs-th-expand-syns/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= th-expand-syns
+PORTVERSION= 0.4.4.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Expands type synonyms in Template Haskell ASTs
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= syb
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-expand-syns/distinfo b/devel/hs-th-expand-syns/distinfo
new file mode 100644
index 000000000000..f1617f14ca1b
--- /dev/null
+++ b/devel/hs-th-expand-syns/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524931602
+SHA256 (cabal/th-expand-syns-0.4.4.0.tar.gz) = cc0f52d1364ace9ba56f51afd9106a5fe01ed3f5ae45c958c1b0f83be0a6f906
+SIZE (cabal/th-expand-syns-0.4.4.0.tar.gz) = 7572
diff --git a/devel/hs-th-expand-syns/pkg-descr b/devel/hs-th-expand-syns/pkg-descr
new file mode 100644
index 000000000000..8fbca9bebe34
--- /dev/null
+++ b/devel/hs-th-expand-syns/pkg-descr
@@ -0,0 +1,3 @@
+Expands type synonyms in Template Haskell ASTs.
+
+WWW: https://github.com/DanielSchuessler/th-expand-syns
diff --git a/devel/hs-th-lift-instances/Makefile b/devel/hs-th-lift-instances/Makefile
index 2a33d30e479d..9fdeab727198 100644
--- a/devel/hs-th-lift-instances/Makefile
+++ b/devel/hs-th-lift-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= th-lift-instances
PORTVERSION= 0.1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Some more Lift instances for common haskell data types
LICENSE= BSD3CLAUSE
-USE_CABAL= text th-lift vector
+USE_CABAL= th-lift vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-th-lift/Makefile b/devel/hs-th-lift/Makefile
index d683e2534132..8f1fa17c721a 100644
--- a/devel/hs-th-lift/Makefile
+++ b/devel/hs-th-lift/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= th-lift
-PORTVERSION= 0.7.7
-PORTREVISION= 1
+PORTVERSION= 0.7.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-lift/distinfo b/devel/hs-th-lift/distinfo
index c50cacb6471d..b0a656d79cbb 100644
--- a/devel/hs-th-lift/distinfo
+++ b/devel/hs-th-lift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499621822
-SHA256 (cabal/th-lift-0.7.7.tar.gz) = 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5
-SIZE (cabal/th-lift-0.7.7.tar.gz) = 12399
+TIMESTAMP = 1523429375
+SHA256 (cabal/th-lift-0.7.8.tar.gz) = 2cf83385e848d9136a1d6e49ca845fd1d09935f2ff658c6f4e268d8ece02c12b
+SIZE (cabal/th-lift-0.7.8.tar.gz) = 12399
diff --git a/devel/hs-th-orphans/Makefile b/devel/hs-th-orphans/Makefile
new file mode 100644
index 000000000000..a4c3dfd06e34
--- /dev/null
+++ b/devel/hs-th-orphans/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= th-orphans
+PORTVERSION= 0.13.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Orphan instances for TH datatypes
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= th-lift th-lift-instances th-reify-many
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-orphans/distinfo b/devel/hs-th-orphans/distinfo
new file mode 100644
index 000000000000..6e704d3dbc02
--- /dev/null
+++ b/devel/hs-th-orphans/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524930811
+SHA256 (cabal/th-orphans-0.13.5.tar.gz) = 95644d4b7914317e1dd31095947b8371f1a18be0c09e75f0e29203eb774a25ad
+SIZE (cabal/th-orphans-0.13.5.tar.gz) = 6675
diff --git a/devel/hs-th-orphans/pkg-descr b/devel/hs-th-orphans/pkg-descr
new file mode 100644
index 000000000000..2e5b8b9f51f0
--- /dev/null
+++ b/devel/hs-th-orphans/pkg-descr
@@ -0,0 +1,5 @@
+Orphan instances for TH datatypes. In particular, instances for Ord and Lift,
+as well as a few missing Show / Eq. These instances used to live in
+haskell-src-meta, and that's where the version number started.
+
+WWW: https://github.com/mgsloan/th-orphans/
diff --git a/devel/hs-th-reify-many/Makefile b/devel/hs-th-reify-many/Makefile
new file mode 100644
index 000000000000..1f2706e8e35b
--- /dev/null
+++ b/devel/hs-th-reify-many/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= th-reify-many
+PORTVERSION= 0.1.8
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Recurseively reify template haskell datatype info
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= safe th-expand-syns
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-reify-many/distinfo b/devel/hs-th-reify-many/distinfo
new file mode 100644
index 000000000000..e333842e4361
--- /dev/null
+++ b/devel/hs-th-reify-many/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524931291
+SHA256 (cabal/th-reify-many-0.1.8.tar.gz) = cecaae187df911de515d08929e1394d6d6f7ce129795be8189a6b10d3734fe43
+SIZE (cabal/th-reify-many-0.1.8.tar.gz) = 5663
diff --git a/devel/hs-th-reify-many/pkg-descr b/devel/hs-th-reify-many/pkg-descr
new file mode 100644
index 000000000000..415ef672d00f
--- /dev/null
+++ b/devel/hs-th-reify-many/pkg-descr
@@ -0,0 +1,6 @@
+th-reify-many provides functions for recursively reifying top level declarations.
+The main intended use case is for enumerating the names of datatypes reachable
+from an initial datatype, and passing these names to some function which
+generates instances.
+
+WWW: http://github.com/mgsloan/th-reify-many
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index b2b4ae3971ad..e1a3b771f3d4 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.1.4
+PORTVERSION= 0.5.1.6
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,5 @@ COMMENT= Fork threads and wait for their result
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.1
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index 32a63654f916..31ea527b775a 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499447395
-SHA256 (cabal/threads-0.5.1.4.tar.gz) = d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd
-SIZE (cabal/threads-0.5.1.4.tar.gz) = 7395
+TIMESTAMP = 1523649637
+SHA256 (cabal/threads-0.5.1.6.tar.gz) = 139ac3c067fcbb392b5b9c2feaa98184b75ebe7f2e580726eea6ce812d94562e
+SIZE (cabal/threads-0.5.1.6.tar.gz) = 7406
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 6a2cd6d3f7c2..ece35926ec63 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -2,7 +2,7 @@
PORTNAME= threadscope
PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +10,13 @@ COMMENT= Graphical tool for profiling parallel Haskell programs
LICENSE= BSD3CLAUSE
-USE_CABAL= cairo ghc-events glib gtk mtl pango text
+USE_CABAL= cairo ghc-events glib gtk mtl pango
EXECUTABLE= threadscope
STANDALONE= yes
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 607b820fa0cf..d6cec6b23c22 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
index 09480120c9e5..63370b1ebf54 100644
--- a/devel/hs-time-locale-compat/Makefile
+++ b/devel/hs-time-locale-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= time-locale-compat
PORTVERSION= 0.1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 7be294799ab2..9684786da896 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTVERSION= 0.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index ba5547e3d00f..49fecb1ded4b 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450481
-SHA256 (cabal/timezone-olson-0.1.8.tar.gz) = b96b01015ae5191a56d6bbdbbc3d084f0afb9acd72d84c301792f07871dd3747
-SIZE (cabal/timezone-olson-0.1.8.tar.gz) = 11356
+TIMESTAMP = 1524157973
+SHA256 (cabal/timezone-olson-0.1.9.tar.gz) = 32230509029bcf9e1bd95b5ad7ee69b8b0250cffc4bb8f2df88a651b3af74b15
+SIZE (cabal/timezone-olson-0.1.9.tar.gz) = 11471
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index 0eac6e99a4ce..218cab60300e 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -2,7 +2,7 @@
PORTNAME= timezone-series
PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 82b0c59ce9d7..668b34478945 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Lift computations from the bottom of a transformer stack
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.3 transformers-compat>=0.2
+USE_CABAL= transformers-compat>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
index 688513ed7e82..8d6c5ff42687 100644
--- a/devel/hs-transformers-compat/Makefile
+++ b/devel/hs-transformers-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= transformers-compat
PORTVERSION= 0.5.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-typed-process/Makefile b/devel/hs-typed-process/Makefile
index 044421e9dc7e..dbb0879f1fc9 100644
--- a/devel/hs-typed-process/Makefile
+++ b/devel/hs-typed-process/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= typed-process
-PORTVERSION= 0.1.0.0
+PORTVERSION= 0.2.2.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= The typed-process package
LICENSE= BSD3CLAUSE
-USE_CABAL= async conduit conduit-extra exceptions stm
+USE_CABAL= async exceptions
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-typed-process/distinfo b/devel/hs-typed-process/distinfo
index 1c4fce06c6c2..c846443db724 100644
--- a/devel/hs-typed-process/distinfo
+++ b/devel/hs-typed-process/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499720967
-SHA256 (cabal/typed-process-0.1.0.0.tar.gz) = de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8
-SIZE (cabal/typed-process-0.1.0.0.tar.gz) = 12886
+TIMESTAMP = 1523897812
+SHA256 (cabal/typed-process-0.2.2.0.tar.gz) = 42ed06889c15aa07577a0e8e3632659e343be95b77afa252b48b592ff7dbcf30
+SIZE (cabal/typed-process-0.2.2.0.tar.gz) = 13890
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 8e0bd75d30f1..ee9b5d60e5ad 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unexceptionalio/Makefile b/devel/hs-unexceptionalio/Makefile
index f8fab4b16282..53200d007825 100644
--- a/devel/hs-unexceptionalio/Makefile
+++ b/devel/hs-unexceptionalio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unexceptionalio
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/Makefile b/devel/hs-unicode-show/Makefile
index dd8098384d1c..c33f1e43220a 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-unicode-show/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
-PORTNAME= stm
-PORTVERSION= 2.4.4.1
-PORTREVISION= 1
+PORTNAME= unicode-show
+PORTVERSION= 0.1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Software Transactional Memory
+COMMENT= Print and show in unicode
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-unicode-show/distinfo b/devel/hs-unicode-show/distinfo
new file mode 100644
index 000000000000..e04ae2169fac
--- /dev/null
+++ b/devel/hs-unicode-show/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525760473
+SHA256 (cabal/unicode-show-0.1.0.2.tar.gz) = 7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943
+SIZE (cabal/unicode-show-0.1.0.2.tar.gz) = 4303
diff --git a/devel/hs-unicode-show/pkg-descr b/devel/hs-unicode-show/pkg-descr
new file mode 100644
index 000000000000..846ba6325f34
--- /dev/null
+++ b/devel/hs-unicode-show/pkg-descr
@@ -0,0 +1,4 @@
+This package provides variants of show and print functions that does not
+escape non-ascii characters.
+
+WWW: https://github.com/nushio3/unicode-show
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 8b840ffdb1de..99c27a1e05a9 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index e5f170e3bf05..423ed68a89ec 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unix-compat
PORTVERSION= 0.4.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index 44182a82c4ea..0a51a24cf6d3 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index d59e5ce39abd..e93e4344f104 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627862
-SHA256 (cabal/unix-time-0.3.7.tar.gz) = 1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1
-SIZE (cabal/unix-time-0.3.7.tar.gz) = 40549
+TIMESTAMP = 1523432893
+SHA256 (cabal/unix-time-0.3.8.tar.gz) = dca1bd332f4690f667570868c91c1270083428067e0e20b88a9d9516efa33a14
+SIZE (cabal/unix-time-0.3.8.tar.gz) = 40672
diff --git a/devel/hs-unliftio-core/Makefile b/devel/hs-unliftio-core/Makefile
new file mode 100644
index 000000000000..10c2a69aa896
--- /dev/null
+++ b/devel/hs-unliftio-core/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= unliftio-core
+PORTVERSION= 0.1.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= MonadUnliftIO typeclass for unlifting monads to IO
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-unliftio-core/distinfo b/devel/hs-unliftio-core/distinfo
new file mode 100644
index 000000000000..61cddb748993
--- /dev/null
+++ b/devel/hs-unliftio-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523697342
+SHA256 (cabal/unliftio-core-0.1.1.0.tar.gz) = 7550b017d87af53ae3e0d3b8524e24a77faf739073f35e40663454a9e9752385
+SIZE (cabal/unliftio-core-0.1.1.0.tar.gz) = 3293
diff --git a/devel/hs-unliftio-core/files/patch-unliftio-core.cabal b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal
new file mode 100644
index 000000000000..6dd96c3ebaa3
--- /dev/null
+++ b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal
@@ -0,0 +1,11 @@
+--- unliftio-core.cabal.orig 2018-04-14 09:20:34 UTC
++++ unliftio-core.cabal
+@@ -26,7 +26,7 @@ library
+ hs-source-dirs:
+ src
+ build-depends:
+- base >=4.5 && <4.11
++ base >=4.5 && <4.12
+ , transformers >=0.2 && <0.6
+ exposed-modules:
+ Control.Monad.IO.Unlift
diff --git a/devel/hs-unliftio-core/pkg-descr b/devel/hs-unliftio-core/pkg-descr
new file mode 100644
index 000000000000..35faf383fe9f
--- /dev/null
+++ b/devel/hs-unliftio-core/pkg-descr
@@ -0,0 +1,4 @@
+Provides the core MonadUnliftIO typeclass, instances for base
+and transformers, and basic utility functions.
+
+WWW: https://github.com/fpco/unliftio
diff --git a/devel/hs-unliftio/Makefile b/devel/hs-unliftio/Makefile
new file mode 100644
index 000000000000..b8f95301b71d
--- /dev/null
+++ b/devel/hs-unliftio/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= unliftio
+PORTVERSION= 0.2.6.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= MonadUnliftIO typeclass for unlifting monads to IO
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async unliftio-core
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-unliftio/distinfo b/devel/hs-unliftio/distinfo
new file mode 100644
index 000000000000..1e358d9455c5
--- /dev/null
+++ b/devel/hs-unliftio/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523902179
+SHA256 (cabal/unliftio-0.2.6.0.tar.gz) = f87d5b6fa7f1bdb2d47e91c30411a3a878bc281a1259fc23abe146d1c4a4b366
+SIZE (cabal/unliftio-0.2.6.0.tar.gz) = 28311
diff --git a/devel/hs-unliftio/pkg-descr b/devel/hs-unliftio/pkg-descr
new file mode 100644
index 000000000000..35faf383fe9f
--- /dev/null
+++ b/devel/hs-unliftio/pkg-descr
@@ -0,0 +1,4 @@
+Provides the core MonadUnliftIO typeclass, instances for base
+and transformers, and basic utility functions.
+
+WWW: https://github.com/fpco/unliftio
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index 28d738e1d089..ff65b9a2f2a3 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.8.0
-PORTREVISION= 1
+PORTVERSION= 0.2.9.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index a571c53c5490..7668e58effeb 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499596921
-SHA256 (cabal/unordered-containers-0.2.8.0.tar.gz) = a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8
-SIZE (cabal/unordered-containers-0.2.8.0.tar.gz) = 31824
+TIMESTAMP = 1523375916
+SHA256 (cabal/unordered-containers-0.2.9.0.tar.gz) = 6730cb5c4a3e953e2c199d6425be08fd088ff0089a3e140d63226c052e318250
+SIZE (cabal/unordered-containers-0.2.9.0.tar.gz) = 33098
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index e5b45bb66415..661d72dfe81f 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 19981965a719..bee0680557b2 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-string
PORTVERSION= 1.0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 96bde57f6815..64cb6603535f 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -3,7 +3,7 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index a2de8becf4e0..e8e1b04a7fe1 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 52f2acb0774e..40f24a0f457d 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uuagc-cabal
-PORTVERSION= 1.0.6.0
-PORTREVISION= 2
+PORTVERSION= 1.1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index b34ca2b703e4..29b9ce2adb11 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627863
-SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b
-SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781
+TIMESTAMP = 1523959204
+SHA256 (cabal/uuagc-cabal-1.1.0.0.tar.gz) = f2d3daccab5082165c6621852cc555f530adac90220f57dd13c724bd5acfbb2d
+SIZE (cabal/uuagc-cabal-1.1.0.0.tar.gz) = 14924
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 0e45ff28cc71..adbea0182ed6 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.52.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile
index c9904ff8656e..9c034d9373dd 100644
--- a/devel/hs-uuid-types/Makefile
+++ b/devel/hs-uuid-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuid-types
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Type definitions for Universally Unique Identifiers
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 text>=1
+USE_CABAL= hashable>=1.1.1.0 random>=1.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 70ab8f393d6a..1aed01d80942 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuid
PORTVERSION= 1.3.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
LICENSE= BSD3CLAUSE
USE_CABAL= cryptohash-md5 cryptohash-sha1 entropy network-info random \
- text uuid-types
+ uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/files/patch-uuid.cabal b/devel/hs-uuid/files/patch-uuid.cabal
new file mode 100644
index 000000000000..673d36c51cbe
--- /dev/null
+++ b/devel/hs-uuid/files/patch-uuid.cabal
@@ -0,0 +1,10 @@
+--- uuid.cabal.orig 2018-04-29 12:00:18 UTC
++++ uuid.cabal
+@@ -37,7 +37,7 @@ Library
+ entropy >= 0.3.7 && < 0.4,
+ network-info == 0.2.*,
+ random >= 1.0.1 && < 1.2,
+- time >= 1.1 && < 1.8,
++ time >= 1.1 && < 1.9,
+ text >= 1 && < 1.3,
+ uuid-types >= 1.0.2 && < 2
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index b26bba0a1375..5cdeb419e935 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.22
-PORTREVISION= 1
+PORTVERSION= 0.9.23
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 5f00cf1175bb..916b59a67875 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627863
-SHA256 (cabal/uulib-0.9.22.tar.gz) = cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad
-SIZE (cabal/uulib-0.9.22.tar.gz) = 45487
+TIMESTAMP = 1523470473
+SHA256 (cabal/uulib-0.9.23.tar.gz) = c6fb906d2751c5a5c0839a4eaca62f2987ff8e0857146b8643cccff683e72fed
+SIZE (cabal/uulib-0.9.23.tar.gz) = 45287
diff --git a/devel/hs-uulib/files/patch-src_UU_PPrint.hs b/devel/hs-uulib/files/patch-src_UU_PPrint.hs
new file mode 100644
index 000000000000..e874d9d8bc2d
--- /dev/null
+++ b/devel/hs-uulib/files/patch-src_UU_PPrint.hs
@@ -0,0 +1,11 @@
+--- src/UU/PPrint.hs.orig 2018-04-11 18:54:44 UTC
++++ src/UU/PPrint.hs
+@@ -60,7 +60,7 @@ module UU.PPrint
+ import System.IO (Handle,hPutStr,hPutChar,stdout)
+
+ #if __GLASGOW_HASKELL__ >= 710
+-import Prelude hiding ((<$>))
++import Prelude hiding ((<$>), (<>))
+ #endif
+
+ infixr 5 </>,<//>,<$>,<$$>
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index cad6ec8b0cab..fa4fcde70ccb 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.0.7
-PORTREVISION= 1
+PORTVERSION= 0.3.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Persistent store for values of arbitrary types
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.2.5 unordered-containers>=0.2.3.0
+USE_CABAL= hashable>=1.1.2.5 semigroups unordered-containers>=0.2.3.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 886921f34bdb..9591f6f4842c 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499458511
-SHA256 (cabal/vault-0.3.0.7.tar.gz) = 9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0
-SIZE (cabal/vault-0.3.0.7.tar.gz) = 5140
+TIMESTAMP = 1523431307
+SHA256 (cabal/vault-0.3.1.0.tar.gz) = d960a843c3dae1f6073f50e980dcdbbe2e46e9911273c9f122ba96494c4c979f
+SIZE (cabal/vault-0.3.1.0.tar.gz) = 5199
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 28b3e95f3b01..4d5ebad05480 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.7.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
index 3abd72d7e122..655e61e1eb9c 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-binary-instances
-PORTVERSION= 0.2.3.5
-PORTREVISION= 1
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Instances of Data.Binary and Data.Serialize for vector
LICENSE= BSD3CLAUSE
-USE_CABAL= cereal vector>=0.6
+USE_CABAL= vector>=0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo
index 06fbd9065513..8dca970e903e 100644
--- a/devel/hs-vector-binary-instances/distinfo
+++ b/devel/hs-vector-binary-instances/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627864
-SHA256 (cabal/vector-binary-instances-0.2.3.5.tar.gz) = e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a
-SIZE (cabal/vector-binary-instances-0.2.3.5.tar.gz) = 4133
+TIMESTAMP = 1523451213
+SHA256 (cabal/vector-binary-instances-0.2.4.tar.gz) = 2b2f783e414dcf2e7dc34ad14264e5af83e5cd4784d5a0a64e4b4571963443f8
+SIZE (cabal/vector-binary-instances-0.2.4.tar.gz) = 4146
diff --git a/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal b/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal
new file mode 100644
index 000000000000..d2dee98a591e
--- /dev/null
+++ b/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal
@@ -0,0 +1,10 @@
+--- vector-binary-instances.cabal.orig 2018-04-11 12:56:40 UTC
++++ vector-binary-instances.cabal
+@@ -50,7 +50,7 @@ Library
+
+ -- Packages needed in order to build this package.
+ Build-depends:
+- base > 3 && < 4.11,
++ base > 3 && < 4.12,
+ vector >= 0.6 && < 0.13,
+ binary >= 0.5 && < 0.10
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 3e027108bb7f..d528eda7f960 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-instances
PORTVERSION= 3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index 124099689a39..4331822adc71 100644
--- a/devel/hs-vector-th-unbox/Makefile
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-th-unbox
PORTVERSION= 0.2.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/files/patch-vector.cabal b/devel/hs-vector/files/patch-vector.cabal
new file mode 100644
index 000000000000..6d3a2e102e38
--- /dev/null
+++ b/devel/hs-vector/files/patch-vector.cabal
@@ -0,0 +1,11 @@
+--- vector.cabal.orig 2018-04-09 18:20:35 UTC
++++ vector.cabal
+@@ -144,7 +144,7 @@ Library
+ Install-Includes:
+ vector.h
+
+- Build-Depends: base >= 4.5 && < 4.10
++ Build-Depends: base >= 4.5 && < 4.12
+ , primitive >= 0.5.0.1 && < 0.7
+ , ghc-prim >= 0.2 && < 0.6
+ , deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 940ebb0d09dc..7c6fdef91b66 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -2,7 +2,7 @@
PORTNAME= void
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile
index bd62c88b63d1..bc8d9ec561b2 100644
--- a/devel/hs-wl-pprint-text/Makefile
+++ b/devel/hs-wl-pprint-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wl-pprint-text
-PORTVERSION= 1.1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= A clone of wl-pprint for use with the text library
LICENSE= BSD3CLAUSE
-USE_CABAL= base-compat text
+USE_CABAL= base-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-wl-pprint-text/distinfo b/devel/hs-wl-pprint-text/distinfo
index 096e33a8bb8e..0205d08a6bd0 100644
--- a/devel/hs-wl-pprint-text/distinfo
+++ b/devel/hs-wl-pprint-text/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543226
-SHA256 (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd
-SIZE (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 16575
+TIMESTAMP = 1525013982
+SHA256 (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 8bdeeaef7e1f55ba582cd4ea104dcd9346b461da09431f3b366b4522583e42ec
+SIZE (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 16621
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index d5de09ca49f5..4d46e075eaad 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -2,7 +2,7 @@
PORTNAME= word8
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 91838f49ca3d..393b0e79eed8 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -2,19 +2,18 @@
# $FreeBSD$
# To update this port first go to
-# https://github.com/applicative-tech/stack-dependencies, change the
+# https://github.com/arrowd/stack-dependencies, change the
# version in the Makefile there, regenerate the stack-dependencies
# tarball, commit Makefile changes, create a new tag (release)
# matching the new stack version, and upload the tarball. Finally
# bump the version here.
PORTNAME= stack
-PORTVERSION= 1.5.1
+PORTVERSION= 1.7.1
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= GH \
- https://github.com/applicative-tech/stack-dependencies/releases/download/v${PORTVERSION}/:deps
+ https://github.com/arrowd/stack-dependencies/releases/download/v${PORTVERSION}/:deps
DISTFILES= stack-dependencies-${PORTVERSION}${EXTRACT_SUFX}:deps
MAINTAINER= ports@FreeBSD.org
@@ -27,12 +26,10 @@ BUILD_DEPENDS= ghc>0:lang/ghc \
hs-network>0:net/hs-network \
hs-old-locale>0:devel/hs-old-locale \
hs-old-time>0:devel/hs-old-time \
- hs-parsec>0:textproc/hs-parsec \
hs-random>0:devel/hs-random \
- hs-stm>0:devel/hs-stm \
- hs-text>0:devel/hs-text \
hs-zlib>0:archivers/hs-zlib \
- cabal:devel/hs-cabal-install
+ cabal:devel/hs-cabal-install \
+ happy:devel/hs-happy
LIB_DEPENDS= libgmp.so:math/gmp \
libffi.so:devel/libffi
RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \
@@ -41,7 +38,7 @@ RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss \
USES= gmake iconv:translit perl5
USE_GITHUB= yes
-GH_ACCOUNT= applicative-tech
+GH_ACCOUNT= arrowd
GH_PROJECT= stack-dependencies
MAKE_ENV= TARGET="${WRKSRC}" \
diff --git a/devel/stack/distinfo b/devel/stack/distinfo
index 83027fb19efe..e7db08312ba0 100644
--- a/devel/stack/distinfo
+++ b/devel/stack/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1507494796
-SHA256 (stack-dependencies-1.5.1.tar.gz) = 2782fd7edba61645d070e54022dc81905bd283382de1282c851ebfa83d49f044
-SIZE (stack-dependencies-1.5.1.tar.gz) = 42063311
-SHA256 (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 0819916b46c3485bad4b8030d0af8e91cd1fecf5b99a1a61137a3d5a9caf730a
-SIZE (applicative-tech-stack-dependencies-v1.5.1_GH0.tar.gz) = 999
+TIMESTAMP = 1524999031
+SHA256 (stack-dependencies-1.7.1.tar.gz) = 4320a4803c889603fd13469d6ce795642f218e5ae65c46616ed8ec3418d13240
+SIZE (stack-dependencies-1.7.1.tar.gz) = 155869633
+SHA256 (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 8487fb66e17df5960d7fea96e80eb33a7e9e08a839f80926a2144afc6bc4159e
+SIZE (arrowd-stack-dependencies-v1.7.1_GH0.tar.gz) = 997
diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile
index 8bb869a99883..fd1826e32b07 100644
--- a/dns/hs-dns/Makefile
+++ b/dns/hs-dns/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dns
-PORTVERSION= 2.0.10
-PORTREVISION= 1
+PORTVERSION= 3.0.2
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= DNS library in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec blaze-builder conduit>=1.1 conduit-extra>=1.1 \
- iproute>=1.2.4 mtl network>=2.3 random resourcet safe
+USE_CABAL= attoparsec auto-update base64-bytestring blaze-builder \
+ conduit>=1.1 conduit-extra>=1.1 cryptonite iproute>=1.2.4 \
+ mtl network>=2.3 psqueues random resourcet safe
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/dns/hs-dns/distinfo b/dns/hs-dns/distinfo
index 599dc196d340..2fb3f865d69d 100644
--- a/dns/hs-dns/distinfo
+++ b/dns/hs-dns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499620675
-SHA256 (cabal/dns-2.0.10.tar.gz) = ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3
-SIZE (cabal/dns-2.0.10.tar.gz) = 24142
+TIMESTAMP = 1524597697
+SHA256 (cabal/dns-3.0.2.tar.gz) = f1a895a136e1b5a77ca0d00ff627993ee3fd2f4bbd7db7de80717668e53172a4
+SIZE (cabal/dns-3.0.2.tar.gz) = 37022
diff --git a/dns/hs-dns/files/patch-dns.cabal b/dns/hs-dns/files/patch-dns.cabal
deleted file mode 100644
index deed89903df0..000000000000
--- a/dns/hs-dns/files/patch-dns.cabal
+++ /dev/null
@@ -1,34 +0,0 @@
---- dns.cabal.orig 2017-07-11 15:30:47 UTC
-+++ dns.cabal
-@@ -30,7 +30,6 @@ Library
- , attoparsec
- , binary
- , bytestring
-- , bytestring-builder
- , conduit >= 1.1
- , conduit-extra >= 1.1
- , containers
-@@ -45,7 +44,6 @@ Library
- , attoparsec
- , binary
- , bytestring
-- , bytestring-builder
- , conduit >= 1.1
- , conduit-extra >= 1.1
- , containers
-@@ -67,7 +65,6 @@ Test-Suite network
- Build-Depends: dns
- , base
- , bytestring
-- , bytestring-builder
- , hspec
-
- Test-Suite spec
-@@ -82,7 +79,6 @@ Test-Suite spec
- , attoparsec
- , binary
- , bytestring
-- , bytestring-builder
- , conduit >= 1.1
- , conduit-extra >= 1.1
- , containers
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index 9bba43d70f94..68891673edcd 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnuidn
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Bindings for GNU IDN
LICENSE= GPLv3
-USE_CABAL= text
USE_C2HS= yes
USES= pkgconfig
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 57586ca9403e..39535edb44e9 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/games/hs-scroll/Makefile b/games/hs-scroll/Makefile
index eb18055d3316..2112573ee4b0 100644
--- a/games/hs-scroll/Makefile
+++ b/games/hs-scroll/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= scroll
-PORTVERSION= 1.20170122
-PORTREVISION= 1
+PORTVERSION= 1.20180421
CATEGORIES= games haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ LICENSE= GPLv2
PKGNAMEPREFIX=
USE_CABAL= IfElse case-insensitive data-default monad-loops mtl \
- optparse-applicative ncurses random text vector
+ optparse-applicative ncurses random vector
STANDALONE= yes
EXECUTABLE= scroll
diff --git a/games/hs-scroll/distinfo b/games/hs-scroll/distinfo
index 68ffb0aedf00..261ad92aced0 100644
--- a/games/hs-scroll/distinfo
+++ b/games/hs-scroll/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499620738
-SHA256 (cabal/scroll-1.20170122.tar.gz) = 89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38
-SIZE (cabal/scroll-1.20170122.tar.gz) = 266023
+TIMESTAMP = 1525090021
+SHA256 (cabal/scroll-1.20180421.tar.gz) = 9203353457c53550524d40216d069129389dbb94a7d8ba1a9153e794dcceff2a
+SIZE (cabal/scroll-1.20180421.tar.gz) = 266900
diff --git a/graphics/Makefile b/graphics/Makefile
index 8c499442dec3..b23216598512 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -352,7 +352,6 @@
SUBDIR += hiptext
SUBDIR += hobbes-icons-xpm
SUBDIR += hppsmtools
- SUBDIR += hs-HGL
SUBDIR += hs-JuicyPixels
SUBDIR += hs-cairo
SUBDIR += hs-dia-base
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
deleted file mode 100644
index 538b2a5c1b5b..000000000000
--- a/graphics/hs-HGL/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= HGL
-PORTVERSION= 3.2.0.5
-PORTREVISION= 4
-CATEGORIES= graphics haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Simple Haskell graphics library based on X11 or Win32
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= X11
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/graphics/hs-HGL/distinfo b/graphics/hs-HGL/distinfo
deleted file mode 100644
index d1b37ef35816..000000000000
--- a/graphics/hs-HGL/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/HGL-3.2.0.5.tar.gz) = 8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d
-SIZE (cabal/HGL-3.2.0.5.tar.gz) = 39012
diff --git a/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs b/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs
deleted file mode 100644
index c4910277f2bc..000000000000
--- a/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs
+++ /dev/null
@@ -1,22 +0,0 @@
---- Graphics/HGL/Internals/Draw.hs.orig 1991-05-09 14:40:52 UTC
-+++ Graphics/HGL/Internals/Draw.hs
-@@ -31,7 +31,7 @@ import Graphics.HGL.X11.Types(DC)
- import Graphics.HGL.Win32.Types(DC)
- #endif
- import qualified Graphics.HGL.Internals.Utilities as Utils (bracket, bracket_)
--import Control.Monad (liftM)
-+import Control.Monad (liftM, ap)
-
- ----------------------------------------------------------------
- -- Graphics
-@@ -61,6 +61,10 @@ instance Monad Draw where
-
- instance Functor Draw where fmap = liftM
-
-+instance Applicative Draw where
-+ pure = return
-+ (<*>) = ap
-+
- -- | Wrap a drawing action in initialization and finalization actions.
- bracket
- :: Draw a -- ^ a pre-operation, whose value is passed to the
diff --git a/graphics/hs-HGL/pkg-descr b/graphics/hs-HGL/pkg-descr
deleted file mode 100644
index b4b577c9b34d..000000000000
--- a/graphics/hs-HGL/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-A simple graphics library, designed to give the programmer access to
-most interesting parts of the Win32 Graphics Device Interface and X11
-library without exposing the programmer to the pain and anguish usually
-associated with using these interfaces. The library also includes a
-module Graphics.SOE providing the interface used in "The Haskell School
-of Expression", by Paul Hudak.
-
-WWW: http://hackage.haskell.org/package/HGL
diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile
index 3fcb9102b5f2..b0ad122c213d 100644
--- a/graphics/hs-JuicyPixels/Makefile
+++ b/graphics/hs-JuicyPixels/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= JuicyPixels
-PORTVERSION= 3.2.8.2
-PORTREVISION= 1
+PORTVERSION= 3.2.9.5
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo
index 955555fd9aaa..8d6bbc35d090 100644
--- a/graphics/hs-JuicyPixels/distinfo
+++ b/graphics/hs-JuicyPixels/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538228
-SHA256 (cabal/JuicyPixels-3.2.8.2.tar.gz) = b74c89e57ea81f6f69470dce215beccb7ced270ce8529b4a97535879ea5478e8
-SIZE (cabal/JuicyPixels-3.2.8.2.tar.gz) = 125699
+TIMESTAMP = 1523462111
+SHA256 (cabal/JuicyPixels-3.2.9.5.tar.gz) = 849c6cf4a613f906f7e553a1baefe9c0dc61c13b41a5f5b9605cf80e328cc355
+SIZE (cabal/JuicyPixels-3.2.9.5.tar.gz) = 122952
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index ce777d1f3b20..803dcfc1decf 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cairo
-PORTVERSION= 0.13.3.1
-PORTREVISION= 1
+PORTVERSION= 0.13.5.0
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools mtl text utf8-string
+USE_CABAL= gtk2hs-buildtools mtl utf8-string
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:graphics/cairo
diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo
index 822cf9aba2ca..b8020a4b6c26 100644
--- a/graphics/hs-cairo/distinfo
+++ b/graphics/hs-cairo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538056
-SHA256 (cabal/cairo-0.13.3.1.tar.gz) = a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a
-SIZE (cabal/cairo-0.13.3.1.tar.gz) = 45033
+TIMESTAMP = 1524402125
+SHA256 (cabal/cairo-0.13.5.0.tar.gz) = 420acd81e0b5578ad188bcdd38463135293c233221abb741cc4004d4c8a6bef3
+SIZE (cabal/cairo-0.13.5.0.tar.gz) = 46877
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 5e4c7ac253e2..ba8ade34b14d 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dia-base
PORTVERSION= 0.1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/files/patch-dia-base.cabal b/graphics/hs-dia-base/files/patch-dia-base.cabal
new file mode 100644
index 000000000000..fee7a5535871
--- /dev/null
+++ b/graphics/hs-dia-base/files/patch-dia-base.cabal
@@ -0,0 +1,10 @@
+--- dia-base.cabal.orig 2018-04-11 15:42:07 UTC
++++ dia-base.cabal
+@@ -27,7 +27,7 @@ library
+ Graphics.Diagrams
+
+ Build-Depends:
+- base >= 4.0 && < 4.10,
++ base >= 4.0 && < 4.12,
+ deepseq >= 1.1 && < 1.5
+
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index afd114a7c31f..dddc804c1e14 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dia-functions
PORTVERSION= 0.2.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-graphviz/Makefile b/graphics/hs-graphviz/Makefile
index ed01fdf1b8e6..e762e47f89eb 100644
--- a/graphics/hs-graphviz/Makefile
+++ b/graphics/hs-graphviz/Makefile
@@ -11,7 +11,9 @@ COMMENT= This library provides bindings for the Dot language used by the Graphvi
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= colour dlist fgl polyparse temporary text wl-pprint-text
+USE_CABAL= colour dlist fgl polyparse temporary wl-pprint-text
+
+IGNORE= Doesn't build with recent GHC version
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libxdot.pc:graphics/graphviz
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 7b14ab9e904e..41ec8debfd26 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= svgcairo
PORTVERSION= 0.13.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Binding to the libsvg-cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= cairo glib mtl text
+USE_CABAL= cairo glib mtl
USE_GNOME= librsvg2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 3e85d90e757f..0f3e5a770ae9 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -3,10 +3,9 @@
PORTNAME= ghc
PORTVERSION= ${GHC_VERSION}
-PORTREVISION= 3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
- LOCAL/pgj/:boot
+ LOCAL/arrowd/:boot
DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
MAINTAINER= haskell@FreeBSD.org
@@ -17,13 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= i386 amd64
-GHC_VERSION= 8.0.2
-HSCOLOUR_VERSION= 1.24.1
+GHC_VERSION= 8.4.2
+HSCOLOUR_VERSION= 1.24.4
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.*
+CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.*
LIB_DEPENDS+= libgmp.so:math/gmp
@@ -38,8 +37,7 @@ NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: P
# This is better fixed in files/build.mk.in
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-ld=${LD} \
- --with-gmp-includes=${LOCALBASE}/include \
+CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib \
--with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
@@ -47,7 +45,7 @@ CONFIGURE_ARGS= --with-ld=${LD} \
SUB_FILES= build.mk \
build.boot.mk
SUB_LIST= GHC_VERSION=${GHC_VERSION} \
- NCURSESINC="${NCURSESINC}" NCURSESLIB="${NCURSESLIB}" \
+ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \
CFLAGS="${CFLAGS}"
OPTIONS_GROUP= BOOTSTRAP
@@ -90,14 +88,17 @@ LOCALBASE?= /usr/local
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MBOOT)
-BOOT_GHC_VERSION= 7.10.2
+BOOT_GHC_VERSION= 8.4.2
DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
.endif # MBOOT
-CONFIGURE_ARGS+= -with-gcc=${CC}
-.if empty(PORT_OPTIONS:MBOOT)
-CONFIGURE_ARGS_BOOT+= --with-gcc=${CC}
+.if ${OSVERSION} < 1200000
+USE_GCC= yes
+CONFIGURE_ARGS+= --enable-dtrace=0
+.else
+LD= ld.bfd
.endif
+CONFIGURE_ENV+= CC=${CC} LD=${LD}
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
@@ -115,7 +116,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
-CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD}
+CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR}
CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
.else # MBOOT
SLAVE_CMD= # empty
@@ -189,13 +190,19 @@ post-patch:
s|%%AR%%|${AR}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+.if empty(PORT_OPTIONS:MBOOT)
+ @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk
+ @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk
+.endif
pre-configure: apply-slist
# Copy the subbed build.mk to the proper position
${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
@${MKDIR} ${TMPDIR}
-.if empty(PORT_OPTIONS:MBOOTH) && ${OPSYS} == FreeBSD && \
+.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \
${OSVERSION} >= 1200031
${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c
for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \
@@ -232,14 +239,14 @@ pre-configure: apply-slist
${SLAVE_CMD} ./Setup install)
.endif
-_EXECUTABLES= ${STAGEDIR}${PREFIX}/bin/hp2ps \
- ${GHC_LIBDIR}/bin/unlit \
+_EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \
${GHC_LIBDIR}/bin/hpc \
${GHC_LIBDIR}/bin/ghc-iserv \
${GHC_LIBDIR}/bin/ghc-pkg \
${GHC_LIBDIR}/bin/hsc2hs \
${GHC_LIBDIR}/bin/runghc \
- ${GHC_LIBDIR}/bin/ghc
+ ${GHC_LIBDIR}/bin/ghc \
+ ${GHC_LIBDIR}/bin/hp2ps
.if ${PORT_OPTIONS:MPROFILE}
_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof
@@ -256,7 +263,7 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
.endif
- (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so'); do \
+ (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \
${STRIP_CMD} $$f; done)
.include <bsd.port.mk>
@@ -264,12 +271,8 @@ post-install:
# Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
.PHONY: create-bootstrap
create-bootstrap:
- @${ECHO} "TODO: https://github.com/freebsd-haskell/ports/wiki/Updating-the-Bootstrap-Compiler"
- cd ${WRKSCR} \
- && ${CP} ${WRKDIR}/build.boot.mk mk \
- && setenv ${CONFIGURE_ENV} ./configure --with-iconv-includes=${LOCALBASE}/include \
- --with-iconv-libraries=${LOCALBASE}/lib \
- --with-gcc=${CC} \
- --with-ld=${LD} \
- && make binary-dist TAR_COMP=xz \\
- && mv ghc-${GHC_VERSION}-boot-${GHC_ARCH}-unknown-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-${ARCH}-freebsd${FREEBSD_MAJOR_VERSION}-boot.tar.xz
+ cd ${WRKSRC} \
+ && gmake binary-dist TAR_COMP=xz \
+ && mv ${WRKSRC}/ghc-${GHC_VERSION}-${ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
+ && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
+ && stat -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index aa64e85c9ecc..3c1635363af4 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -18,9 +18,9 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION?= 8.0.2
+GHC_VERSION?= 8.4.2
-HSCOLOUR_VERSION= 1.24.1
+HSCOLOUR_VERSION= 1.24.4
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
DYNAMIC_DESC?= Add support for dynamic linking
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 4b48785a2cb9..fc1c9ed9a75f 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -86,14 +86,15 @@ authenticate_port?= www/hs-authenticate
auto-update_port?= devel/hs-auto-update
aws_port?= net/hs-aws
base-compat_port?= devel/hs-base-compat
+base-compat-batteries_port?= devel/hs-base-compat-batteries
base-orphans_port?= devel/hs-base-orphans
base-unicode-symbols_port?= devel/hs-base-unicode-symbols
base16-bytestring_port?= devel/hs-base16-bytestring
base64-bytestring_port?= devel/hs-base64-bytestring
+basement_port?= devel/hs-basement
basic-prelude_port?= devel/hs-basic-prelude
bencode_port?= textproc/hs-bencode
bifunctors_port?= devel/hs-bifunctors
-bio_port?= science/hs-bio # executable
bits-atomic_port?= devel/hs-bits-atomic
blaze-builder_port?= devel/hs-blaze-builder
blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator
@@ -101,11 +102,11 @@ blaze-html_port?= textproc/hs-blaze-html
blaze-markup_port?= textproc/hs-blaze-markup
blaze-textual_port?= devel/hs-blaze-textual
bloomfilter_port?= devel/hs-bloomfilter
-BNFC_port?= devel/hs-BNFC # executable
Boolean_port?= devel/hs-Boolean
BoundedChan_port?= devel/hs-BoundedChan
boxes_port?= devel/hs-boxes
brainfuck_port?= lang/hs-brainfuck # executable
+bsb-http-chunked_port?= net/hs-bsb-http-chunked
bsd-sysctl_port?= devel/hs-bsd-sysctl
byteable_port?= devel/hs-byteable
byteorder_port?= devel/hs-byteorder
@@ -137,6 +138,7 @@ classy-prelude-conduit_port?= devel/hs-classy-prelude-conduit
clientsession_port?= security/hs-clientsession
clock_port?= devel/hs-clock
cmark_port?= textproc/hs-cmark
+cmark-gfm_port?= textproc/hs-cmark-gfm
cmdargs_port?= devel/hs-cmdargs
code-page_port?= devel/hs-code-page
colour_port?= devel/hs-colour
@@ -173,6 +175,7 @@ cryptohash-sha256_port?= security/hs-cryptohash-sha256
cryptohash-conduit_port?= security/hs-cryptohash-conduit
cryptohash-cryptoapi_port?= security/hs-cryptohash-cryptoapi
cryptonite_port?= security/hs-cryptonite
+cryptonite-conduit_port?= security/hs-cryptonite-conduit
css-text_port?= www/hs-css-text
csv_port?= textproc/hs-csv
curl_port?= ftp/hs-curl # lib_depends
@@ -210,6 +213,7 @@ double-conversion_port?= textproc/hs-double-conversion
DRBG_port?= security/hs-DRBG
ed25519_port?= security/hs-ed25519
easy-file_port?= devel/hs-easy-file
+echo_port?= devel/hs-echo
EdisonAPI_port?= devel/hs-EdisonAPI
EdisonCore_port?= devel/hs-EdisonCore
edit-distance_port?= devel/hs-edit-distance
@@ -274,12 +278,12 @@ happy_port?= devel/hs-happy
hashable_port?= devel/hs-hashable
hashed-storage_port?= devel/hs-hashed-storage
hashtables_port?= devel/hs-hashtables
-haskell-lexer_port?= devel/hs-haskell-lexer
+haskell-lexer_port?= devel/hs-haskell-lexer
haskell-src_port?= devel/hs-haskell-src
haskell-src-exts_port?= devel/hs-haskell-src-exts
+haskell-src-meta_port?= devel/hs-haskell-src-meta
haskell-xmpp_port?= net-im/hs-haskell-xmpp
hasktags_port?= devel/hs-hasktags # executable
-hastache_port?= devel/hs-hastache
HaXml_port?= textproc/hs-HaXml # executable
hedis_port?= databases/hs-hedis
heist_port?= www/hs-heist
@@ -302,6 +306,7 @@ hsb2hs_port?= devel/hs-hsb2hs
hscolour_port?= print/hs-hscolour # executable
hslogger_port?= devel/hs-hslogger
hslua_port?= devel/hs-hslua
+hslua-module-text_port?= devel/hs-hslua-module-text
HsOpenSSL_port?= security/hs-HsOpenSSL
hspec_port?= devel/hs-hspec # executable
hspec-core_port?= devel/hs-hspec-core
@@ -374,7 +379,6 @@ monad-par_port?= devel/hs-monad-par
monad-par-extras_port?= devel/hs-monad-par-extras
monad-unlift_port?= devel/hs-monad-unlift
monadcryptorandom_port?= security/hs-monadcryptorandom
-monadplus_port?= devel/hs-monadplus
MonadRandom_port?= devel/hs-MonadRandom
monads-tf_port?= devel/hs-monads-tf
mono-traversable_port?= devel/hs-mono-traversable
@@ -411,7 +415,6 @@ pandoc-citeproc_port?= textproc/hs-pandoc-citeproc
pandoc-types_port?= textproc/hs-pandoc-types
pango_port?= x11-toolkits/hs-pango
parallel_port?= devel/hs-parallel
-parsec_port?= textproc/hs-parsec
path-pieces_port?= www/hs-path-pieces
pcap_port?= net/hs-pcap
pcre-light_port?= devel/hs-pcre-light # lib_depends
@@ -453,6 +456,7 @@ regex-pcre_port?= textproc/hs-regex-pcre
regex-pcre-builtin_port?= textproc/hs-regex-pcre-builtin # lib_depends
regex-posix_port?= textproc/hs-regex-posix
regex-tdfa_port?= textproc/hs-regex-tdfa
+resolv_port?= net/hs-resolv
resource-pool_port?= devel/hs-resource-pool
resourcet_port?= devel/hs-resourcet
rfc5051_port?= textproc/hs-rfc5051
@@ -482,6 +486,7 @@ simple-reflect_port?= devel/hs-simple-reflect
simple-sendfile_port?= net/hs-simple-sendfile
skein_port?= security/hs-skein
skylighting_port?= textproc/hs-skylighting
+skylighting-core_port?= textproc/hs-skylighting-core
smallcheck_port?= devel/hs-smallcheck
snap_port?= www/hs-snap # executable
snap-core_port?= www/hs-snap-core
@@ -493,6 +498,8 @@ statistics_port?= math/hs-statistics
stm_port?= devel/hs-stm
stm-chans_port?= devel/hs-stm-chans
STMonadTrans_port?= devel/hs-STMonadTrans
+storable-record_port?= devel/hs-storable-record
+storable-tuple_port?= devel/hs-storable-tuple
Stream_port?= devel/hs-Stream
streaming-commons_port?= devel/hs-streaming-commons
strict_port?= devel/hs-strict
@@ -512,13 +519,15 @@ test-framework_port?= devel/hs-test-framework
test-framework-hunit_port?= devel/hs-test-framework-hunit
test-framework-quickcheck2_port?= devel/hs-test-framework-quickcheck2
texmath_port?= textproc/hs-texmath # executable
-text_port?= devel/hs-text
text-icu_port?= devel/hs-text-icu # lib_depends
text-short_port?= devel/hs-text-short
tf-random_port?= devel/hs-tf-random
th-abstraction_port?= devel/hs-th-abstraction
+th-expand-syns_port?= devel/hs-th-expand-syns
th-lift_port?= devel/hs-th-lift
th-lift-instances_port?= devel/hs-th-lift-instances
+th-orphans_port?= devel/hs-th-orphans
+th-reify-many_port?= devel/hs-th-reify-many
threads_port?= devel/hs-threads
threadscope_port?= devel/hs-threadscope # executable
time-compat_port?= devel/hs-time-compat
@@ -534,14 +543,18 @@ TypeCompose_port?= devel/hs-TypeCompose
typed-process_port?= devel/hs-typed-process
unamb_port?= devel/hs-unamb
unexceptionalio_port?= devel/hs-unexceptionalio
+unicode-show_port?= devel/hs-unicode-show
uniplate_port?= devel/hs-uniplate
unix-compat_port?= devel/hs-unix-compat
unix-time_port?= devel/hs-unix-time
unlambda_port?= lang/hs-unlambda # executable
+unliftio_port?= devel/hs-unliftio
+unliftio-core_port?= devel/hs-unliftio-core
unordered-containers_port?= devel/hs-unordered-containers
uri_port?= textproc/hs-uri
uri-bytestring_port?= textproc/hs-uri-bytestring
uri-bytestring-aeson_port?= textproc/hs-uri-bytestring-aeson
+uri-encode_port?= textproc/hs-uri-encode
url_port?= www/hs-url
utf8-light_port?= devel/hs-utf8-light
utf8-string_port?= devel/hs-utf8-string
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 53d94da1c513..61bea444c10f 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1499672924
-SHA256 (ghc-8.0.2-src.tar.xz) = 11625453e1d0686b3fa6739988f70ecac836cadc30b9f0c8b49ef9091d6118b1
-SIZE (ghc-8.0.2-src.tar.xz) = 10687760
-SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a
-SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716
-SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8
-SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224
-SHA256 (hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8
-SIZE (hscolour-1.24.1.tar.gz) = 28717
+TIMESTAMP = 1521746767
+SHA256 (ghc-8.4.2-src.tar.xz) = 01cc32f24a06bf3b2428351b6d7fec791e82d042426d29ad9e5a245b35f0047b
+SIZE (ghc-8.4.2-src.tar.xz) = 11313140
+SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f
+SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016
+SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911
+SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728
+SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
+SIZE (hscolour-1.24.4.tar.gz) = 28729
diff --git a/lang/ghc/files/patch-compiler_main_SysTools.hs b/lang/ghc/files/patch-compiler_main_SysTools.hs
deleted file mode 100644
index 06dce352555a..000000000000
--- a/lang/ghc/files/patch-compiler_main_SysTools.hs
+++ /dev/null
@@ -1,12 +0,0 @@
---- compiler/main/SysTools.hs.orig 2017-08-12 09:25:57 UTC
-+++ compiler/main/SysTools.hs
-@@ -907,6 +907,9 @@ getCompilerInfo' dflags = do
- -- Regular clang
- | any ("clang version" `isInfixOf`) stde =
- return Clang
-+ -- FreeBSD clang
-+ | any ("FreeBSD clang version" `isInfixOf`) stde =
-+ return Clang
- -- XCode 5.1 clang
- | any ("Apple LLVM version 5.1" `isPrefixOf`) stde =
- return AppleClang51
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index 8906fbb875dd..5a4a978d08ba 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2017-01-04 14:17:17 UTC
+--- configure.ac.orig 2018-03-06 16:48:53 UTC
+++ configure.ac
-@@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken])
+@@ -447,6 +447,9 @@ XCODE_VERSION()
dnl ** Building a cross compiler?
dnl --------------------------------------------------------------
CrossCompiling=NO
@@ -10,15 +10,15 @@
# If 'host' and 'target' differ, then this means we are building a cross-compiler.
if test "$TargetPlatform" != "$HostPlatform" ; then
CrossCompiling=YES
-@@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
- use_large_address_space=yes
- elif test "$ghc_host_os" = "openbsd" ; then
- # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE.
-+ # The flag MAP_NORESERVE is supported for source compatibility reasons,
-+ # but is completely ignored by OS mmap
-+ use_large_address_space=no
-+ elif test "$ghc_host_os" = "freebsd" ; then
-+ # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250.
+@@ -1163,6 +1158,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t
# The flag MAP_NORESERVE is supported for source compatibility reasons,
# but is completely ignored by OS mmap
use_large_address_space=no
++ elif test "$ghc_host_os" = "freebsd" ; then
++ # FreeBSD does not support mmap with MAP_NORESERVE, removed in r273250.
++ # The flag MAP_NORESERVE is supported for source compatibility reasons,
++ # but is completely ignored by OS mmap
++ use_large_address_space=no
+ else
+ AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[],
+ [
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 8ffda7a16712..8ab4d6e13130 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -8,14 +8,14 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
endif
-@@ -465,10 +466,7 @@ PACKAGES_STAGE1 += ghc-boot
+@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th
+ PACKAGES_STAGE1 += ghc-boot
PACKAGES_STAGE1 += template-haskell
- PACKAGES_STAGE1 += hoopl
- PACKAGES_STAGE1 += transformers
+ PACKAGES_STAGE1 += ghc-compact
-
-ifeq "$(HADDOCK_DOCS)" "YES"
PACKAGES_STAGE1 += xhtml
-endif
- ifeq "$(Windows_Target)" "NO"
- ifneq "$(TargetOS_CPP)" "ios"
+ ifeq "$(WITH_TERMINFO)" "YES"
+ PACKAGES_STAGE1 += terminfo
diff --git a/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h b/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h
deleted file mode 100644
index 77e317c60036..000000000000
--- a/lang/ghc/files/patch-includes_rts_storage_ClosureMacros.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- includes/rts/storage/ClosureMacros.h.orig 2018-01-03 13:27:55 UTC
-+++ includes/rts/storage/ClosureMacros.h
-@@ -499,8 +499,17 @@ INLINE_HEADER StgWord8 *mutArrPtrsCard (
-
- -------------------------------------------------------------------------- */
-
--#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING))
--#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
-+#if defined(PROFILING)
-+#define ZERO_SLOP_FOR_LDV_PROF 1
-+#else
-+#define ZERO_SLOP_FOR_LDV_PROF 0
-+#endif
-+
-+#if defined(DEBUG) && !defined(THREADED_RTS)
-+#define ZERO_SLOP_FOR_SANITY_CHECK 1
-+#else
-+#define ZERO_SLOP_FOR_SANITY_CHECK 0
-+#endif
-
- #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
- #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
deleted file mode 100644
index c7ddc4addf4f..000000000000
--- a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2017-01-03 15:59:20 UTC
-+++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -996,7 +996,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do
- supportRPaths Linux   = True
- supportRPaths Windows = False
- supportRPaths OSX   = True
-- supportRPaths FreeBSD   = False
-+ supportRPaths FreeBSD   = True
- supportRPaths OpenBSD   = False
- supportRPaths NetBSD   = False
- supportRPaths DragonFly = False
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index 18f937335935..96b536dc0eab 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -1,15 +1,15 @@
---- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-01-03 15:59:20 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-@@ -54,6 +54,8 @@ import Distribution.Compat.Exception
+@@ -59,6 +59,8 @@ import Distribution.Compat.Exception
import Distribution.Verbosity
import Distribution.Version
+import System.FilePath (takeDirectory)
+
- import Data.Char
- ( isDigit )
import qualified Data.Map as Map
-@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") {
+
+ -- ------------------------------------------------------------
+@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") {
gccProgram :: Program
gccProgram = (simpleProgram "gcc") {
@@ -26,7 +26,7 @@
stripProgram :: Program
stripProgram = (simpleProgram "strip") {
-@@ -311,7 +315,9 @@ greencardProgram :: Program
+@@ -337,7 +341,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
diff --git a/lang/ghc/files/patch-rts_Linker.c b/lang/ghc/files/patch-rts_Linker.c
deleted file mode 100644
index 9597fe887603..000000000000
--- a/lang/ghc/files/patch-rts_Linker.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- rts/Linker.c.orig 2017-08-12 09:22:13 UTC
-+++ rts/Linker.c
-@@ -797,7 +797,7 @@ initLinker_ (int retain_cafs)
- # endif /* RTLD_DEFAULT */
-
- compileResult = regcomp(&re_invalid,
-- "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)",
-+ "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)",
- REG_EXTENDED);
- if (compileResult != 0) {
- barf("Compiling re_invalid failed");
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index bbe84280616e..fb33e113fc51 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 1f0b20f729e0..b1a42f9335bd 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index e90754a4c401..8616aec9b145 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 2.3
-PORTREVISION= 1
+PORTVERSION= 2.3.2.5
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index e70f72ac996a..4a917ef8078b 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623071
-SHA256 (cabal/email-validate-2.3.tar.gz) = c149b4a2d4d91c5263f9883944498446ac41258347bdf29908240fa536d6a6fe
-SIZE (cabal/email-validate-2.3.tar.gz) = 9648
+TIMESTAMP = 1523785923
+SHA256 (cabal/email-validate-2.3.2.5.tar.gz) = 7b4ff4e89eccc073df2f51e9d20d507ba1a6d4f5746130c712844c7cf8674e4c
+SIZE (cabal/email-validate-2.3.2.5.tar.gz) = 9693
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index b86a93feb91c..ae9eec4fb7a2 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mime-mail
-PORTVERSION= 0.4.13.1
-PORTREVISION= 1
+PORTVERSION= 0.4.14
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Compose MIME email messages
LICENSE= MIT
-USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \
- text>=0.7
+USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo
index fab5f3109438..8db974cedc5e 100644
--- a/mail/hs-mime-mail/distinfo
+++ b/mail/hs-mime-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623071
-SHA256 (cabal/mime-mail-0.4.13.1.tar.gz) = 9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917
-SIZE (cabal/mime-mail-0.4.13.1.tar.gz) = 9538
+TIMESTAMP = 1523900845
+SHA256 (cabal/mime-mail-0.4.14.tar.gz) = 9632c3d54c9741fece0a3ea705d965485a1299ebe5798d2aa7cca2c8e4baaa3e
+SIZE (cabal/mime-mail-0.4.14.tar.gz) = 9594
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index cbee8b6d5ad5..230d7e05c8e6 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mime-types
PORTVERSION= 0.1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Basic mime-type handling types and functions
LICENSE= MIT
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index d6472827d5e7..fdf3787ce20e 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mime
PORTVERSION= 0.4.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Working with MIME types
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.9
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile
index 56c747eadcdf..17f418635b93 100644
--- a/math/hs-Agda-stdlib/Makefile
+++ b/math/hs-Agda-stdlib/Makefile
@@ -4,7 +4,7 @@ PORTNAME= Agda-stdlib
PORTVERSION= 0.13
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index a9ef822c55af..93d3fb38bf30 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -11,8 +11,8 @@ COMMENT= Dependently typed functional programming language and proof assistant
USE_CABAL= EdisonCore boxes data-hash edit-distance equivalence \
geniplate-mirror gitrev hashable hashtables ieee754 \
- monadplus mtl murmur-hash parallel regex-tdfa strict \
- text unordered-containers zlib
+ mtl murmur-hash parallel regex-tdfa strict \
+ unordered-containers zlib
USE_ALEX= yes
USE_HAPPY= yes
@@ -26,5 +26,7 @@ FLAGS_ENABLE= cpphs
SUB_FILES= pkg-install pkg-deinstall
SUB_LIST= DATADIR=${DATADIR}
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index b03bcaf30fe7..46deef116cf9 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= NumInstances
PORTVERSION= 1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-adjunctions/Makefile b/math/hs-adjunctions/Makefile
index 3ba97c79ac8f..6e27e3f9425d 100644
--- a/math/hs-adjunctions/Makefile
+++ b/math/hs-adjunctions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= adjunctions
-PORTVERSION= 4.3
-PORTREVISION= 1
+PORTVERSION= 4.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-adjunctions/distinfo b/math/hs-adjunctions/distinfo
index 2b0978e81400..a430b89b7010 100644
--- a/math/hs-adjunctions/distinfo
+++ b/math/hs-adjunctions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623373
-SHA256 (cabal/adjunctions-4.3.tar.gz) = b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc
-SIZE (cabal/adjunctions-4.3.tar.gz) = 15651
+TIMESTAMP = 1523889909
+SHA256 (cabal/adjunctions-4.4.tar.gz) = 507c2ef55337ae61c805f8cbc1213dfd7d2b85187342675d662254b8d8a16ae9
+SIZE (cabal/adjunctions-4.4.tar.gz) = 19891
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 9f0e28b4be2e..956d9daf56ca 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -2,7 +2,7 @@
PORTNAME= categories
PORTVERSION= 1.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 7d6e59f59ca6..905d603739f5 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 5.0.1
-PORTREVISION= 1
+PORTVERSION= 5.0.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 19dd26099e89..f17140d27fb3 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543660
-SHA256 (cabal/comonad-5.0.1.tar.gz) = 561ffd697d9d38467d0d426947e0bade25a05e3c507235eca29ec800ad3f463d
-SIZE (cabal/comonad-5.0.1.tar.gz) = 18218
+TIMESTAMP = 1523787141
+SHA256 (cabal/comonad-5.0.3.tar.gz) = a7f4584d634051123c547f0d10f88eaf23d99229dbd01dfdcd98cddd41e54df6
+SIZE (cabal/comonad-5.0.3.tar.gz) = 17430
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index dbb9d8143fcc..60f39dfa59ce 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -2,7 +2,7 @@
PORTNAME= contravariant
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/files/patch-data-lens-template.cabal b/math/hs-data-lens-template/files/patch-data-lens-template.cabal
new file mode 100644
index 000000000000..2fdee632b586
--- /dev/null
+++ b/math/hs-data-lens-template/files/patch-data-lens-template.cabal
@@ -0,0 +1,11 @@
+--- data-lens-template.cabal.orig 2018-04-24 19:52:13 UTC
++++ data-lens-template.cabal
+@@ -22,7 +22,7 @@ library
+ build-depends:
+ data-lens >= 2.0 && < 2.12,
+ base >= 1.0 && < 5,
+- template-haskell >= 2.11 && < 2.12
++ template-haskell >= 2.11 && < 2.14
+
+ exposed-modules:
+ Data.Lens.Template
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 45e828040826..0dc0f6c0b6be 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens
PORTVERSION= 2.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 4f1dac443c98..4a42b54b0580 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.5.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index 91eba5cc0bbd..3b6c94e969db 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499537738
-SHA256 (cabal/distributive-0.5.2.tar.gz) = ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9
-SIZE (cabal/distributive-0.5.2.tar.gz) = 11824
+TIMESTAMP = 1523780948
+SHA256 (cabal/distributive-0.5.3.tar.gz) = 9173805b9c941bda1f37e5aeb68ae30f57a12df9b17bd2aa86db3b7d5236a678
+SIZE (cabal/distributive-0.5.3.tar.gz) = 10147
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 075c24da5a2c..96a406a24fe8 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-fixed/Makefile b/math/hs-fixed/Makefile
index 19afe1330119..6ee78a0c876e 100644
--- a/math/hs-fixed/Makefile
+++ b/math/hs-fixed/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fixed
PORTVERSION= 0.2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-half/Makefile b/math/hs-half/Makefile
index 0f4ed6e0fc7d..3ec88db333cd 100644
--- a/math/hs-half/Makefile
+++ b/math/hs-half/Makefile
@@ -2,7 +2,7 @@
PORTNAME= half
PORTVERSION= 0.2.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 0bad09940b3a..65396ac3dc89 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ieee754
PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-integer-logarithms/Makefile b/math/hs-integer-logarithms/Makefile
index 503424042311..b205a2ff81dc 100644
--- a/math/hs-integer-logarithms/Makefile
+++ b/math/hs-integer-logarithms/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= integer-logarithms
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.2.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-integer-logarithms/distinfo b/math/hs-integer-logarithms/distinfo
index 7c4820709e72..8d3b4ce80dff 100644
--- a/math/hs-integer-logarithms/distinfo
+++ b/math/hs-integer-logarithms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499448646
-SHA256 (cabal/integer-logarithms-1.0.2.tar.gz) = 31069ccbff489baf6c4a93cb7475640aabea9366eb0b583236f10714a682b570
-SIZE (cabal/integer-logarithms-1.0.2.tar.gz) = 8854
+TIMESTAMP = 1523429156
+SHA256 (cabal/integer-logarithms-1.0.2.1.tar.gz) = 32ad4a482a60ec957d1af1268952e2a6b382b67438c14f74f6c2aef2e49b48f2
+SIZE (cabal/integer-logarithms-1.0.2.1.tar.gz) = 8781
diff --git a/math/hs-kan-extensions/Makefile b/math/hs-kan-extensions/Makefile
index 18ae40d8dea1..003fcfc2a437 100644
--- a/math/hs-kan-extensions/Makefile
+++ b/math/hs-kan-extensions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kan-extensions
-PORTVERSION= 5.0.2
-PORTREVISION= 1
+PORTVERSION= 5.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-kan-extensions/distinfo b/math/hs-kan-extensions/distinfo
index d737ba37a20f..cd83d37cca42 100644
--- a/math/hs-kan-extensions/distinfo
+++ b/math/hs-kan-extensions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623376
-SHA256 (cabal/kan-extensions-5.0.2.tar.gz) = 1c9ede8595424209944e59fd46c1d2edb654758be9a45c1c48a4d3cedf42482e
-SIZE (cabal/kan-extensions-5.0.2.tar.gz) = 19957
+TIMESTAMP = 1523890567
+SHA256 (cabal/kan-extensions-5.1.tar.gz) = 193f8e58f267663d5da8e38045b000d0983ac08b84808de42af1a44963f63205
+SIZE (cabal/kan-extensions-5.1.tar.gz) = 22573
diff --git a/math/hs-kan-extensions/files/patch-kan-extensions.cabal b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
index 2d2a1bee65f6..39598c6a6dce 100644
--- a/math/hs-kan-extensions/files/patch-kan-extensions.cabal
+++ b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
@@ -1,10 +1,10 @@
---- kan-extensions.cabal.orig 2017-07-09 21:09:48 UTC
+--- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC
+++ kan-extensions.cabal
-@@ -47,7 +47,6 @@ library
+@@ -57,7 +57,6 @@ library
containers >= 0.4 && < 0.6,
contravariant >= 1 && < 2,
distributive >= 0.2.2 && < 1,
- fail >= 4.9 && < 5,
- free >= 4 && < 5,
+ free >= 4 && < 6,
mtl >= 2.0.1 && < 2.3,
- semigroupoids >= 4 && < 6,
+ profunctors >= 5 && < 6,
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 9088c73eb25a..30cec2202a24 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -3,7 +3,7 @@
PORTNAME= math-functions
PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index e5febca93634..153310004488 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mwc-random
PORTVERSION= 0.13.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index de6363a71163..4b1468d2d5a2 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pointed
PORTVERSION= 5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,8 @@ COMMENT= Pointed and copointed data
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad data-default-class hashable \
- kan-extensions semigroupoids semigroups \
- stm tagged unordered-containers
+USE_CABAL= comonad data-default-class hashable kan-extensions \
+ semigroupoids semigroups tagged unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 3e62092a8fda..dde0ceb6addf 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -3,7 +3,7 @@
PORTNAME= probability
PORTVERSION= 0.2.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index 64ec5d776616..181610731405 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 5.2
-PORTREVISION= 1
+PORTVERSION= 5.2.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 4b18a65474a7..f05279af5509 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499609808
-SHA256 (cabal/semigroupoids-5.2.tar.gz) = d957f8804ca0dc2b85ef68edcab92dba9cd5d61ea0dddc41c173dda6f97791bc
-SIZE (cabal/semigroupoids-5.2.tar.gz) = 23371
+TIMESTAMP = 1523816690
+SHA256 (cabal/semigroupoids-5.2.2.tar.gz) = e4def54834cda65ac1e74e6f12a435410e19c1348e820434a30c491c8937299e
+SIZE (cabal/semigroupoids-5.2.2.tar.gz) = 23800
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 175ec63b2ec6..3566c6ea823b 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.18.3
-PORTREVISION= 1
+PORTVERSION= 0.18.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Anything that associates
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1 text>=0.10 transformers-compat>=0.3 unordered-containers>=0.2
+USE_CABAL= hashable>=1.1 transformers-compat>=0.3 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index 0e75c0f6df0b..5d14ee210101 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499594594
-SHA256 (cabal/semigroups-0.18.3.tar.gz) = 35297c986872406e2efe29620c623727369f8c578e2f9c22998d575996e5a9ca
-SIZE (cabal/semigroups-0.18.3.tar.gz) = 18629
+TIMESTAMP = 1523428484
+SHA256 (cabal/semigroups-0.18.4.tar.gz) = 589e3042329a6bcffb5c0e85834143586db22eb7a2aae094d492cd004f685d27
+SIZE (cabal/semigroups-0.18.4.tar.gz) = 19869
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index c8c4b314c2bb..0563cc4891ce 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -3,7 +3,7 @@
PORTNAME= statistics
PORTVERSION= 0.14.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 01fde2f71930..f51d4d1b124b 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.10.4
-PORTREVISION= 1
+PORTVERSION= 0.13
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index 62ea2051598f..5d7611982ce9 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623378
-SHA256 (cabal/vector-space-0.10.4.tar.gz) = b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2
-SIZE (cabal/vector-space-0.10.4.tar.gz) = 14249
+TIMESTAMP = 1524638503
+SHA256 (cabal/vector-space-0.13.tar.gz) = 0291d5778378acbbb1d6709ba57238f3d6ad551b8b2c6ca2b8177e68f748d617
+SIZE (cabal/vector-space-0.13.tar.gz) = 16121
diff --git a/net-im/hs-haskell-xmpp/Makefile b/net-im/hs-haskell-xmpp/Makefile
index 4c4266a2806a..a4823c5d9db8 100644
--- a/net-im/hs-haskell-xmpp/Makefile
+++ b/net-im/hs-haskell-xmpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-xmpp
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Haskell XMPP library based on HaXml & STM
LICENSE= BSD3CLAUSE
USE_CABAL= HaXml>=1.23.3 html mtl>=1.0 network \
- polyparse random regex-compat stm utf8-string
+ polyparse random regex-compat utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net-p2p/hs-torrent/Makefile b/net-p2p/hs-torrent/Makefile
index 3337241f59d6..fbe740b1fd9f 100644
--- a/net-p2p/hs-torrent/Makefile
+++ b/net-p2p/hs-torrent/Makefile
@@ -2,7 +2,7 @@
PORTNAME= torrent
PORTVERSION= 10000.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/Makefile b/net/Makefile
index 3b6ef377e400..8384a2c0b499 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -246,6 +246,7 @@
SUBDIR += howl
SUBDIR += hping
SUBDIR += hs-aws
+ SUBDIR += hs-bsb-http-chunked
SUBDIR += hs-connection
SUBDIR += hs-gsasl
SUBDIR += hs-hoauth2
@@ -259,6 +260,7 @@
SUBDIR += hs-network-uri
SUBDIR += hs-pcap
SUBDIR += hs-publicsuffixlist
+ SUBDIR += hs-resolv
SUBDIR += hs-sendfile
SUBDIR += hs-simple-sendfile
SUBDIR += hs-socks
diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile
index 210a971d690b..ae86d220d38a 100644
--- a/net/hs-aws/Makefile
+++ b/net/hs-aws/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aws
-PORTVERSION= 0.16
-PORTREVISION= 1
+PORTVERSION= 0.19
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,10 +15,12 @@ USE_CABAL= aeson>=0.6 attoparsec>=0.11 base16-bytestring \
conduit-extra>=1.1 cryptohash>=0.11 data-default>=0.5.3 \
http-conduit>=2.1 http-types>=0.7 lifted-base>=0.1 \
monad-control>=0.3 mtl network resourcet>=1.1 safe>=0.3 \
- scientific>=0.3 tagged>=0.7 text>=0.11 unordered-containers>=0.2 \
+ scientific>=0.3 tagged>=0.7 unordered-containers>=0.2 \
utf8-string>=0.3 vector>=0.10 xml-conduit>=1.2
FLAGS_DISABLE= examples
+IGNORE= Doesn't build with recent hs-conduit and hs-resourcet
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-aws/distinfo b/net/hs-aws/distinfo
index 2edffbd8be7a..f3ccb6c1a89a 100644
--- a/net/hs-aws/distinfo
+++ b/net/hs-aws/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623590
-SHA256 (cabal/aws-0.16.tar.gz) = 84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c
-SIZE (cabal/aws-0.16.tar.gz) = 99193
+TIMESTAMP = 1525086517
+SHA256 (cabal/aws-0.19.tar.gz) = b43b1215405a2c34b9e7ddac8a9f3cf80fff0f031b365a5c0e4e423f45b5777a
+SIZE (cabal/aws-0.19.tar.gz) = 104207
diff --git a/net/hs-aws/files/patch-aws.cabal b/net/hs-aws/files/patch-aws.cabal
deleted file mode 100644
index bbb71f8592a2..000000000000
--- a/net/hs-aws/files/patch-aws.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- aws.cabal.orig 2017-07-10 15:40:11 UTC
-+++ aws.cabal
-@@ -145,7 +145,7 @@ Library
- unordered-containers >= 0.2,
- utf8-string >= 0.3 && < 1.1,
- vector >= 0.10,
-- xml-conduit >= 1.2 && <1.5
-+ xml-conduit >= 1.2 && <1.6
-
- if !impl(ghc >= 7.6)
- Build-depends: ghc-prim
diff --git a/net/hs-bsb-http-chunked/Makefile b/net/hs-bsb-http-chunked/Makefile
new file mode 100644
index 000000000000..5af01cdd13af
--- /dev/null
+++ b/net/hs-bsb-http-chunked/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= bsb-http-chunked
+PORTVERSION= 0.0.0.2
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Chunked HTTP transfer encoding for bytestring builders
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-bsb-http-chunked/distinfo b/net/hs-bsb-http-chunked/distinfo
new file mode 100644
index 000000000000..0ef011a0535b
--- /dev/null
+++ b/net/hs-bsb-http-chunked/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524928561
+SHA256 (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 28cb750979763c815fbf69a6dc510f837b7ccbe262adf0a28ad270966737d5f4
+SIZE (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 6503
diff --git a/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal b/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal
new file mode 100644
index 000000000000..4c3d7444036f
--- /dev/null
+++ b/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal
@@ -0,0 +1,9 @@
+--- bsb-http-chunked.cabal.orig 2018-04-28 15:19:50 UTC
++++ bsb-http-chunked.cabal
+@@ -43,5 +43,4 @@ Library
+ Blaze.ByteString.Builder.Internal.Write
+
+ build-depends: base >= 4.3 && < 4.12,
+- bytestring >= 0.9 && < 0.11,
+- bytestring-builder < 0.11
++ bytestring >= 0.9 && < 0.11
diff --git a/net/hs-bsb-http-chunked/pkg-descr b/net/hs-bsb-http-chunked/pkg-descr
new file mode 100644
index 000000000000..53a9896e9b48
--- /dev/null
+++ b/net/hs-bsb-http-chunked/pkg-descr
@@ -0,0 +1,4 @@
+This library contains functions for encoding bytestring builders for
+chunked HTTP/1.1 transfer.
+
+WWW: http://github.com/sjakobi/bsb-http-chunked
diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile
index 5ff9ac849b3d..34bf56182e3d 100644
--- a/net/hs-connection/Makefile
+++ b/net/hs-connection/Makefile
@@ -2,7 +2,7 @@
PORTNAME= connection
PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
index a10c26c515ec..b1826bc80eba 100644
--- a/net/hs-gsasl/Makefile
+++ b/net/hs-gsasl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gsasl
PORTVERSION= 0.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile
index 3fefacd6286b..14d8957a26e9 100644
--- a/net/hs-hoauth2/Makefile
+++ b/net/hs-hoauth2/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hoauth2
-PORTVERSION= 0.5.9
-PORTREVISION= 1
+PORTVERSION= 1.7.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Haskell OAuth2 authentication
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson http-conduit http-types text unordered-containers \
- wai warp
+USE_CABAL= aeson http-conduit http-types microlens unordered-containers \
+ uri-bytestring uri-bytestring-aeson wai warp
FLAGS_DISABLE= test
diff --git a/net/hs-hoauth2/distinfo b/net/hs-hoauth2/distinfo
index 0ce3cf5c1fed..c67087045fb9 100644
--- a/net/hs-hoauth2/distinfo
+++ b/net/hs-hoauth2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501281503
-SHA256 (cabal/hoauth2-0.5.9.tar.gz) = ffa512787b4ef5a32260aa8659260fdd7e0fcafae7c2482275dd85e7a202b25e
-SIZE (cabal/hoauth2-0.5.9.tar.gz) = 10864
+TIMESTAMP = 1525036387
+SHA256 (cabal/hoauth2-1.7.1.tar.gz) = bae84321fb0c90013677d6abe754774f05fbb3271ced0844df725ca4edb38216
+SIZE (cabal/hoauth2-1.7.1.tar.gz) = 18045
diff --git a/net/hs-hoauth2/files/patch-hoauth2.cabal b/net/hs-hoauth2/files/patch-hoauth2.cabal
index 1de01c4d4892..203ffab8d5d8 100644
--- a/net/hs-hoauth2/files/patch-hoauth2.cabal
+++ b/net/hs-hoauth2/files/patch-hoauth2.cabal
@@ -1,83 +1,26 @@
---- hoauth2.cabal.orig 2017-04-05 20:01:54 UTC
+--- hoauth2.cabal.orig 2018-04-29 21:29:58 UTC
+++ hoauth2.cabal
-@@ -63,7 +63,7 @@ Library
- bytestring >= 0.9 && < 0.11,
- http-conduit >= 2.1 && < 2.3,
- http-types >= 0.9 && < 0.10,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- unordered-containers >= 0.2.5
-
-
-@@ -87,7 +87,7 @@ Executable test-weibo
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
-@@ -111,7 +111,7 @@ Executable test-google
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
-@@ -135,7 +135,7 @@ Executable test-github
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
-@@ -158,7 +158,7 @@ Executable test-douban
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
+@@ -77,12 +77,12 @@ Library
+ bytestring >= 0.9 && < 0.11,
+ http-conduit >= 2.1 && < 2.4,
+ http-types >= 0.11 && < 0.13,
+- aeson >= 0.11 && < 1.3,
++ aeson >= 0.11 && < 1.4,
+ unordered-containers >= 0.2.5,
+ uri-bytestring >= 0.2.3.1 && < 0.4,
+ uri-bytestring-aeson >= 0.1 && < 0.2,
+ microlens >= 0.4.0 && < 0.5,
+- exceptions >= 0.8.3 && < 0.10
++ exceptions >= 0.8.3 && < 0.11
if impl(ghc >= 6.12.0)
-@@ -181,7 +181,7 @@ Executable test-facebook
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
-@@ -207,7 +207,7 @@ Executable test-fitbit
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+@@ -125,7 +125,7 @@ Executable demo-server
wai >= 3.2 && < 3.3,
warp >= 3.2 && < 3.3,
containers >= 0.4 && < 0.6,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
-
-@@ -231,7 +231,7 @@ Executable test-stackexchange
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
-@@ -254,7 +254,7 @@ Executable test-dropbox
- http-conduit >= 2.1 && < 2.3,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.11 && < 1.2,
-+ aeson >= 0.11 && < 1.3,
- hoauth2
-
- if impl(ghc >= 6.12.0)
+- aeson >= 0.11 && < 1.3,
++ aeson >= 0.11 && < 1.4,
+ microlens >= 0.4.0 && < 0.5,
+ unordered-containers >= 0.2.8 && < 0.2.9,
+ wai-extra >= 3.0.21.0 && < 3.0.22.0,
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index d2eb9308a40a..63138c7f20a6 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile
index 56ce5d966907..e06600dcae43 100644
--- a/net/hs-iproute/Makefile
+++ b/net/hs-iproute/Makefile
@@ -2,7 +2,7 @@
PORTNAME= iproute
PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index 776d620fea26..dd3760438394 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Obtain the host MAC address on *NIX and Windows
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index ac0855e23fe8..523c201f7a4c 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-info
PORTVERSION= 0.2.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index a857d935b634..8e489af37603 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-multicast
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile
index 732fff609fec..4f842206b82a 100644
--- a/net/hs-network-protocol-xmpp/Makefile
+++ b/net/hs-network-protocol-xmpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-protocol-xmpp
PORTVERSION= 0.4.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Client library for the XMPP protocol
LICENSE= GPLv3
USE_CABAL= gnuidn>=0.2 gnutls>=0.1.4 gsasl>=0.3 libxml-sax>=0.7 \
- monads-tf>=0.1 network>=2.2 text>=0.10 xml-types>=0.3
+ monads-tf>=0.1 network>=2.2 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network-uri/Makefile b/net/hs-network-uri/Makefile
index 61c48930e480..278d0d040ea8 100644
--- a/net/hs-network-uri/Makefile
+++ b/net/hs-network-uri/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-uri
PORTVERSION= 2.6.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= URI manipulation
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=3.0
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index c16b71c1d35f..dfd6fb6ad77d 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network
PORTVERSION= 2.6.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index 55ca33be2910..ad219413bd14 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index 81516fde6efa..c50dc5f8d07e 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= publicsuffixlist
PORTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Is a given string a domain suffix?
LICENSE= BSD3CLAUSE
-USE_CABAL= cereal data-default text>=0.11 utf8-string
+USE_CABAL= cereal data-default utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-resolv/Makefile b/net/hs-resolv/Makefile
new file mode 100644
index 000000000000..2d00ccdf2666
--- /dev/null
+++ b/net/hs-resolv/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= resolv
+PORTVERSION= 0.1.1.1
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Domain Name Service (DNS) lookup via the libresolv standard library routines
+
+LICENSE= GPLv3
+
+USE_CABAL= base16-bytestring
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-resolv/distinfo b/net/hs-resolv/distinfo
new file mode 100644
index 000000000000..f2b0e84ec838
--- /dev/null
+++ b/net/hs-resolv/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523298714
+SHA256 (cabal/resolv-0.1.1.1.tar.gz) = 49b12ed2b175cca3f885c06ca6906cde1245c02b6f98f2a95fc20d6a8ae40772
+SIZE (cabal/resolv-0.1.1.1.tar.gz) = 149436
diff --git a/net/hs-resolv/files/patch-resolv.cabal b/net/hs-resolv/files/patch-resolv.cabal
new file mode 100644
index 000000000000..7bf02d0ad6ac
--- /dev/null
+++ b/net/hs-resolv/files/patch-resolv.cabal
@@ -0,0 +1,11 @@
+--- resolv.cabal.orig 2018-04-09 19:24:44 UTC
++++ resolv.cabal
+@@ -78,7 +78,7 @@ library
+ Network.DNS.FFI
+ Compat
+
+- build-depends: base >= 4.5 && <4.11
++ build-depends: base >= 4.5 && <4.12
+ , base16-bytestring == 0.1.*
+ , binary >= 0.7.3 && < 0.9
+ , bytestring >= 0.9.2 && < 0.11
diff --git a/net/hs-resolv/pkg-descr b/net/hs-resolv/pkg-descr
new file mode 100644
index 000000000000..2eeb4e6fcaa5
--- /dev/null
+++ b/net/hs-resolv/pkg-descr
@@ -0,0 +1,5 @@
+This package implements an API for accessing the Domain Name Service (DNS)
+resolver service via the standard libresolv system library (whose API is
+often available directly via the standard libc C library) on Unix systems.
+
+WWW: https://github.com/hvr/resolv
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 667c987cddeb..ad6c7c71bddb 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 6bb2bb383710..7917f0936f2f 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-sendfile
PORTVERSION= 0.2.25
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 165487b4e7c9..8638791f28f1 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -2,7 +2,7 @@
PORTNAME= socks
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 194e3c8c0e69..ba51e3d294b2 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 440d1cc2bdc4..e36a82cd91ec 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -3,7 +3,6 @@
PORTNAME= hscolour
PORTVERSION= ${HSCOLOUR_VERSION}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= print haskell
diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo
index c430a7fca6ef..2ad6c5d20c1c 100644
--- a/print/hs-hscolour/distinfo
+++ b/print/hs-hscolour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623755
-SHA256 (cabal/hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8
-SIZE (cabal/hscolour-1.24.1.tar.gz) = 28717
+TIMESTAMP = 1523651197
+SHA256 (cabal/hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
+SIZE (cabal/hscolour-1.24.4.tar.gz) = 28729
diff --git a/science/Makefile b/science/Makefile
index 47dd9c71f083..a595fa444119 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -76,7 +76,6 @@
SUBDIR += hdf
SUBDIR += hdf5
SUBDIR += hdf5-18
- SUBDIR += hs-bio
SUBDIR += hypre
SUBDIR += iboview
SUBDIR += isaac-cfd
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
deleted file mode 100644
index 0d7408275c95..000000000000
--- a/science/hs-bio/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= bio
-PORTVERSION= 0.5.3
-PORTREVISION= 4
-CATEGORIES= science haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Bioinformatics library
-
-LICENSE= LGPL21
-
-USE_CABAL= mtl old-time parallel parsec QuickCheck>=2 random tagsoup>=0.8
-
-EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/science/hs-bio/distinfo b/science/hs-bio/distinfo
deleted file mode 100644
index f4b6aab534a3..000000000000
--- a/science/hs-bio/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/bio-0.5.3.tar.gz) = 42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed
-SIZE (cabal/bio-0.5.3.tar.gz) = 103707
diff --git a/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs b/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs
deleted file mode 100644
index f7ba1305fb88..000000000000
--- a/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs
+++ /dev/null
@@ -1,7 +0,0 @@
---- Bio/Alignment/Bowtie.hs.orig 2013-07-20 07:25:31 UTC
-+++ Bio/Alignment/Bowtie.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| This module provides a data type to represent an alignment
- produced by the Bowtie short-read alignment tool (see
- <http://bowtie-bio.sourceforge.net/index.shtml>).
diff --git a/science/hs-bio/files/patch-bio.cabal b/science/hs-bio/files/patch-bio.cabal
deleted file mode 100644
index c34a3277d73c..000000000000
--- a/science/hs-bio/files/patch-bio.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bio.cabal.orig 2011-12-15 12:56:28.000000000 +0100
-+++ ./bio.cabal 2011-12-17 11:02:26.000000000 +0100
-@@ -38,7 +38,7 @@
- Default: True
-
- Library
-- Build-Depends: base>=4 && <5, binary >=0.4 && <0.5, tagsoup>=0.8, bytestring >= 0.9.1,
-+ Build-Depends: base>=4 && <5, binary >=0.4, tagsoup>=0.8, bytestring >= 0.9.1,
- containers, array, parallel, parsec, mtl, directory, QuickCheck >= 2
-
- Exposed-modules: Bio.Sequence,
diff --git a/science/hs-bio/pkg-descr b/science/hs-bio/pkg-descr
deleted file mode 100644
index 8ebf118ce115..000000000000
--- a/science/hs-bio/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a collection of data structures and algorithms useful for
-building bioinformatics-related tools and utilities. Current list of
-features includes: a Sequence data type supporting protein and
-nucleotide sequences and conversion between them. As of version 0.4,
-different kinds of sequence have different types. Support for quality
-data, reading and writing Fasta formatted files, reading TwoBit and phd
-formats, and Roche/454 SFF files. Rudimentary (i.e. unoptimized) support
-for doing alignments - including dynamic adjustment of scores based on
-sequence quality. Also Blast output parsing. Partly implemented single
-linkage clustering, and multiple alignment. Reading Gene Ontology (GO)
-annotations (GOA) and definitions hierarchy.
-
-WWW: http://biohaskell.org/Libraries/Bio
diff --git a/security/Makefile b/security/Makefile
index bf2a38b16d54..db97c08b47df 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -251,6 +251,7 @@
SUBDIR += hs-cryptohash-sha1
SUBDIR += hs-cryptohash-sha256
SUBDIR += hs-cryptonite
+ SUBDIR += hs-cryptonite-conduit
SUBDIR += hs-digest
SUBDIR += hs-ed25519
SUBDIR += hs-entropy
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index d032f8f8cf2f..154be684a249 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile
index f93dc36b9bbc..997cc1274b38 100644
--- a/security/hs-DRBG/Makefile
+++ b/security/hs-DRBG/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DRBG
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 15be30e84ad1..3548835971a9 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HsOpenSSL
-PORTVERSION= 0.11.4.9
-PORTREVISION= 1
+PORTVERSION= 0.11.4.13
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 988efd22898e..193c02507f5b 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450950
-SHA256 (cabal/HsOpenSSL-0.11.4.9.tar.gz) = ea0fe9bb2a6aa9afe5229dfdc44cae493c3fccf9daffa091d2d1aaa09087b378
-SIZE (cabal/HsOpenSSL-0.11.4.9.tar.gz) = 79689
+TIMESTAMP = 1524153978
+SHA256 (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 125cd16f3db36ed102fe8748e474eaca69dbc57ee8794e29863c69d0a47fff47
+SIZE (cabal/HsOpenSSL-0.11.4.13.tar.gz) = 79832
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index bd4f43c74f33..7dfa4f5eb6b4 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= RSA
PORTVERSION= 2.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index fd451fdc5c1e..5147d38acb4b 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SHA
PORTVERSION= 1.6.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index 45395b2a3d9c..6cb37193e936 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -20,5 +20,7 @@ EXECUTABLE_FLAG_ENABLE= executable
EXECUTABLE_FLAG_CABAL= cmdargs text>=0.11 cryptohash crypto-pubkey
EXECUTABLE_FLAG_EXECUTABLE= certificate
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index cdca99877ee7..58f2d9b29f3c 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-aes
PORTVERSION= 0.2.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile
index ef6105d554a9..acf42d18698a 100644
--- a/security/hs-cipher-aes128/Makefile
+++ b/security/hs-cipher-aes128/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-aes128
PORTVERSION= 0.7.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile
index 6529aa2366a7..6b17898e2a11 100644
--- a/security/hs-cipher-blowfish/Makefile
+++ b/security/hs-cipher-blowfish/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-blowfish
PORTVERSION= 0.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile
index 313fe423f066..1327605da154 100644
--- a/security/hs-cipher-camellia/Makefile
+++ b/security/hs-cipher-camellia/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-camellia
PORTVERSION= 0.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile
index ad8c8da755de..9af2144c0eb1 100644
--- a/security/hs-cipher-des/Makefile
+++ b/security/hs-cipher-des/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-des
PORTVERSION= 0.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index 9523b0490dd0..f4e2a03ef1ba 100644
--- a/security/hs-cipher-rc4/Makefile
+++ b/security/hs-cipher-rc4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-rc4
PORTVERSION= 0.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index 3f368c0496c5..2ffd5a00efb1 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clientsession
PORTVERSION= 0.9.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index 37ada3d1c67a..99ae8298572e 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index cd8f7f7ae14d..5e781871bd34 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-api
PORTVERSION= 0.13.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile
index 9bbc8971e62a..8c65954232d5 100644
--- a/security/hs-crypto-cipher-types/Makefile
+++ b/security/hs-crypto-cipher-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-cipher-types
PORTVERSION= 0.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal
index 406550238d35..5ba5ff25f83f 100644
--- a/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal
+++ b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal
@@ -1,13 +1,14 @@
---- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC
+--- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC
+++ crypto-conduit.cabal
@@ -37,9 +37,9 @@ Library
Build-depends:
base >= 3 && < 5,
bytestring >= 0.9,
- cereal >= 0.3 && < 0.5,
-+ cereal >= 0.3 && < 0.6,
- conduit >= 1.0 && < 1.3,
+- conduit >= 1.0 && < 1.3,
- transformers >= 0.2 && < 0.5,
++ cereal >= 0.3 && < 0.6,
++ conduit >= 1.0 && < 1.4,
+ transformers >= 0.2 && < 0.6,
resourcet
if flag(conduit11)
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index 638ad2ade6f3..158451c77664 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-numbers
PORTVERSION= 0.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index b9bf2f1b09a6..508aa9dbc146 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-pubkey-types
PORTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index ee4b0e79b7f7..1a8835aefcf0 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-pubkey
PORTVERSION= 0.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index 4e68a5b1dd4a..849919552880 100644
--- a/security/hs-crypto-random-api/Makefile
+++ b/security/hs-crypto-random-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-random-api
PORTVERSION= 0.2.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile
index 8fe6dd89ee7d..228616107904 100644
--- a/security/hs-crypto-random/Makefile
+++ b/security/hs-crypto-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-random
PORTVERSION= 0.0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index e146fdd8a2fd..5a3b8370b089 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptocipher
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile
index cd7fa1c242b3..c05ce32f33c8 100644
--- a/security/hs-cryptohash-conduit/Makefile
+++ b/security/hs-cryptohash-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-conduit
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile
index f58ed262c7ad..54e43b123a1c 100644
--- a/security/hs-cryptohash-cryptoapi/Makefile
+++ b/security/hs-cryptohash-cryptoapi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-cryptoapi
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-md5/Makefile b/security/hs-cryptohash-md5/Makefile
index 7515d715a700..d68f8afe1827 100644
--- a/security/hs-cryptohash-md5/Makefile
+++ b/security/hs-cryptohash-md5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-md5
PORTVERSION= 0.11.100.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal
new file mode 100644
index 000000000000..6281f57ac3e3
--- /dev/null
+++ b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal
@@ -0,0 +1,11 @@
+--- cryptohash-md5.cabal.orig 2018-04-11 18:11:29 UTC
++++ cryptohash-md5.cabal
+@@ -41,7 +41,7 @@ source-repository head
+
+ library
+ default-language: Haskell2010
+- build-depends: base >= 4.5 && < 4.10
++ build-depends: base >= 4.5 && < 4.12
+ , bytestring >= 0.9.2 && < 0.11
+
+ hs-source-dirs: src
diff --git a/security/hs-cryptohash-sha1/Makefile b/security/hs-cryptohash-sha1/Makefile
index ce84e626d9f3..a1683c3a6d63 100644
--- a/security/hs-cryptohash-sha1/Makefile
+++ b/security/hs-cryptohash-sha1/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
-PORTNAME= cryptohash-sha1
-PORTVERSION= 0.11.100.1
-PORTREVISION= 1
-CATEGORIES= security haskell
+PORTNAME= cryptohash-sha1
+PORTVERSION= 0.11.100.1
+PORTREVISION= 2
+CATEGORIES= security haskell
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
-LICENSE= BSD3CLAUSE
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal
new file mode 100644
index 000000000000..20e21c23933a
--- /dev/null
+++ b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal
@@ -0,0 +1,11 @@
+--- cryptohash-sha1.cabal.orig 2018-04-13 20:05:39 UTC
++++ cryptohash-sha1.cabal
+@@ -41,7 +41,7 @@ source-repository head
+
+ library
+ default-language: Haskell2010
+- build-depends: base >= 4.5 && < 4.10
++ build-depends: base >= 4.5 && < 4.12
+ , bytestring >= 0.9.2 && < 0.11
+
+ hs-source-dirs: src
diff --git a/security/hs-cryptohash-sha256/Makefile b/security/hs-cryptohash-sha256/Makefile
index 8bbf09a1a02b..ab9ccada5fdd 100644
--- a/security/hs-cryptohash-sha256/Makefile
+++ b/security/hs-cryptohash-sha256/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
-PORTNAME= cryptohash-sha256
-PORTVERSION= 0.11.100.1
-PORTREVISION= 1
-CATEGORIES= security haskell
+PORTNAME= cryptohash-sha256
+PORTVERSION= 0.11.101.0
+CATEGORIES= security haskell
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
-LICENSE= BSD3CLAUSE
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-sha256/distinfo b/security/hs-cryptohash-sha256/distinfo
index d8533f99127a..b65753b6feb3 100644
--- a/security/hs-cryptohash-sha256/distinfo
+++ b/security/hs-cryptohash-sha256/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499788695
-SHA256 (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6
-SIZE (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 10885
+TIMESTAMP = 1523276193
+SHA256 (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd
+SIZE (cabal/cryptohash-sha256-0.11.101.0.tar.gz) = 14996
diff --git a/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal
new file mode 100644
index 000000000000..e5291aadd366
--- /dev/null
+++ b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal
@@ -0,0 +1,11 @@
+--- cryptohash-sha256.cabal.orig 2018-04-09 12:20:11 UTC
++++ cryptohash-sha256.cabal
+@@ -74,7 +74,7 @@ library
+ Trustworthy
+ Unsafe
+
+- build-depends: base >= 4.5 && < 4.11
++ build-depends: base >= 4.5 && < 4.12
+ , bytestring >= 0.9.2 && < 0.11
+
+ ghc-options: -Wall
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index c2e926e2ba9b..8b90edda43eb 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash
PORTVERSION= 0.11.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptonite-conduit/Makefile b/security/hs-cryptonite-conduit/Makefile
new file mode 100644
index 000000000000..159b11529979
--- /dev/null
+++ b/security/hs-cryptonite-conduit/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cryptonite-conduit
+PORTVERSION= 0.2.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cryptonite conduit
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit conduit-extra cryptonite resourcet
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptonite-conduit/distinfo b/security/hs-cryptonite-conduit/distinfo
new file mode 100644
index 000000000000..a48f0765320d
--- /dev/null
+++ b/security/hs-cryptonite-conduit/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525170379
+SHA256 (cabal/cryptonite-conduit-0.2.2.tar.gz) = 705d69ab3f79b7b8810c7b9e7da81a1c6686b6a4323b1e78150576a25a658dae
+SIZE (cabal/cryptonite-conduit-0.2.2.tar.gz) = 5405
diff --git a/security/hs-cryptonite-conduit/pkg-descr b/security/hs-cryptonite-conduit/pkg-descr
new file mode 100644
index 000000000000..e5ff652a3aa3
--- /dev/null
+++ b/security/hs-cryptonite-conduit/pkg-descr
@@ -0,0 +1,5 @@
+Conduit bridge for cryptonite. For now only provide a conduit version for
+hash and hmac, but with contribution, this could provide cipher conduits too,
+and probably other things.
+
+WWW: https://github.com/haskell-crypto/cryptonite-conduit
diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile
index b63b15f7f22d..b312be035b2c 100644
--- a/security/hs-cryptonite/Makefile
+++ b/security/hs-cryptonite/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptonite
PORTVERSION= 0.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index e7f7d86c63f0..48f62f95124d 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,7 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-ed25519/Makefile b/security/hs-ed25519/Makefile
index 4f0523c7c3cf..1dff82743341 100644
--- a/security/hs-ed25519/Makefile
+++ b/security/hs-ed25519/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ed25519
PORTVERSION= 0.0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 47f5491b34bd..31c2fef3b7bf 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= entropy
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index 0341bedefbfa..1be5f6569832 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnutls
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-hackage-security/Makefile b/security/hs-hackage-security/Makefile
index fe709a5206b8..420fcf43936e 100644
--- a/security/hs-hackage-security/Makefile
+++ b/security/hs-hackage-security/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hackage-security
-PORTVERSION= 0.5.2.2
-PORTREVISION= 1
+PORTVERSION= 0.5.3.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= The hackage security library provides both server and client utilities
LICENSE= BSD3CLAUSE
USE_CABAL= base16-bytestring base64-bytestring cryptohash-sha256 ed25519 \
- mtl network network-uri old-locale old-time parsec tar zlib
+ mtl network network-uri old-locale old-time tar zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-hackage-security/distinfo b/security/hs-hackage-security/distinfo
index 4b6cc06aacbc..877f03b7bcf3 100644
--- a/security/hs-hackage-security/distinfo
+++ b/security/hs-hackage-security/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499790857
-SHA256 (cabal/hackage-security-0.5.2.2.tar.gz) = 507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41
-SIZE (cabal/hackage-security-0.5.2.2.tar.gz) = 83131
+TIMESTAMP = 1523300294
+SHA256 (cabal/hackage-security-0.5.3.0.tar.gz) = db986e17e9265aa9e40901690815b890b97d53159eb24d0a6cafaa7c18577c21
+SIZE (cabal/hackage-security-0.5.3.0.tar.gz) = 87119
diff --git a/security/hs-hackage-security/files/patch-hackage-security.cabal b/security/hs-hackage-security/files/patch-hackage-security.cabal
deleted file mode 100644
index 9475199655e4..000000000000
--- a/security/hs-hackage-security/files/patch-hackage-security.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- hackage-security.cabal.orig 2016-08-28 22:57:40 UTC
-+++ hackage-security.cabal
-@@ -101,7 +101,6 @@ library
- bytestring >= 0.9 && < 0.11,
- Cabal >= 1.14 && < 1.26,
- containers >= 0.4 && < 0.6,
-- directory >= 1.1.0.2 && < 1.3,
- ed25519 >= 0.0 && < 0.1,
- filepath >= 1.2 && < 1.5,
- mtl >= 2.2 && < 2.3,
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 8dba6f13d074..dc23feb89107 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monadcryptorandom
-PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTVERSION= 0.7.2.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 3aac0fe2783c..fb7d523a0aef 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624172
-SHA256 (cabal/monadcryptorandom-0.7.1.tar.gz) = 85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7
-SIZE (cabal/monadcryptorandom-0.7.1.tar.gz) = 4851
+TIMESTAMP = 1524150252
+SHA256 (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 69453b6f8681033ff68a5afd410a336a37ff149de816439d5c49433d790a760d
+SIZE (cabal/monadcryptorandom-0.7.2.1.tar.gz) = 4851
diff --git a/security/hs-nonce/Makefile b/security/hs-nonce/Makefile
index 590180a706de..4bfe2e5c83a4 100644
--- a/security/hs-nonce/Makefile
+++ b/security/hs-nonce/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= nonce
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Generate cryptographic nonces
LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 text>=0.9
+USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 \
+ unliftio
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-nonce/distinfo b/security/hs-nonce/distinfo
index 9479c7ac43c7..d82dcd87a28e 100644
--- a/security/hs-nonce/distinfo
+++ b/security/hs-nonce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499537845
-SHA256 (cabal/nonce-1.0.4.tar.gz) = 51661ae3dda7263f1772d628f9a7c08a319dc221b3936ceabea3b2a50f086ef6
-SIZE (cabal/nonce-1.0.4.tar.gz) = 2788
+TIMESTAMP = 1523901488
+SHA256 (cabal/nonce-1.0.7.tar.gz) = 4b4f6232b2cb07a6de47a838b4dc35c346a745683866dbfc6ebb8682158037e1
+SIZE (cabal/nonce-1.0.7.tar.gz) = 2956
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 9a9039540c1c..e936ef5254a2 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index 374de5194945..67cf02343e3c 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 775ec604e197..611630385c29 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index dc1de325c15f..bc2a832c2cae 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -2,7 +2,7 @@
PORTNAME= skein
PORTVERSION= 1.0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls-session-manager/Makefile b/security/hs-tls-session-manager/Makefile
index a0d18b37b4de..2a9465adc0cc 100644
--- a/security/hs-tls-session-manager/Makefile
+++ b/security/hs-tls-session-manager/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tls-session-manager
PORTVERSION= 0.0.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 3ebc0461dbe0..5e0068478aed 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.3.11
-PORTREVISION= 1
+PORTVERSION= 1.4.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index 44e95bcffc49..1919a6259675 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499542268
-SHA256 (cabal/tls-1.3.11.tar.gz) = 3f008eb942874f8114f9a332f9669c44d72825ba39ce0fad89f0f8dfa6fb2703
-SIZE (cabal/tls-1.3.11.tar.gz) = 94342
+TIMESTAMP = 1524684486
+SHA256 (cabal/tls-1.4.1.tar.gz) = bbead1afc0b808bd5cff7bddaeae84ade37f18bbe72bd78d45a2fa4ac41908f8
+SIZE (cabal/tls-1.4.1.tar.gz) = 92647
diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile
index 0997ffb02e8d..35ec208b1ee6 100644
--- a/security/hs-x509-store/Makefile
+++ b/security/hs-x509-store/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-store
-PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTVERSION= 1.6.6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-store/distinfo b/security/hs-x509-store/distinfo
index 701411ef031e..4a0dc106d4d1 100644
--- a/security/hs-x509-store/distinfo
+++ b/security/hs-x509-store/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499594984
-SHA256 (cabal/x509-store-1.6.2.tar.gz) = 49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b
-SIZE (cabal/x509-store-1.6.2.tar.gz) = 4326
+TIMESTAMP = 1523784064
+SHA256 (cabal/x509-store-1.6.6.tar.gz) = 6a276f595cf91c9688129cad4c9c6be9c349ffc0de22300eeb3dfa6a2b6e7635
+SIZE (cabal/x509-store-1.6.6.tar.gz) = 10802
diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile
index ac2af6109789..bf6f0655b5ad 100644
--- a/security/hs-x509-system/Makefile
+++ b/security/hs-x509-system/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-system
-PORTVERSION= 1.6.4
-PORTREVISION= 1
+PORTVERSION= 1.6.6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-system/distinfo b/security/hs-x509-system/distinfo
index f3cd52ac8b6e..021da9b4fa3a 100644
--- a/security/hs-x509-system/distinfo
+++ b/security/hs-x509-system/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624174
-SHA256 (cabal/x509-system-1.6.4.tar.gz) = d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c
-SIZE (cabal/x509-system-1.6.4.tar.gz) = 3443
+TIMESTAMP = 1524253699
+SHA256 (cabal/x509-system-1.6.6.tar.gz) = 40dcdaae3ec67f38c08d96d4365b901eb8ac0c590bd7972eb429d37d58aa4419
+SIZE (cabal/x509-system-1.6.6.tar.gz) = 3419
diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile
index 16cc687bf649..de0d814b59ea 100644
--- a/security/hs-x509-validation/Makefile
+++ b/security/hs-x509-validation/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-validation
-PORTVERSION= 1.6.5
-PORTREVISION= 1
+PORTVERSION= 1.6.10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-validation/distinfo b/security/hs-x509-validation/distinfo
index 9216fb078f20..09ee09db3ff7 100644
--- a/security/hs-x509-validation/distinfo
+++ b/security/hs-x509-validation/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499594943
-SHA256 (cabal/x509-validation-1.6.5.tar.gz) = d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4
-SIZE (cabal/x509-validation-1.6.5.tar.gz) = 10370
+TIMESTAMP = 1524342266
+SHA256 (cabal/x509-validation-1.6.10.tar.gz) = 761c9d77322528259b690508e829cb360feb1fc542951a99f3af51ae980e45d7
+SIZE (cabal/x509-validation-1.6.10.tar.gz) = 19356
diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile
index 648cf5f4a690..300229239585 100644
--- a/security/hs-x509/Makefile
+++ b/security/hs-x509/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509
-PORTVERSION= 1.6.5
-PORTREVISION= 1
+PORTVERSION= 1.7.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509/distinfo b/security/hs-x509/distinfo
index 0081dbdf0bd5..6658040f2a55 100644
--- a/security/hs-x509/distinfo
+++ b/security/hs-x509/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543706
-SHA256 (cabal/x509-1.6.5.tar.gz) = b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783
-SIZE (cabal/x509-1.6.5.tar.gz) = 16711
+TIMESTAMP = 1523638130
+SHA256 (cabal/x509-1.7.3.tar.gz) = 41740f949bb773dc721d342a85587a512658c81ee8cd38f102473b315e127356
+SIZE (cabal/x509-1.7.3.tar.gz) = 18386
diff --git a/shells/hs-shelly/Makefile b/shells/hs-shelly/Makefile
index 687a2b839385..6917c435986c 100644
--- a/shells/hs-shelly/Makefile
+++ b/shells/hs-shelly/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shelly
-PORTVERSION= 1.6.8.3
-PORTREVISION= 1
+PORTVERSION= 1.7.2
CATEGORIES= shells haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= async enclosed-exceptions exceptions>=0.6 lifted-async \
lifted-base monad-control>=0.3.2 mtl>=2 system-fileio \
- system-filepath>=0.4.7 text transformers-base unix-compat
+ system-filepath>=0.4.7 transformers-base unix-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/shells/hs-shelly/distinfo b/shells/hs-shelly/distinfo
index a8e76eae8851..073202b57b95 100644
--- a/shells/hs-shelly/distinfo
+++ b/shells/hs-shelly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624201
-SHA256 (cabal/shelly-1.6.8.3.tar.gz) = 78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487
-SIZE (cabal/shelly-1.6.8.3.tar.gz) = 98086
+TIMESTAMP = 1524404401
+SHA256 (cabal/shelly-1.7.2.tar.gz) = 7662c746888a71f785fe00dde6940aeacdec6af700aec567493a99d8e31ef111
+SIZE (cabal/shelly-1.7.2.tar.gz) = 101946
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index c453d6d0048f..c8224676db55 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= angel
PORTVERSION= 0.6.2
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Process management and supervision daemon
LICENSE= BSD3CLAUSE
USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \
- stm>=2.0 text>=0.11 unordered-containers>=0.1.4
+ unordered-containers>=0.1.4
EXECUTABLE= angel
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 166880667166..d8285271a167 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-disk-free-space/Makefile b/sysutils/hs-disk-free-space/Makefile
index 06841e31f1b9..4433e37b857a 100644
--- a/sysutils/hs-disk-free-space/Makefile
+++ b/sysutils/hs-disk-free-space/Makefile
@@ -2,7 +2,7 @@
PORTNAME= disk-free-space
PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile
index cb653f9476df..a419ab62ce86 100644
--- a/sysutils/hs-ekg-core/Makefile
+++ b/sysutils/hs-ekg-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ekg-core
-PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.4
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Tracking of system metrics
LICENSE= BSD3CLAUSE
-USE_CABAL= text unordered-containers
+USE_CABAL= unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo
index b4761f240d9c..c113e735dfad 100644
--- a/sysutils/hs-ekg-core/distinfo
+++ b/sysutils/hs-ekg-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538190
-SHA256 (cabal/ekg-core-0.1.1.1.tar.gz) = 54de3df4b1b027aa2f3760b64f6a8c8134f3275b6d95bf1cf1fc0e74282939d6
-SIZE (cabal/ekg-core-0.1.1.1.tar.gz) = 12426
+TIMESTAMP = 1523637800
+SHA256 (cabal/ekg-core-0.1.1.4.tar.gz) = 66d89acca05c1c91dc57a9c4b3f62d25ccd0c04bb2bfd46d5947f9b8cd8ee937
+SIZE (cabal/ekg-core-0.1.1.4.tar.gz) = 13252
diff --git a/sysutils/hs-ekg-core/files/patch-ekg-core.cabal b/sysutils/hs-ekg-core/files/patch-ekg-core.cabal
new file mode 100644
index 000000000000..b59524573861
--- /dev/null
+++ b/sysutils/hs-ekg-core/files/patch-ekg-core.cabal
@@ -0,0 +1,11 @@
+--- ekg-core.cabal.orig 2018-04-13 16:45:53 UTC
++++ ekg-core.cabal
+@@ -33,7 +33,7 @@ library
+
+ build-depends:
+ ghc-prim < 0.6,
+- base >= 4.5 && < 4.11,
++ base >= 4.5 && < 4.12,
+ containers >= 0.5 && < 0.6,
+ text < 1.3,
+ unordered-containers < 0.3
diff --git a/sysutils/hs-ekg-json/Makefile b/sysutils/hs-ekg-json/Makefile
index 1ac3e196b7e1..bb8ba279724c 100644
--- a/sysutils/hs-ekg-json/Makefile
+++ b/sysutils/hs-ekg-json/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ekg-json
-PORTVERSION= 0.1.0.5
-PORTREVISION= 1
+PORTVERSION= 0.1.0.6
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= JSON encoding of ekg metrics
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson ekg-core>=0.1 text unordered-containers
+USE_CABAL= aeson ekg-core>=0.1 unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg-json/distinfo b/sysutils/hs-ekg-json/distinfo
index b5c864a87566..9f281afa82dd 100644
--- a/sysutils/hs-ekg-json/distinfo
+++ b/sysutils/hs-ekg-json/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499546477
-SHA256 (cabal/ekg-json-0.1.0.5.tar.gz) = 0cd5ecae57a156a5c779acff70d0fa3b02c52cb05283c0effb62a2902ebe8556
-SIZE (cabal/ekg-json-0.1.0.5.tar.gz) = 3092
+TIMESTAMP = 1524430137
+SHA256 (cabal/ekg-json-0.1.0.6.tar.gz) = 1e6a80aa0a28bbf41c9c6364cbb5731160d14fa54145f27a82d0b3467a04dd47
+SIZE (cabal/ekg-json-0.1.0.6.tar.gz) = 3094
diff --git a/sysutils/hs-ekg-json/files/patch-ekg-json.cabal b/sysutils/hs-ekg-json/files/patch-ekg-json.cabal
new file mode 100644
index 000000000000..d3ae028c1991
--- /dev/null
+++ b/sysutils/hs-ekg-json/files/patch-ekg-json.cabal
@@ -0,0 +1,13 @@
+--- ekg-json.cabal.orig 2018-04-22 20:52:14 UTC
++++ ekg-json.cabal
+@@ -20,8 +20,8 @@ library
+ exposed-modules:
+ System.Metrics.Json
+ build-depends:
+- aeson >=0.4 && < 1.3,
+- base >= 4.5 && < 4.11,
++ aeson >=0.4 && < 1.4,
++ base >= 4.5 && < 4.12,
+ ekg-core >= 0.1 && < 0.2,
+ text < 1.3,
+ unordered-containers < 0.3
diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile
index e2b6b5fed0ff..e55e130edfd0 100644
--- a/sysutils/hs-ekg/Makefile
+++ b/sysutils/hs-ekg/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ekg
-PORTVERSION= 0.4.0.13
-PORTREVISION= 1
+PORTVERSION= 0.4.0.15
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Remote monitoring of processes
LICENSE= BSD3CLAUSE
USE_CABAL= aeson ekg-core>=0.1 ekg-json>=0.1 network snap-core \
- snap-server text unordered-containers
+ snap-server unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg/distinfo b/sysutils/hs-ekg/distinfo
index a35492f70bb6..65a05039092a 100644
--- a/sysutils/hs-ekg/distinfo
+++ b/sysutils/hs-ekg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624252
-SHA256 (cabal/ekg-0.4.0.13.tar.gz) = 44b1d5987e8d8061aaf05fd96f9072399ba16b07999caf5186e856c7e47bb48f
-SIZE (cabal/ekg-0.4.0.13.tar.gz) = 171231
+TIMESTAMP = 1525008611
+SHA256 (cabal/ekg-0.4.0.15.tar.gz) = 482ae3be495cfe4f03332ad1c79ce8b5ad4f9c8eec824980c664808ae32c6dcc
+SIZE (cabal/ekg-0.4.0.15.tar.gz) = 171305
diff --git a/sysutils/hs-ekg/files/patch-ekg.cabal b/sysutils/hs-ekg/files/patch-ekg.cabal
new file mode 100644
index 000000000000..ae5cd41e4ce3
--- /dev/null
+++ b/sysutils/hs-ekg/files/patch-ekg.cabal
@@ -0,0 +1,11 @@
+--- ekg.cabal.orig 2018-04-29 13:38:25 UTC
++++ ekg.cabal
+@@ -39,7 +39,7 @@ library
+ System.Remote.Snap
+
+ build-depends:
+- aeson >= 0.4 && < 1.3,
++ aeson >= 0.4 && < 1.4,
+ base >= 4.5 && < 4.12,
+ bytestring < 1.0,
+ ekg-core >= 0.1 && < 0.2,
diff --git a/sysutils/hs-mountpoints/Makefile b/sysutils/hs-mountpoints/Makefile
index 8fa735387a8f..6796ef37302a 100644
--- a/sysutils/hs-mountpoints/Makefile
+++ b/sysutils/hs-mountpoints/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mountpoints
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/Makefile b/textproc/Makefile
index a47159d333e2..b3b720b6c89b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -261,6 +261,7 @@
SUBDIR += hs-case-insensitive
SUBDIR += hs-cassava
SUBDIR += hs-cmark
+ SUBDIR += hs-cmark-gfm
SUBDIR += hs-csv
SUBDIR += hs-doctemplates
SUBDIR += hs-double-conversion
@@ -281,7 +282,6 @@
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-citeproc
SUBDIR += hs-pandoc-types
- SUBDIR += hs-parsec
SUBDIR += hs-polyparse
SUBDIR += hs-pretty-show
SUBDIR += hs-regex-applicative
@@ -295,6 +295,7 @@
SUBDIR += hs-rfc5051
SUBDIR += hs-scanner
SUBDIR += hs-skylighting
+ SUBDIR += hs-skylighting-core
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
@@ -302,6 +303,7 @@
SUBDIR += hs-uri
SUBDIR += hs-uri-bytestring
SUBDIR += hs-uri-bytestring-aeson
+ SUBDIR += hs-uri-encode
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
SUBDIR += hs-xml-hamlet
diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile
index 98f8b8cfc791..5d9f63b5cbdf 100644
--- a/textproc/cgrep/Makefile
+++ b/textproc/cgrep/Makefile
@@ -2,9 +2,7 @@
# $FreeBSD$
PORTNAME= cgrep
-PORTVERSION= 6.4.3
-PORTREVISION= 1
-DISTVERSIONPREFIX= v
+PORTVERSION= 6.6.25
CATEGORIES= textproc
MAINTAINER= lwhsu@FreeBSD.org
@@ -12,29 +10,12 @@ COMMENT= Context-aware grep for source codes
LICENSE= GPLv2
-BUILD_DEPENDS= ghc:lang/ghc \
- hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \
- hs-cmdargs>=0.10:devel/hs-cmdargs \
- hs-dlist>=0.3:devel/hs-dlist \
- hs-regex-posix>=0.90:textproc/hs-regex-posix \
- hs-safe>=0.3:devel/hs-safe \
- hs-split>=0.2:devel/hs-split \
- hs-stm>=2.1:devel/hs-stm \
- hs-stringsearch>=0.3:textproc/hs-stringsearch \
- hs-unordered-containers>=0.1:devel/hs-unordered-containers
+USE_CABAL= aeson ansi-terminal async cmdargs either exceptions regex-pcre \
+ regex-posix safe split stringsearch unicode-show unix-compat \
+ utf8-string yaml
-USE_GITHUB= yes
-GH_ACCOUNT= awgn
-
-USES= gmake
-
-do-build:
- cd ${WRKSRC}/src && ${GMAKE} cgrep
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/cgrep ${STAGEDIR}${PREFIX}/bin/
-
- ${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/cgreprc ${STAGEDIR}${DATADIR}
+EXECUTABLE= cgrep
+STANDALONE= yes
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/cgrep/distinfo b/textproc/cgrep/distinfo
index 5d4d9aa6de6c..e43fba0c142f 100644
--- a/textproc/cgrep/distinfo
+++ b/textproc/cgrep/distinfo
@@ -1,2 +1,3 @@
-SHA256 (awgn-cgrep-v6.4.3_GH0.tar.gz) = 65cd59f50de4e1865cd39d198da21beb76ba898d859d07718e6605f7ff33ae78
-SIZE (awgn-cgrep-v6.4.3_GH0.tar.gz) = 33419
+TIMESTAMP = 1525721128
+SHA256 (cabal/cgrep-6.6.25.tar.gz) = 9c5ef414859b13b207e1b0867428ce159927868c9b28446c28013d5996f05931
+SIZE (cabal/cgrep-6.6.25.tar.gz) = 34671
diff --git a/textproc/cgrep/files/patch-src_Main.hs b/textproc/cgrep/files/patch-src_Main.hs
deleted file mode 100644
index 08eb8a0f3289..000000000000
--- a/textproc/cgrep/files/patch-src_Main.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-Backport of:
-From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001
-From: ilovezfs <ilovezfs@icloud.com>
-Date: Mon, 23 May 2016 03:53:52 -0700
-Subject: [PATCH] cgrep: fix isSymbolicLink collision
-
-System.Directory.isSymbolicLink collides with
-System.PosixCompat.Files.isSymbolicLink (and with
-System.Posix.Files.isSymbolicLink)
-
-This applies the solution proposed here:
-https://github.com/haskell/directory/issues/52#issuecomment-220879392
---- src/Main.hs.orig 2014-06-21 09:27:05 UTC
-+++ src/Main.hs
-@@ -37,7 +37,7 @@ import System.Console.CmdArgs
- import System.Directory
- import System.FilePath ((</>), takeFileName)
- import System.Environment
--import System.Posix.Files
-+import System.Posix.Files as PosixFiles
- import System.IO
- import System.Exit
-
-@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir
- status <- getFileStatus path
- lstatus <- getSymbolicLinkStatus path
- unless (cpath `Set.member` visited) $
-- if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts)
-+ if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts)
- then unless (filename `elem` prunedir) $
- putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited)
- else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of
diff --git a/textproc/cgrep/pkg-plist b/textproc/cgrep/pkg-plist
deleted file mode 100644
index 0f919920f368..000000000000
--- a/textproc/cgrep/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/cgrep
-%%DATADIR%%/cgreprc
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 8c790c23be34..8cf0212a1cac 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Diff
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index f75c25a4d742..328975c204fa 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTVERSION= 0.8.7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder mtl old-locale parsec syb text void
+USE_CABAL= blaze-builder mtl old-locale syb void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index a37a85f96014..1dc0b6694000 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538746
-SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd
-SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034
+TIMESTAMP = 1523960618
+SHA256 (cabal/HStringTemplate-0.8.7.tar.gz) = 4f4ea4aa2e45e7c45821b87b0105c201fbadebc2f2d00c211e728403a0af6b0e
+SIZE (cabal/HStringTemplate-0.8.7.tar.gz) = 15903
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 2022a6e00e27..8643f3e628f7 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -16,5 +16,7 @@ USE_CABAL= polyparse>=1.10 random
EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \
MkOneOf Validate XsdToHaskell Xtract
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index ed360a8ae609..a9c28abe7b20 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 0ea6713134fa..f2881b760c91 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Pass input from an enumerator to an Attoparsec parser
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text
+USE_CABAL= attoparsec>=0.10 enumerator>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile
index 6f286942baab..5c0afebf8464 100644
--- a/textproc/hs-attoparsec-iso8601/Makefile
+++ b/textproc/hs-attoparsec-iso8601/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attoparsec-iso8601
PORTVERSION= 1.0.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Parsing of ISO 8601 dates
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec base-compat text
+USE_CABAL= attoparsec base-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal
new file mode 100644
index 000000000000..a8a48a468b50
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal
@@ -0,0 +1,10 @@
+--- attoparsec-iso8601.cabal.orig 2018-04-29 20:25:05 UTC
++++ attoparsec-iso8601.cabal
+@@ -37,7 +37,7 @@ library
+ build-depends:
+ attoparsec >= 0.13.0.1,
+ base >= 4.5 && < 5,
+- base-compat >= 0.9.1 && < 0.10,
++ base-compat >= 0.9.1 && < 0.11,
+ text >= 1.1.1.0,
+ time >= 1.1.1.4
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index b8d2fcad5c52..204e0611b191 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.13.1.0
-PORTREVISION= 1
+PORTVERSION= 0.13.2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fast combinator parsing for bytestrings and text
LICENSE= BSD3CLAUSE
-USE_CABAL= scientific text
+USE_CABAL= scientific
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index d3dbac0e2561..6228a54fcd84 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499537691
-SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64
-SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512
+TIMESTAMP = 1523636401
+SHA256 (cabal/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848
+SIZE (cabal/attoparsec-0.13.2.2.tar.gz) = 159729
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
index 579b1c5cee86..c57b915c428d 100644
--- a/textproc/hs-bencode/Makefile
+++ b/textproc/hs-bencode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bencode
PORTVERSION= 0.6.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Parser and printer for bencoded data
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 3608446850d2..cf9623e9d394 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-html
PORTVERSION= 0.9.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Blazingly fast HTML combinator library for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10
+USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 9731ed79fbe9..4be6ab040009 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.8.0.0
-PORTREVISION= 1
+PORTVERSION= 0.8.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Blazingly fast markup combinator library for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 text>=0.10
+USE_CABAL= blaze-builder>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index 916db7997dbb..c4ac9329c379 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624825
-SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f
-SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054
+TIMESTAMP = 1523696236
+SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146
+SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 8a693213ce59..a22dcb9f2659 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 8cdbdb9784ef..ef4392928060 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.2.0.10
-PORTREVISION= 1
+PORTVERSION= 1.2.0.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Case-insensitive string comparison
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.0 text>=0.3
+USE_CABAL= hashable>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 98fbd8a51042..008d7b75f2e5 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499445486
-SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c
-SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630
+TIMESTAMP = 1523428332
+SHA256 (cabal/case-insensitive-1.2.0.11.tar.gz) = a7ce6d17e50caaa0f19ad8e67361499022860554c521b1e57993759da3eb37e3
+SIZE (cabal/case-insensitive-1.2.0.11.tar.gz) = 53581
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
index 0de035ad56fa..2655670f293c 100644
--- a/textproc/hs-cassava/Makefile
+++ b/textproc/hs-cassava/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cassava
-PORTVERSION= 0.5.0.0
-PORTREVISION= 1
+PORTVERSION= 0.5.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= CSV parsing and encoding library
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec blaze-builder hashable Only text text-short \
+USE_CABAL= attoparsec blaze-builder hashable Only text-short \
unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo
index 52788632d2dc..ed05e311c6c7 100644
--- a/textproc/hs-cassava/distinfo
+++ b/textproc/hs-cassava/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538420
-SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9
-SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476
+TIMESTAMP = 1524429884
+SHA256 (cabal/cassava-0.5.1.0.tar.gz) = 762c8aaea2cdad61f52bad1b9f1f3b32764b4b6da03371aba6e5017f69614277
+SIZE (cabal/cassava-0.5.1.0.tar.gz) = 37603
diff --git a/textproc/hs-cmark-gfm/Makefile b/textproc/hs-cmark-gfm/Makefile
new file mode 100644
index 000000000000..13b6c63d3095
--- /dev/null
+++ b/textproc/hs-cmark-gfm/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= cmark-gfm
+PORTVERSION= 0.1.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast, accurate GitHub Flavored Markdown parser and renderer
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-cmark-gfm/distinfo b/textproc/hs-cmark-gfm/distinfo
new file mode 100644
index 000000000000..6990da174bc6
--- /dev/null
+++ b/textproc/hs-cmark-gfm/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524942342
+SHA256 (cabal/cmark-gfm-0.1.3.tar.gz) = 731cb392e4edfd18d0dae709904791610588e6770934e5112cbdd5e6f3d271ba
+SIZE (cabal/cmark-gfm-0.1.3.tar.gz) = 198348
diff --git a/textproc/hs-cmark-gfm/pkg-descr b/textproc/hs-cmark-gfm/pkg-descr
new file mode 100644
index 000000000000..f97d0a0a426e
--- /dev/null
+++ b/textproc/hs-cmark-gfm/pkg-descr
@@ -0,0 +1,6 @@
+This package provides Haskell bindings for libcmark-gfm, the reference parser
+for GitHub Flavored Markdown, a fully specified variant of Markdown. It
+includes sources for libcmark-gfm (0.28.0) and does not require prior
+installation of the C library.
+
+WWW: https://github.com/kivikakk/cmark-gfm-hs
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
index 05a3857ef691..1f1e39068edf 100644
--- a/textproc/hs-cmark/Makefile
+++ b/textproc/hs-cmark/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmark
-PORTVERSION= 0.5.5.1
-PORTREVISION= 1
+PORTVERSION= 0.5.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Fast, accurate CommonMark (Markdown) parser and renderer
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=1.0
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo
index 0315db4a3824..8f26ebf8bb96 100644
--- a/textproc/hs-cmark/distinfo
+++ b/textproc/hs-cmark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499448212
-SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d
-SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811
+TIMESTAMP = 1523465640
+SHA256 (cabal/cmark-0.5.6.tar.gz) = 855c4b7aca6d4e9eb076beb6cc6f74e7578fae7aa3625fd3fca5e3b4901a32b0
+SIZE (cabal/cmark-0.5.6.tar.gz) = 170850
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index f3ef566e265f..866171f80703 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= CSV library for Haskell
LICENSE= MIT
-USE_CABAL= parsec
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile
index d7a40137abb1..9f2764e8d329 100644
--- a/textproc/hs-doctemplates/Makefile
+++ b/textproc/hs-doctemplates/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= doctemplates
-PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTVERSION= 0.2.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= The doctemplates package
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \
- unordered-containers vector
+USE_CABAL= aeson blaze-html blaze-markup scientific unordered-containers \
+ vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-doctemplates/distinfo b/textproc/hs-doctemplates/distinfo
index 887a63e2ac97..203b2710ffb8 100644
--- a/textproc/hs-doctemplates/distinfo
+++ b/textproc/hs-doctemplates/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499720884
-SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b
-SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924
+TIMESTAMP = 1524418494
+SHA256 (cabal/doctemplates-0.2.2.1.tar.gz) = 6b0cfb565fc7fa90d71ac56b83aedecf670678e6f1441278877fbf399e9bccbf
+SIZE (cabal/doctemplates-0.2.2.1.tar.gz) = 6139
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 37088bf84848..dcb4c21bdcb6 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= double-conversion
PORTVERSION= 2.0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +10,5 @@ COMMENT= Fast conversion between double-precision floating-point and text
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.0.8
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-
-.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal
-.endif
-
.include <bsd.port.mk>
diff --git a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
deleted file mode 100644
index f194f16d456b..000000000000
--- a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC
-+++ double-conversion.cabal
-@@ -71,7 +71,8 @@ library
- double-conversion/src/fixed-dtoa.cc
- double-conversion/src/strtod.cc
-
-- extra-libraries: stdc++
-+ cc-options: -std=c++11 -stdlib=libc++
-+ extra-libraries: cxxrt gcc_s
-
- include-dirs:
- double-conversion/src
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index a342f5c25ecf..68dedb8f8576 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.12.0
-PORTREVISION= 1
+PORTVERSION= 1.0.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,9 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
LICENSE= BSD3CLAUSE
-USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \
- utf8-string xml>=1.2.6
+USE_CABAL= base-compat old-locale>=1.0 old-time>=1 safe \
+ time-locale-compat>=0.1 utf8-string xml>=1.2.6 xml-conduit \
+ xml-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 2925abf966f1..c1b4874b42f4 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538656
-SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942
-SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415
+TIMESTAMP = 1523695585
+SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17
+SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936
diff --git a/textproc/hs-feed/files/patch-feed.cabal b/textproc/hs-feed/files/patch-feed.cabal
new file mode 100644
index 000000000000..981e7de9fb21
--- /dev/null
+++ b/textproc/hs-feed/files/patch-feed.cabal
@@ -0,0 +1,31 @@
+--- feed.cabal.orig 2017-08-26 23:55:46 UTC
++++ feed.cabal
+@@ -71,8 +71,8 @@ library
+ Data.Text.Util
+ Data.XML.Compat
+ build-depends:
+- base >= 4 && < 4.11
+- , base-compat == 0.9.*
++ base >= 4 && < 4.12
++ , base-compat == 0.10.*
+ , bytestring >= 0.9 && < 0.11
+ , old-locale == 1.0.*
+ , old-time >= 1 && < 1.2
+@@ -82,7 +82,7 @@ library
+ , time-locale-compat == 0.1.*
+ , utf8-string < 1.1
+ , xml-types >= 0.3.6 && < 0.4
+- , xml-conduit >= 1.3 && < 1.6
++ , xml-conduit >= 1.3 && < 1.9
+
+ test-suite tests
+ ghc-options: -Wall
+@@ -104,7 +104,7 @@ test-suite tests
+ build-depends:
+ base >= 4 && < 4.11
+ , HUnit >= 1.2 && < 1.7
+- , base-compat == 0.9.*
++ , base-compat == 0.10.*
+ , feed
+ , old-locale == 1.0.*
+ , old-time >= 1 && < 1.2
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 0167f8a07f6e..07adeb9cada4 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hexpat
PORTVERSION= 0.20.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libexpat.so:textproc/expat2
-USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3
+USE_CABAL= List>=0.4.2 utf8-string>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index ff271b253e4f..175435891e6c 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= highlighting-kate
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT= Syntax highlighting
LICENSE= GPLv2
-USE_CABAL= blaze-html>=0.4.2 mtl parsec \
- regex-pcre-builtin>=0.94.4.8.8.35 utf8-string
+USE_CABAL= blaze-html>=0.4.2 mtl regex-pcre-builtin>=0.94.4.8.8.35 \
+ utf8-string
FLAGS_DEFINE= EXECUTABLE
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 39694fb70d50..3133c157b20e 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 5.5
-PORTREVISION= 2
+PORTVERSION= 6.2.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 99260edc6f99..d9e6052e77b4 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624830
-SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d
-SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546
+TIMESTAMP = 1525094674
+SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630
+SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 1b1e94df7b35..b5067886da1d 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.2.1.1
-PORTREVISION= 1
+PORTVERSION= 1.3.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \
- tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3
+ tagstream-conduit>=0.5.5.3 xml-conduit>=1.3 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index de9512724c3b..310684866a3c 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624831
-SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8
-SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125
+TIMESTAMP = 1524851689
+SHA256 (cabal/html-conduit-1.3.0.tar.gz) = 78bf09e175079bdd0f0dd363b3a4b2d32d095cc09413ca9d8069bc527809ee96
+SIZE (cabal/html-conduit-1.3.0.tar.gz) = 4458
diff --git a/textproc/hs-html-conduit/files/patch-html-conduit.cabal b/textproc/hs-html-conduit/files/patch-html-conduit.cabal
deleted file mode 100644
index ae600cca1aca..000000000000
--- a/textproc/hs-html-conduit/files/patch-html-conduit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC
-+++ html-conduit.cabal
-@@ -22,7 +22,7 @@ Library
- , resourcet >= 0.3 && < 1.2
- , conduit >= 1.0 && < 1.3
- , conduit-extra >= 1.1.1
-- , xml-conduit >= 1.3 && < 1.5
-+ , xml-conduit >= 1.3 && < 1.6
- , tagstream-conduit >= 0.5.5.3 && < 0.6
- , xml-types >= 0.3 && < 0.4
-
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 2f25f70f975c..a92e4c0cbf56 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 0abd9f215dae..579f3c2aac03 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 13a374a4f486..bf5f2657842d 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions
LICENSE= MIT
-USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10
+USE_CABAL= hxt-charproperties>=9.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 87fa86675906..69e09e587c5a 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index ab89a5c3dfba..a59a01ae2f94 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,7 @@ COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \
- hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \
- parsec>=2.1
+ hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 7534d3fbfddb..e914e554a3ee 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lhs2tex
-PORTVERSION= 1.19
-PORTREVISION= 2
+PORTVERSION= 1.20
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index a9984180aefe..5a6272025550 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624833
-SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e
-SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353
+TIMESTAMP = 1524639224
+SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a
+SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326
diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs
index df80ba1420b5..09f425ff12ff 100644
--- a/textproc/hs-lhs2tex/files/patch-Setup.hs
+++ b/textproc/hs-lhs2tex/files/patch-Setup.hs
@@ -1,6 +1,6 @@
---- Setup.hs.orig 2012-09-08 22:29:52.000000000 +0100
-+++ Setup.hs 2013-12-08 15:55:17.403235103 +0000
-@@ -205,7 +205,7 @@
+--- Setup.hs.orig 2017-09-29 08:44:16 UTC
++++ Setup.hs
+@@ -210,7 +210,7 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer
else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
let manDir = if isWindows
then dataPref `joinFileName` "Documentation"
@@ -9,7 +9,7 @@
createDirectoryIfMissing True docDir
installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
when (not isWindows) $
-@@ -213,7 +213,8 @@
+@@ -218,7 +218,8 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer
installOrdinaryFile v ("lhs2TeX.1") (manDir `joinFileName` "lhs2TeX.1")
-- polytable
case (installPolyTable ebi) of
diff --git a/textproc/hs-lhs2tex/files/patch-src_Document.lhs b/textproc/hs-lhs2tex/files/patch-src_Document.lhs
new file mode 100644
index 000000000000..fdbeead0aa32
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_Document.lhs
@@ -0,0 +1,10 @@
+--- src/Document.lhs.orig 2018-04-25 07:05:53 UTC
++++ src/Document.lhs
+@@ -9,6 +9,7 @@
+
+ %endif
+
++> import Prelude hiding ((<>))
+ > infixr 5 {-"\enskip"-} <> -- same fixity as `|++|'
+
+ The pretty printer generate documents of type |Doc|.
diff --git a/textproc/hs-lhs2tex/files/patch-src_Main.lhs b/textproc/hs-lhs2tex/files/patch-src_Main.lhs
new file mode 100644
index 000000000000..dcc2df875b0f
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_Main.lhs
@@ -0,0 +1,11 @@
+--- src/Main.lhs.orig 2018-04-25 07:41:09 UTC
++++ src/Main.lhs
+@@ -21,7 +21,7 @@
+ > import Control.Monad.Error
+ > import Control.Monad.State ( MonadState(..), modify )
+ > import Control.Monad.Trans
+-> import Prelude hiding ( getContents )
++> import Prelude hiding ( getContents, (<>) )
+ >
+ > import Version
+ > import TeXCommands
diff --git a/textproc/hs-lhs2tex/files/patch-src_Math.lhs b/textproc/hs-lhs2tex/files/patch-src_Math.lhs
new file mode 100644
index 000000000000..942016c7ab32
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_Math.lhs
@@ -0,0 +1,11 @@
+--- src/Math.lhs.orig 2018-04-25 07:40:44 UTC
++++ src/Math.lhs
+@@ -7,7 +7,7 @@
+ > module Math ( module Math, substitute, number )
+ > where
+ >
+-> import Prelude hiding ( lines )
++> import Prelude hiding ( lines, (<>) )
+ > import Data.List ( partition )
+ > import Numeric ( showFFloat )
+ > import Control.Applicative ( many )
diff --git a/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs
new file mode 100644
index 000000000000..21728d3ffa0e
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs
@@ -0,0 +1,11 @@
+--- src/MathPoly.lhs.orig 2018-04-25 07:08:26 UTC
++++ src/MathPoly.lhs
+@@ -13,7 +13,7 @@ are subtle differences, and they will grow over time \
+ > module MathPoly ( module MathPoly, substitute, number )
+ > where
+ >
+-> import Prelude hiding ( lines )
++> import Prelude hiding ( lines, (<>) )
+ > import Data.List ( partition, nub, insert, sort, transpose )
+ > import Numeric ( showFFloat )
+ > import Control.Applicative ( many )
diff --git a/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs
new file mode 100644
index 000000000000..f9f22a8c93a4
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs
@@ -0,0 +1,10 @@
+--- src/NewCode.lhs.orig 2018-04-25 07:08:55 UTC
++++ src/NewCode.lhs
+@@ -13,6 +13,7 @@ way that is compatible with the @poly@ or @math@ forma
+ > module NewCode ( module NewCode )
+ > where
+ >
++> import Prelude hiding ((<>))
+ > import Control.Monad ( (>=>) )
+ > import Data.List ( partition )
+ >
diff --git a/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs
new file mode 100644
index 000000000000..3b8ca4785939
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs
@@ -0,0 +1,10 @@
+--- src/Typewriter.lhs.orig 2018-04-25 07:07:53 UTC
++++ src/Typewriter.lhs
+@@ -7,6 +7,7 @@
+ > module Typewriter ( module Typewriter )
+ > where
+ >
++> import Prelude hiding ((<>))
+ > import Control.Monad
+ >
+ > import Verbatim ( trim, expand )
diff --git a/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs
new file mode 100644
index 000000000000..c7130dd0541c
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs
@@ -0,0 +1,10 @@
+--- src/Verbatim.lhs.orig 2018-04-25 07:07:15 UTC
++++ src/Verbatim.lhs
+@@ -7,6 +7,7 @@
+ > module Verbatim ( module Verbatim )
+ > where
+ >
++> import Prelude hiding ((<>))
+ > import Control.Arrow ( (>>>) )
+ > import Data.Char
+ > import Data.List ( intersperse )
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index 68671888e58d..a012c777fe07 100644
--- a/textproc/hs-libxml-sax/Makefile
+++ b/textproc/hs-libxml-sax/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml-sax
PORTVERSION= 0.7.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Bindings for the libXML2 SAX interface
LICENSE= MIT
-USE_CABAL= text>=0.7 xml-types>=0.3
+USE_CABAL= xml-types>=0.3
USES= pkgconfig
LIB_DEPENDS= libxml2.so:textproc/libxml2
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 7999c680c263..92f3ac64544b 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile
index 70fe0da1df84..5b0a32eaeab6 100644
--- a/textproc/hs-magic/Makefile
+++ b/textproc/hs-magic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= magic
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
index 84ee9bd8791f..ba9ef140cf46 100644
--- a/textproc/hs-pandoc-citeproc/Makefile
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-citeproc
-PORTVERSION= 0.10.5.1
-PORTREVISION= 1
+PORTVERSION= 0.14.3.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Supports using pandoc with citeproc
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \
- mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \
- setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \
+ mtl pandoc>=1.13 pandoc-types>=1.12.3 rfc5051 \
+ setenv>=0.1 split syb tagsoup vector xml-conduit>=1.2 \
yaml>=0.8.8.7
EXECUTABLE= pandoc-citeproc
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
index 83916a3d8e09..d9f8e7435e12 100644
--- a/textproc/hs-pandoc-citeproc/distinfo
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624836
-SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783
-SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993
+TIMESTAMP = 1525014746
+SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a
+SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846
diff --git a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
deleted file mode 100644
index 26a28052b0e3..000000000000
--- a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
+++ /dev/null
@@ -1,38 +0,0 @@
---- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC
-+++ pandoc-citeproc.cabal
-@@ -99,7 +99,7 @@ library
- ghc-prof-options: -fprof-auto-exported
- build-depends: containers, directory, mtl,
- bytestring, filepath,
-- pandoc-types >= 1.16 && < 1.18,
-+ pandoc-types >= 1.16 && < 1.20,
- pandoc >= 1.16 && < 2.1,
- tagsoup,
- aeson >= 0.7 && < 1.3,
-@@ -146,7 +146,7 @@ executable pandoc-citeproc
- ghc-options: -funbox-strict-fields -Wall
- ghc-prof-options: -fprof-auto-exported -rtsopts
- build-depends: base >= 4, pandoc-citeproc,
-- pandoc-types >= 1.16 && < 1.18,
-+ pandoc-types >= 1.16 && < 1.20,
- pandoc >= 1.16 && < 2.1,
- aeson,
- aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text,
-@@ -169,7 +169,7 @@ executable test-citeproc
- else
- Buildable: False
- build-depends: base >= 4, aeson, directory, text, mtl,
-- pandoc-types >= 1.16 && < 1.18,
-+ pandoc-types >= 1.16 && < 1.20,
- pandoc >= 1.16 && < 2.1,
- filepath,
- bytestring, pandoc-citeproc, process, temporary >= 1.1,
-@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc
- Prelude
- Hs-Source-Dirs: tests, prelude, compat
- build-depends: base >= 4, aeson, directory, text,
-- pandoc-types >= 1.16 && < 1.18, mtl,
-+ pandoc-types >= 1.16 && < 1.20, mtl,
- pandoc >= 1.16 && < 2.1, filepath,
- bytestring, pandoc-citeproc, process, temporary >= 1.1,
- yaml >= 0.8.8.7
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index f770364de835..606e3809647b 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.19
-PORTREVISION= 1
+PORTVERSION= 1.17.4.2
+PORTEPOCH= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 76620ce18f88..0515e7419fe4 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543994
-SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf
-SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942
+TIMESTAMP = 1524405363
+SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca
+SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035
diff --git a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
deleted file mode 100644
index e8741ae401d4..000000000000
--- a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
+++ /dev/null
@@ -1,24 +0,0 @@
---- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC
-+++ pandoc-types.cabal
-@@ -48,10 +48,10 @@ Library
- Other-modules: Paths_pandoc_types
- Build-depends: base >= 4 && < 5,
- containers >= 0.3,
-- syb >= 0.1 && < 0.7,
-+ syb >= 0.1 && < 0.8,
- ghc-prim >= 0.2,
- bytestring >= 0.9 && < 0.11,
-- aeson >= 0.6.2 && < 1.2,
-+ aeson >= 0.6.2 && < 1.3,
- QuickCheck >= 2
- if impl(ghc < 7.10)
- Build-depends: deepseq-generics >= 0.1 && < 0.2
-@@ -65,7 +65,7 @@ test-suite test-pandoc-types
- build-depends: base,
- pandoc-types,
- syb,
-- aeson >= 0.6.2 && < 1.2,
-+ aeson >= 0.6.2 && < 1.3,
- containers >= 0.3,
- bytestring >= 0.9 && < 0.11,
- test-framework >= 0.3 && < 0.9,
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7e7b890e4d93..73481fb95230 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.19.2.1
-PORTREVISION= 1
+PORTVERSION= 2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,14 +10,14 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= aeson base64-bytestring blaze-html \
- blaze-markup cmark data-default \
+USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \
+ blaze-markup cmark cmark-gfm data-default \
deepseq-generics doctemplates extensible-exceptions \
- filemanip haddock-library highlighting-kate \
- hslua HTTP JuicyPixels mtl \
- network network-uri pandoc-types parsec \
+ filemanip haddock-library \
+ hslua hslua-module-text HTTP JuicyPixels mtl \
+ network network-uri pandoc-types \
random scientific SHA skylighting syb tagsoup\
- temporary texmath text \
+ temporary texmath \
unordered-containers vector xml \
yaml zip-archive zlib
@@ -49,7 +48,7 @@ HTTPS_FLAG_CABAL= http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8
TRYPANDOC_DESC= Build trypandoc cgi executable
TRYPANDOC_FLAG_ENABLE= trypandoc
-TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \
+TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 \
http-types
TRYPANDOC_FLAG_EXECUTABLE= trypandoc
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 5f38ab8379a5..8ed8d343faca 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624835
-SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801
-SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101
+TIMESTAMP = 1524940319
+SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569
+SIZE (cabal/pandoc-2.2.tar.gz) = 8995928
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
deleted file mode 100644
index 07d92a10932a..000000000000
--- a/textproc/hs-pandoc/files/patch-pandoc.cabal
+++ /dev/null
@@ -1,83 +0,0 @@
---- pandoc.cabal.orig 2017-01-31 15:02:20 UTC
-+++ pandoc.cabal
-@@ -253,7 +253,7 @@ Flag old-locale
-
- Library
- Build-Depends: base >= 4.7 && <5,
-- syb >= 0.1 && < 0.7,
-+ syb >= 0.1 && < 0.8,
- containers >= 0.1 && < 0.6,
- unordered-containers >= 0.2 && < 0.3,
- array >= 0.3 && < 0.6,
-@@ -270,12 +270,12 @@ Library
- xml >= 1.3.12 && < 1.4,
- random >= 1 && < 1.2,
- extensible-exceptions >= 0.1 && < 0.2,
-- pandoc-types >= 1.17 && < 1.18,
-- aeson >= 0.7 && < 1.2,
-+ pandoc-types >= 1.17 && < 1.20,
-+ aeson >= 0.7 && < 1.3,
- tagsoup >= 0.13.7 && < 0.15,
- base64-bytestring >= 0.1 && < 1.1,
- zlib >= 0.5 && < 0.7,
-- skylighting >= 0.1.1.4 && < 0.2,
-+ skylighting >= 0.1.1.4 && < 0.4,
- data-default >= 0.4 && < 0.8,
- temporary >= 1.1 && < 1.3,
- blaze-html >= 0.5 && < 0.10,
-@@ -283,7 +283,7 @@ Library
- yaml >= 0.8.8.2 && < 0.9,
- scientific >= 0.2 && < 0.4,
- vector >= 0.10 && < 0.13,
-- hslua >= 0.3 && < 0.5,
-+ hslua >= 0.3 && < 0.6,
- binary >= 0.5 && < 0.9,
- SHA >= 1.6 && < 1.7,
- haddock-library >= 1.1 && < 1.5,
-@@ -424,15 +424,15 @@ Library
-
- Executable pandoc
- Build-Depends: pandoc,
-- pandoc-types >= 1.17 && < 1.18,
-+ pandoc-types >= 1.17 && < 1.20,
- base >= 4.2 && <5,
- directory >= 1.2 && < 1.4,
- filepath >= 1.1 && < 1.5,
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
- extensible-exceptions >= 0.1 && < 0.2,
-- skylighting >= 0.1.1.3 && < 0.2,
-- aeson >= 0.7.0.5 && < 1.2,
-+ skylighting >= 0.1.1.3 && < 0.4,
-+ aeson >= 0.7.0.5 && < 1.3,
- yaml >= 0.8.8.2 && < 0.9,
- containers >= 0.1 && < 0.6,
- HTTP >= 4000.0.5 && < 4000.4
-@@ -498,15 +498,15 @@ Test-Suite test-pandoc
- Hs-Source-Dirs: prelude
- Other-Modules: Prelude
- Build-Depends: base >= 4.2 && < 5,
-- syb >= 0.1 && < 0.7,
-+ syb >= 0.1 && < 0.8,
- pandoc,
-- pandoc-types >= 1.17 && < 1.18,
-+ pandoc-types >= 1.17 && < 1.20,
- bytestring >= 0.9 && < 0.11,
- text >= 0.11 && < 1.3,
- directory >= 1 && < 1.4,
- filepath >= 1.1 && < 1.5,
- process >= 1 && < 1.5,
-- skylighting >= 0.1.1.3 && < 0.2,
-+ skylighting >= 0.1.1.3 && < 0.4,
- Diff >= 0.2 && < 0.4,
- test-framework >= 0.3 && < 0.9,
- test-framework-hunit >= 0.2 && < 0.4,
-@@ -553,7 +553,7 @@ benchmark benchmark-pandoc
- Other-Modules: Prelude
- Build-Depends: pandoc,
- base >= 4.2 && < 5,
-- syb >= 0.1 && < 0.7,
-+ syb >= 0.1 && < 0.8,
- criterion >= 1.0 && < 1.2
- Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
- Default-Language: Haskell98
diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
deleted file mode 100644
index 648d7ffa890d..000000000000
--- a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC
-+++ src/Text/Pandoc/Writers/Custom.hs
-@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do
- setForeignEncoding utf8
- lua <- Lua.newstate
- Lua.openlibs lua
-+#if MIN_VERSION_hslua(0,5,0)
-+ status <- Lua.loadstring lua luaScript
-+#else
- status <- Lua.loadstring lua luaScript luaFile
-+#endif
- -- check for error in lua script (later we'll change the return type
- -- to handle this more gracefully):
- when (status /= 0) $
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
deleted file mode 100644
index 53ec58aa1cb3..000000000000
--- a/textproc/hs-parsec/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1499618976
-SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e
-SIZE (cabal/parsec-3.1.11.tar.gz) = 32412
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
deleted file mode 100644
index cb0f23454412..000000000000
--- a/textproc/hs-parsec/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Parsec is designed from scratch as an industrial-strength parser
-library. It is simple, safe, well documented (on the package homepage),
-has extensive libraries and good error messages, and is also fast. It
-is defined as a monad transformer that can be stacked on arbitrary
-monads, and it is also parametric in the input stream type.
-
-WWW: https://github.com/aslatter/parsec
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 348c87c81e22..2fe6967856d9 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= polyparse
PORTVERSION= 1.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Variety of alternative parser combinator libraries
LICENSE= LGPL21
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile
index c0c9fd40bcc0..fc4aca9b2546 100644
--- a/textproc/hs-pretty-show/Makefile
+++ b/textproc/hs-pretty-show/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pretty-show
-PORTVERSION= 1.6.13
-PORTREVISION= 1
+PORTVERSION= 1.7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pretty-show/distinfo b/textproc/hs-pretty-show/distinfo
index 2dc39c2a8127..c5a7d6e05e9a 100644
--- a/textproc/hs-pretty-show/distinfo
+++ b/textproc/hs-pretty-show/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499720300
-SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd
-SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057
+TIMESTAMP = 1523448613
+SHA256 (cabal/pretty-show-1.7.tar.gz) = 382b6ef4a78e4059611b5c86674ad72a6bfce821e8852da4f00b628cfbbc272f
+SIZE (cabal/pretty-show-1.7.tar.gz) = 135621
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
index a2b3a73d09ec..f0d1e11e64e3 100644
--- a/textproc/hs-regex-applicative/Makefile
+++ b/textproc/hs-regex-applicative/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-applicative
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 80ff3d9612aa..5ef5eaeddb79 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
index 233c96e65e54..09bda2db8e60 100644
--- a/textproc/hs-regex-compat-tdfa/Makefile
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat-tdfa
PORTVERSION= 0.95.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index b08ca00799ec..9cbed60ea6ca 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 18c04e526c00..bba3c39cf15b 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.8.8.35
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile
index 63e98b936964..e28e263be526 100644
--- a/textproc/hs-regex-pcre/Makefile
+++ b/textproc/hs-regex-pcre/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre
PORTVERSION= 0.94.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 9785b6df46ba..81f259744f84 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index 22fd0301a58d..c6a9bfa8904c 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTVERSION= 1.2.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl parsec regex-base>=0.93.1
+USE_CABAL= mtl regex-base>=0.93.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 7d1d6321a459..81eec5bfb16b 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624838
-SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39
-SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969
+TIMESTAMP = 1523955154
+SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9
+SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
index 4f6d0b5ef83e..72c06daca208 100644
--- a/textproc/hs-rfc5051/Makefile
+++ b/textproc/hs-rfc5051/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rfc5051
PORTVERSION= 0.1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile
index c070c0c641f5..d5476064cc95 100644
--- a/textproc/hs-scanner/Makefile
+++ b/textproc/hs-scanner/Makefile
@@ -2,7 +2,7 @@
PORTNAME= scanner
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-skylighting-core/Makefile b/textproc/hs-skylighting-core/Makefile
new file mode 100644
index 000000000000..7bc959ab065c
--- /dev/null
+++ b/textproc/hs-skylighting-core/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= skylighting-core
+PORTVERSION= 0.7.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Syntax highlighting library with support for over one hundred languages
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html case-insensitive colour hxt mtl \
+ pretty-show regex-pcre regex-pcre-builtin safe utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-skylighting-core/distinfo b/textproc/hs-skylighting-core/distinfo
new file mode 100644
index 000000000000..667b1ae4b182
--- /dev/null
+++ b/textproc/hs-skylighting-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524848800
+SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e
+SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965
diff --git a/textproc/hs-skylighting-core/pkg-descr b/textproc/hs-skylighting-core/pkg-descr
new file mode 100644
index 000000000000..1af3090ca07f
--- /dev/null
+++ b/textproc/hs-skylighting-core/pkg-descr
@@ -0,0 +1,7 @@
+Skylighting is a syntax highlighting library with support for over one hundred
+languages. It derives its tokenizers from XML syntax definitions used by KDE's
+KSyntaxHighlighting framework, so any syntax supported by that framework can be
+added. An optional command-line program is provided. Skylighting is intended to
+be the successor to highlighting-kate.
+
+WWW: http://hackage.haskell.org/package/skylighting
diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile
index fe5a47aa3eba..5614321c509d 100644
--- a/textproc/hs-skylighting/Makefile
+++ b/textproc/hs-skylighting/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= skylighting
-PORTVERSION= 0.3.3.1
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Syntax highlighting library with support for over one hundred languages
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \
- pretty-show regex-pcre regex-pcre-builtin safe text utf8-string
+USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html \
+ case-insensitive colour hxt mtl pretty-show regex-pcre \
+ regex-pcre-builtin safe skylighting-core utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo
index 59a31d6dcf35..be12b27301af 100644
--- a/textproc/hs-skylighting/distinfo
+++ b/textproc/hs-skylighting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499717353
-SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57
-SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631
+TIMESTAMP = 1524846475
+SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574
+SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 5079e11069fd..41bb6e06b85d 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a1e655c2eb8b..562476c669be 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.14.1
-PORTREVISION= 1
+PORTVERSION= 0.14.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,6 @@ COMMENT= Parsing and extracting information from HTML/XML documents
LICENSE= BSD3CLAUSE
-USE_CABAL= text
-
FLAGS_DEFINE= DOWNLOAD
DOWNLOAD_DESC= Build with Download module
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 653cf16d5021..4a5409291a27 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624839
-SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb
-SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031
+TIMESTAMP = 1523444247
+SHA256 (cabal/tagsoup-0.14.6.tar.gz) = 4b4ed4db1428e859389d628dd5755074f659a424ec49934ec53e44b0fc6a63fb
+SIZE (cabal/tagsoup-0.14.6.tar.gz) = 43982
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index e35ea9d9bd8a..74c1324736ce 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Streamlined HTML tag parser
LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \
- conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \
+ conduit-extra>=1.1.0 data-default>=0.5.0 resourcet \
xml-conduit>=1.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index ced97a4f3be3..da4ddc367fb9 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.9.4.1
-PORTREVISION= 1
+PORTVERSION= 0.10.1.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Conversion between formats used to represent mathematics
LICENSE= GPLv2
-USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \
- syb text xml
+USE_CABAL= aeson mtl network network-uri pandoc-types split syb xml
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= executable
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index d300fd4ee54b..4aacb04c0c4b 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624840
-SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04
-SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730
+TIMESTAMP = 1524845873
+SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821
+SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634
diff --git a/textproc/hs-texmath/files/patch-texmath.cabal b/textproc/hs-texmath/files/patch-texmath.cabal
deleted file mode 100644
index f1f846076b26..000000000000
--- a/textproc/hs-texmath/files/patch-texmath.cabal
+++ /dev/null
@@ -1,20 +0,0 @@
---- texmath.cabal.orig 2017-07-10 15:55:23 UTC
-+++ texmath.cabal
-@@ -87,7 +87,7 @@ Flag network-uri
-
- Library
- Build-depends: xml, parsec >= 3, containers,
-- pandoc-types >= 1.12.3.3 && < 1.18, mtl
-+ pandoc-types >= 1.12.3.3 , mtl
- if impl(ghc >= 6.10)
- Build-depends: base >= 4.5 && < 5, syb
- else
-@@ -141,7 +141,7 @@ Executable texmath
- if flag(executable)
- Buildable: True
- Build-Depends: base >= 4.5 && < 5, texmath, xml,
-- pandoc-types >= 1.12.3.3 && < 1.18,
-+ pandoc-types >= 1.12.3.3 ,
- split, aeson, bytestring, text
- else
- Buildable: False
diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile
index a0da6bf48e64..5cb5141f869d 100644
--- a/textproc/hs-uri-bytestring-aeson/Makefile
+++ b/textproc/hs-uri-bytestring-aeson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uri-bytestring-aeson
-PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= The uri-bytestring-aeson package
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson text uri-bytestring
+USE_CABAL= aeson uri-bytestring
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo
index 43e2944dbb99..f7346fcf4d6b 100644
--- a/textproc/hs-uri-bytestring-aeson/distinfo
+++ b/textproc/hs-uri-bytestring-aeson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499703625
-SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe
-SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987
+TIMESTAMP = 1525011968
+SHA256 (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = d8bd5f0772e8f45a7530b8b4422102ab24a896ac75611a3c36a02a56dffcef0a
+SIZE (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = 2003
diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile
index c195c20dbf1a..6414880d051e 100644
--- a/textproc/hs-uri-bytestring/Makefile
+++ b/textproc/hs-uri-bytestring/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uri-bytestring
-PORTVERSION= 0.2.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo
index 71f3e2baf1f5..d057dc82b946 100644
--- a/textproc/hs-uri-bytestring/distinfo
+++ b/textproc/hs-uri-bytestring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499621831
-SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14
-SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514
+TIMESTAMP = 1524253203
+SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb
+SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241
diff --git a/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal
new file mode 100644
index 000000000000..2f8bf5512c2f
--- /dev/null
+++ b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal
@@ -0,0 +1,10 @@
+--- uri-bytestring.cabal.orig 2018-04-20 19:43:36 UTC
++++ uri-bytestring.cabal
+@@ -41,7 +41,6 @@ library
+
+ attoparsec >= 0.13.1.0 && < 0.14
+ , base >= 4.6 && < 5
+- , fail >= 4.9 && < 5
+ , bytestring >= 0.9.1 && < 0.11
+ , blaze-builder >= 0.3.0.0 && < 0.5
+ , template-haskell >= 2.9 && < 2.14
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-uri-encode/Makefile
index b37f1598ec83..d315090cbd4f 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-uri-encode/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
-PORTNAME= parsec
-PORTVERSION= 3.1.11
-PORTREVISION= 1
+PORTNAME= uri-encode
+PORTVERSION= 1.5.0.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monadic parser combinators
+COMMENT= URI encoding library
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl text>=0.2
+USE_CABAL= network-uri utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-uri-encode/distinfo b/textproc/hs-uri-encode/distinfo
new file mode 100644
index 000000000000..4212e969e867
--- /dev/null
+++ b/textproc/hs-uri-encode/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1524855375
+SHA256 (cabal/uri-encode-1.5.0.5.tar.gz) = e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186
+SIZE (cabal/uri-encode-1.5.0.5.tar.gz) = 3447
diff --git a/textproc/hs-uri-encode/pkg-descr b/textproc/hs-uri-encode/pkg-descr
new file mode 100644
index 000000000000..c31db48b1905
--- /dev/null
+++ b/textproc/hs-uri-encode/pkg-descr
@@ -0,0 +1,3 @@
+Unicode aware uri-encoding.
+
+WWW: https://github.com/silkapp/uri-encode
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index ebf1fb8c67ee..095269b83600 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uri
PORTVERSION= 0.1.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Library for working with URIs
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=3.0 safe utf8-string
+USE_CABAL= safe utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index cb31e113178c..bc76287d5ca7 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \
blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \
data-default monad-control>=0.3 resourcet>=0.3 \
- text>=0.7 xml-types>=0.3.4
+ xml-types>=0.3.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 0474c080371d..da5da32152d2 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499546442
-SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734
-SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603
+TIMESTAMP = 1523899098
+SHA256 (cabal/xml-conduit-1.8.0.tar.gz) = 0382bfd3627be4970b11228948274faef51ca9a2590a7723b5787a7205a52036
+SIZE (cabal/xml-conduit-1.8.0.tar.gz) = 39469
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index 39de69f686fa..c5c45d6d0c97 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-hamlet
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Hamlet-style quasiquoter for XML content
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0
+USE_CABAL= shakespeare>=1.0 xml-conduit>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
index 6d415afdc903..5e91648bb30c 100644
--- a/textproc/hs-xml-hamlet/distinfo
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624842
-SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb
-SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149
+TIMESTAMP = 1524849871
+SHA256 (cabal/xml-hamlet-0.5.0.tar.gz) = 7bcec0aad83e72c2870efd3327553b3d78f6332cf01c12ad4b67c02f499015a3
+SIZE (cabal/xml-hamlet-0.5.0.tar.gz) = 9189
diff --git a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
deleted file mode 100644
index 019f91570df9..000000000000
--- a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC
-+++ xml-hamlet.cabal
-@@ -19,7 +19,7 @@ Library
-
- Build-depends: base >= 4 && < 5
- , shakespeare >= 1.0 && < 2.2
-- , xml-conduit >= 1.0 && < 1.5
-+ , xml-conduit >= 1.0 && < 1.6
- , text >= 0.10
- , template-haskell
- , parsec >= 2.0 && < 3.2
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index fbb26cc16989..4fe4b67b4179 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xml-types
PORTVERSION= 0.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Basic types for representing XML
LICENSE= MIT
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 6722472f99b7..35a12316b799 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xml
PORTVERSION= 1.3.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Simple XML library for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= text
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index b9056120e31c..9bd70396b842 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTVERSION= 0.2.5.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \
- unordered-containers
+USE_CABAL= blaze-builder blaze-html blaze-markup unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index b04f611d4d0b..b159c775f81b 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624843
-SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c
-SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541
+TIMESTAMP = 1524404821
+SHA256 (cabal/xmlhtml-0.2.5.2.tar.gz) = 64818617644bfc7c3c9fe561435af9929ef60310627b0796c78b4b99240b5bdc
+SIZE (cabal/xmlhtml-0.2.5.2.tar.gz) = 123829
diff --git a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
deleted file mode 100644
index cd84fb74b6a7..000000000000
--- a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC
-+++ src/Text/Blaze/Renderer/XmlHtml.hs
-@@ -58,22 +58,20 @@ renderNodes = go []
- (Element (getText tag) attrs (go [] content []) :)
- go attrs (CustomParent tag content) =
- (Element (fromChoiceStringText tag) attrs (go [] content []) :)
-- go attrs (Leaf tag _ _) =
-+ go attrs (Leaf tag _ _ _) =
- (Element (getText tag) attrs [] :)
-- go attrs (CustomLeaf tag _) =
-+ go attrs (CustomLeaf tag _ _) =
- (Element (fromChoiceStringText tag) attrs [] :)
- go attrs (AddAttribute key _ value content) =
- go ((getText key, fromChoiceStringText value) : attrs) content
- go attrs (AddCustomAttribute key value content) =
- go ((fromChoiceStringText key, fromChoiceStringText value) : attrs)
- content
-- go _ (Content content) = fromChoiceString content
--#if MIN_VERSION_blaze_markup(0,6,3)
-- go _ (TBI.Comment comment) =
-+ go _ (Content content _) = fromChoiceString content
-+ go _ (TBI.Comment comment _) =
- (X.Comment (fromChoiceStringText comment) :)
--#endif
- go attrs (Append h1 h2) = go attrs h1 . go attrs h2
-- go _ Empty = id
-+ go _ (Empty _) = id
- {-# NOINLINE go #-}
- {-# INLINE renderNodes #-}
-
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
index 4a675479e68e..73eb6bd5a8d2 100644
--- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -1,15 +1,10 @@
---- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC
+--- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC
+++ xmlhtml.cabal
-@@ -820,9 +820,9 @@ Library
- Text.XmlHtml.HTML.Render
-
- Build-depends: base >= 4 && < 5,
-- blaze-builder >= 0.2 && < 0.5,
-- blaze-html >= 0.5 && < 0.9,
-- blaze-markup >= 0.5 && < 0.8,
-+ blaze-builder >= 0.2 ,
-+ blaze-html >= 0.5 ,
-+ blaze-markup >= 0.5 ,
+@@ -826,7 +826,6 @@ Library
+ blaze-html >= 0.9 && < 0.10,
+ blaze-markup >= 0.8 && < 0.9,
bytestring >= 0.9 && < 0.11,
+- bytestring-builder >= 0.10.4.0.2 && < 0.11,
containers >= 0.3 && < 0.6,
parsec >= 3.1.2 && < 3.2,
+ text >= 0.11 && < 1.3,
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index eed0d98fb747..63107efef475 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.23.1
-PORTREVISION= 1
+PORTVERSION= 0.8.29
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +10,7 @@ COMMENT= Support for parsing and rendering YAML documents
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \
- resourcet>=0.3 scientific text unordered-containers vector
-
-EXECUTABLE= json2yaml yaml2json
+ resourcet>=0.3 scientific unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index d4b4133c7d1b..6729b43625e5 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499546173
-SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b
-SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569
+TIMESTAMP = 1524402297
+SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74
+SIZE (cabal/yaml-0.8.29.tar.gz) = 82660
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index a9c599ba2c4a..16a8b62a2293 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= DAV
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
index 1602983f2b91..b7079ff0d6b7 100644
--- a/www/hs-DAV/distinfo
+++ b/www/hs-DAV/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625369
-SHA256 (cabal/DAV-1.3.1.tar.gz) = 5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009
-SIZE (cabal/DAV-1.3.1.tar.gz) = 20003
+TIMESTAMP = 1524938205
+SHA256 (cabal/DAV-1.3.2.tar.gz) = 613314357579b29e1d3fa8451b51e8b9a1307a2b33b65a3f2b2ef2bece025169
+SIZE (cabal/DAV-1.3.2.tar.gz) = 19992
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 5e82756ef2cd..3a0e98979b10 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.3.7
-PORTREVISION= 1
+PORTVERSION= 4000.3.11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Library for client-side HTTP
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \
- parsec>=2.0
+USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 0036ef459eee..3c79a7260ff7 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538127
-SHA256 (cabal/HTTP-4000.3.7.tar.gz) = d5c0cceb84e84434e851e97b3c2fce4b3e600d0410e7ac4427df44c541adeae8
-SIZE (cabal/HTTP-4000.3.7.tar.gz) = 71709
+TIMESTAMP = 1523302416
+SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645
+SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 01d054058024..c3ff4d77d56c 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= activehs-base blaze-html blaze-markup cmdargs data-pprint \
dia-base dia-functions exceptions haskell-src-exts \
highlighting-kate hint hoogle mtl pandoc pureMD5 \
QuickCheck simple-reflect snap-core snap-server split syb \
- text utf8-string
+ utf8-string
STANDALONE= yes
EXECUTABLE= activehs
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 7a41fd196fac..93d5021d6754 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \
conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \
network>=2.6 network-uri>=2.6 resourcet \
- tagstream-conduit>=0.5.5 text unordered-containers \
+ tagstream-conduit>=0.5.5 unordered-containers \
xml-conduit>=1.0
FLAGS_ENABLE= network-uri
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 6b17aafaf3bc..8f46fb0234c5 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625370
-SHA256 (cabal/authenticate-1.3.3.2.tar.gz) = a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30
-SIZE (cabal/authenticate-1.3.3.2.tar.gz) = 8785
+TIMESTAMP = 1525184608
+SHA256 (cabal/authenticate-1.3.4.tar.gz) = 3fd566dbfdf75d81ad1bebd19facb9f01509ead6e27d9aed802404ecde932fb8
+SIZE (cabal/authenticate-1.3.4.tar.gz) = 8814
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 055678dd23d6..9ff290481f9c 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cgi
PORTVERSION= 3001.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www haskell
@@ -13,7 +13,7 @@ COMMENT= Library for writing CGI programs
LICENSE= BSD3CLAUSE
USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \
- network-uri>=2.6 old-locale old-time parsec>=2.0
+ network-uri>=2.6 old-locale old-time
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= old-mtl
diff --git a/www/hs-cgi/files/patch-cgi.cabal b/www/hs-cgi/files/patch-cgi.cabal
new file mode 100644
index 000000000000..77c886321dbf
--- /dev/null
+++ b/www/hs-cgi/files/patch-cgi.cabal
@@ -0,0 +1,16 @@
+--- cgi.cabal.orig 2018-04-22 18:05:14 UTC
++++ cgi.cabal
+@@ -44,11 +44,11 @@ Library
+
+ Build-depends:
+ parsec >= 2.0 && < 3.2,
+- exceptions < 0.9,
++ exceptions < 0.11,
+ xhtml >= 3000.0.0 && < 3000.3,
+ bytestring < 0.11,
+ base >= 4.5 && < 5,
+- time >= 1.5 && < 1.7,
++ time >= 1.5 && < 1.9,
+ containers < 0.6,
+ multipart >= 0.1.2 && < 0.2
+ If flag(network-uri)
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index b514ebb45f5f..181c26a77aaa 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.2.1
-PORTREVISION= 1
+PORTVERSION= 0.4.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder data-default-class old-locale text
+USE_CABAL= blaze-builder data-default-class old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 465efe1e29dd..4a85c10ee780 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625371
-SHA256 (cabal/cookie-0.4.2.1.tar.gz) = 06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4
-SIZE (cabal/cookie-0.4.2.1.tar.gz) = 5774
+TIMESTAMP = 1523784609
+SHA256 (cabal/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3
+SIZE (cabal/cookie-0.4.4.tar.gz) = 5996
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 9bb5b6cbe5e1..0f4d8a0636f4 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= css-text
-PORTVERSION= 0.1.2.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= CSS parser and renderer
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.2.0 text>=0.11
+USE_CABAL= attoparsec>=0.10.2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo
index 237086d00b9b..383dd60ddb06 100644
--- a/www/hs-css-text/distinfo
+++ b/www/hs-css-text/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625372
-SHA256 (cabal/css-text-0.1.2.2.tar.gz) = dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987
-SIZE (cabal/css-text-0.1.2.2.tar.gz) = 4033
+TIMESTAMP = 1523784892
+SHA256 (cabal/css-text-0.1.3.0.tar.gz) = 5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a
+SIZE (cabal/css-text-0.1.3.0.tar.gz) = 4594
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 60e552333610..419f182bbf49 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index e7e2ddc4e93b..cbcd0e9a084f 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gitit
PORTVERSION= 0.12.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,12 +13,14 @@ LICENSE= GPLv2
USE_CABAL= ConfigFile HStringTemplate HTTP SHA aeson base64-bytestring \
blaze-html feed filestore happstack-server highlighting-kate \
hoauth2 hslogger http-client-tls http-conduit json mtl \
- old-locale old-time pandoc pandoc-types parsec random \
- recaptcha safe split syb tagsoup text uri url utf8-string \
+ old-locale old-time pandoc pandoc-types random \
+ recaptcha safe split syb tagsoup uri url utf8-string \
uuid xml xss-sanitize zlib
EXECUTABLE= expireGititCache gitit
+IGNORE= Doesn't build with newest packages
+
FLAGS_DEFINE= PLUGINS
FLAGS_DEFAULT= PLUGINS
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 05900bc542ac..7d197bc84861 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index ce4c70a3c013..d5406f6546b7 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.4.6.4
-PORTREVISION= 1
+PORTVERSION= 7.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,9 +11,9 @@ LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \
extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \
- mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \
- syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \
- time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib
+ mtl>=2 network>=2.6 network-uri>=2.6 semigroups sendfile>=0.7.1 \
+ syb system-filepath>=0.3.1 threads>=0.5 time-compat \
+ transformers-base>=0.4 utf8-string>=0.3.4 zlib
FLAGS_ENABLE= network-uri template_haskell
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 748b0dcb23bd..51096e975054 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538462
-SHA256 (cabal/happstack-server-7.4.6.4.tar.gz) = b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9
-SIZE (cabal/happstack-server-7.4.6.4.tar.gz) = 81123
+TIMESTAMP = 1524594391
+SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1
+SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 0b6b6b7cbc92..5e1651980ec9 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -12,5 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= happstack-server>=7.0
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 213570cd5f39..618093ccae8d 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 1.0.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson attoparsec blaze-builder blaze-html directory-tree \
dlist hashable lifted-base map-syntax monad-control mtl \
- random text transformers-base unordered-containers vector \
+ random transformers-base unordered-containers vector \
xmlhtml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 4ea7affa6dbf..58a49974dbf6 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625374
-SHA256 (cabal/heist-1.0.1.0.tar.gz) = fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb
-SIZE (cabal/heist-1.0.1.0.tar.gz) = 71050
+TIMESTAMP = 1524939588
+SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96
+SIZE (cabal/heist-1.1.tar.gz) = 71239
diff --git a/www/hs-heist/files/patch-heist.cabal b/www/hs-heist/files/patch-heist.cabal
deleted file mode 100644
index 59facc7f3c36..000000000000
--- a/www/hs-heist/files/patch-heist.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- heist.cabal.orig 2016-10-28 08:41:35 UTC
-+++ heist.cabal
-@@ -151,14 +151,14 @@ Library
- Heist.Interpreted.Internal
-
- build-depends:
-- aeson >= 0.6 && < 1.1,
-+ aeson >= 0.6 && < 1.3,
- attoparsec >= 0.10 && < 0.14,
- base >= 4 && < 5,
- blaze-builder >= 0.2 && < 0.5,
-- blaze-html >= 0.4 && < 0.9,
-+ blaze-html >= 0.4 && < 0.10,
- bytestring >= 0.9 && < 0.11,
- containers >= 0.2 && < 0.6,
-- directory >= 1.1 && < 1.3,
-+ directory >= 1.1 && < 1.4,
- directory-tree >= 0.10 && < 0.13,
- dlist >= 0.5 && < 0.9,
- filepath >= 1.3 && < 1.5,
-@@ -174,7 +174,7 @@ Library
- transformers >= 0.3 && < 0.6,
- transformers-base >= 0.4 && < 0.5,
- unordered-containers >= 0.1.4 && < 0.3,
-- vector >= 0.9 && < 0.12,
-+ vector >= 0.9 && < 0.13,
- xmlhtml >= 0.2.3.5 && < 0.3
-
- if impl(ghc >= 6.12.0)
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index b81ba2811ed4..61200a87ddc2 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hjsmin
PORTVERSION= 0.2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \
- optparse-applicative>=0.7 text>=0.8
+ optparse-applicative>=0.7
EXECUTABLE= hjsmin
diff --git a/www/hs-http-api-data/Makefile b/www/hs-http-api-data/Makefile
index 0365a209387b..99ab8a5250db 100644
--- a/www/hs-http-api-data/Makefile
+++ b/www/hs-http-api-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-api-data
-PORTVERSION= 0.3.7.1
-PORTREVISION= 1
+PORTVERSION= 0.3.8.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Convert Haskell data types to and from HTTP API data
LICENSE= GPLv3
USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \
- text time-locale-compat unordered-containers \
- uri-bytestring uuid-types
+ time-locale-compat unordered-containers uri-bytestring \
+ uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-api-data/distinfo b/www/hs-http-api-data/distinfo
index 4e253b5daa0a..f3da4d21c498 100644
--- a/www/hs-http-api-data/distinfo
+++ b/www/hs-http-api-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625375
-SHA256 (cabal/http-api-data-0.3.7.1.tar.gz) = 8c633e95113c8ab655f4ba67e51e41a2c9035f0122ea68bfbb876b37277075fd
-SIZE (cabal/http-api-data-0.3.7.1.tar.gz) = 18907
+TIMESTAMP = 1524685052
+SHA256 (cabal/http-api-data-0.3.8.1.tar.gz) = 6eeaba4b29a00407cb20b865825b17b8d884c26b09c5bbe7b6e673b4522106b3
+SIZE (cabal/http-api-data-0.3.8.1.tar.gz) = 19427
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
index 0cc953d2afa6..cce987f7f32d 100644
--- a/www/hs-http-client-tls/Makefile
+++ b/www/hs-http-client-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-client-tls
PORTVERSION= 0.3.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
index ea01c51d80b8..5ebbef5820fd 100644
--- a/www/hs-http-client/Makefile
+++ b/www/hs-http-client/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-client
-PORTVERSION= 0.5.7.0
-PORTREVISION= 1
+PORTVERSION= 0.5.12.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,8 +11,8 @@ LICENSE= MIT
USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \
cookie data-default-class exceptions>=0.4 http-types>=0.8 \
- mime-types network>=2.6 network-uri>=2.6 random \
- streaming-commons>=0.1.0.2 text>=0.11
+ memory mime-types network>=2.6 network-uri>=2.6 random \
+ streaming-commons>=0.1.0.2
FLAGS_ENABLE= network-uri
diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo
index a9aada3bf649..d9eca7ef4c2d 100644
--- a/www/hs-http-client/distinfo
+++ b/www/hs-http-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625375
-SHA256 (cabal/http-client-0.5.7.0.tar.gz) = e241eac22c55cd851de534b9d84149702a8b3990d10afc282bd6955df550ffa3
-SIZE (cabal/http-client-0.5.7.0.tar.gz) = 86010
+TIMESTAMP = 1524400718
+SHA256 (cabal/http-client-0.5.12.1.tar.gz) = 4b5116324d217f0498d258d37135a52f3e69103d3a951b0999618b263c9bd63e
+SIZE (cabal/http-client-0.5.12.1.tar.gz) = 87578
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 983b0ab68d62..0b975d9111d9 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 2.2.3.1
-PORTREVISION= 1
+PORTVERSION= 2.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index d230a1ad1f22..7d34d06f9853 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-conduit-2.2.3.1.tar.gz) = 53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e
-SIZE (cabal/http-conduit-2.2.3.1.tar.gz) = 37632
+TIMESTAMP = 1524934706
+SHA256 (cabal/http-conduit-2.3.1.tar.gz) = 8251c3f0ab2a42b998bda4aaf2805e8c3325f0084462502661ce964f671f7859
+SIZE (cabal/http-conduit-2.3.1.tar.gz) = 27332
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 9f6735017a82..d90884849a5f 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index e395021c3c16..8eb54818c091 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \
conduit-extra data-default-class http-client>=0.3 \
http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \
- network resourcet streaming-commons text>=0.11 wai>=3.0 \
+ network resourcet streaming-commons wai>=3.0 unliftio \
wai-logger word8>=0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 18972d2eda0a..27d4dd379fea 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-reverse-proxy-0.4.4.tar.gz) = 1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978
-SIZE (cabal/http-reverse-proxy-0.4.4.tar.gz) = 10394
+TIMESTAMP = 1524852143
+SHA256 (cabal/http-reverse-proxy-0.6.0.tar.gz) = fb1c913111478384c4f23647810b8c3c01c79e9276a08a1ea46215e4a42dd1a8
+SIZE (cabal/http-reverse-proxy-0.6.0.tar.gz) = 10538
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 8790ec76ed43..42728d0cd8c9 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT= Library for writing Haskell web servers
LICENSE= BSD3CLAUSE
USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \
- text>=1.0 url>=2.0 utf8-string>=0.3.4
+ url>=2.0 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 715e56934d76..925e96145adc 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTVERSION= 0.12.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Generic HTTP types for Haskell (for both client and server code)
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
+USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index c4a5448e9ca5..46fc0b089092 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-types-0.9.1.tar.gz) = 7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550
-SIZE (cabal/http-types-0.9.1.tar.gz) = 12284
+TIMESTAMP = 1523783338
+SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3
+SIZE (cabal/http-types-0.12.1.tar.gz) = 13189
diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile
index 7cd6038548e6..ef763e157bea 100644
--- a/www/hs-http2/Makefile
+++ b/www/hs-http2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http2
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= HTTP/2.0 library including frames and HPACK
LICENSE= BSD3CLAUSE
USE_CABAL= aeson aeson-pretty case-insensitive hex mwc-random psqueues \
- stm text unordered-containers vector word8
+ unordered-containers vector word8
FLAGS_DISABLE= devel
diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile
index 074b2ba84ea9..3b57a3f90992 100644
--- a/www/hs-multipart/Makefile
+++ b/www/hs-multipart/Makefile
@@ -2,7 +2,7 @@
PORTNAME= multipart
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= HTTP multipart split out of the cgi package
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=2.0
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index d57fc7c17b2d..6b47be32dec0 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= oeis
PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 9e5c9addc79f..600499666552 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,7 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Components of paths
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 513eea7f5900..3ad13f3a6913 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index cf7cc6c3bfbc..de6fcfb9b3ba 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 2.0.13
-PORTREVISION= 1
+PORTVERSION= 2.0.15
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= aeson blaze-html blaze-markup exceptions parsec text
+USE_CABAL= aeson blaze-html blaze-markup exceptions
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index d25d7c0177f4..d842e51d2bd7 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543938
-SHA256 (cabal/shakespeare-2.0.13.tar.gz) = a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e
-SIZE (cabal/shakespeare-2.0.13.tar.gz) = 65054
+TIMESTAMP = 1524400477
+SHA256 (cabal/shakespeare-2.0.15.tar.gz) = 4354c6eebbfa89103c8090aae3bc7be5fceae6a0e327acf8adc4f3fd535864ee
+SIZE (cabal/shakespeare-2.0.15.tar.gz) = 65369
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 00764ef8eb78..97e0d5f6e530 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 1.0.2.1
-PORTREVISION= 1
+PORTVERSION= 1.0.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec case-insensitive hashable HUnit io-streams \
lifted-base monad-control mtl network-uri old-locale \
- random readable regex-posix text time-locale-compat \
+ random readable regex-posix time-locale-compat \
transformers-base unix-compat unordered-containers \
vector
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 5ff85b7f8886..4ec9f3cfb0d0 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544248
-SHA256 (cabal/snap-core-1.0.2.1.tar.gz) = de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d
-SIZE (cabal/snap-core-1.0.2.1.tar.gz) = 142939
+TIMESTAMP = 1524419838
+SHA256 (cabal/snap-core-1.0.3.2.tar.gz) = 4c4398476fe882122ce8adc03f69509588d071fc011f50162cd69706093dd88c
+SIZE (cabal/snap-core-1.0.3.2.tar.gz) = 149530
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 4d0e9f60910d..f6aa848f40b9 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 1.0.2.2
-PORTREVISION= 1
+PORTVERSION= 1.1.0.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec blaze-builder case-insensitive clock io-streams \
io-streams-haproxy lifted-base mtl network old-locale snap-core \
- text unix-compat vector
+ unix-compat vector
FLAGS_DEFINE= OPENSSL
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 8b20917a87a4..5bef910ac318 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544292
-SHA256 (cabal/snap-server-1.0.2.2.tar.gz) = 27de5fb962e88fbc4285015c2e7f7abf0e06dac64e8f9737ad6ece6074fa837f
-SIZE (cabal/snap-server-1.0.2.2.tar.gz) = 74372
+TIMESTAMP = 1524853220
+SHA256 (cabal/snap-server-1.1.0.0.tar.gz) = 249ea390a4e54899b310c0dd13b91af007a2b685bd0d9769c3e208dd914d7c6f
+SIZE (cabal/snap-server-1.1.0.0.tar.gz) = 74090
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 9f1fc90bd6b3..558e1e0bc8a8 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= snap
PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,8 +13,10 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson attoparsec cereal clientsession configurator \
directory-tree dlist hashable heist lens lifted-base \
map-syntax monad-control mtl mwc-random pwstore-fast \
- snap-core snap-server stm text transformers-base \
+ snap-core snap-server transformers-base \
unordered-containers xmlhtml
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index f36afb722805..5c02961c704e 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 37baf4e3959b..98eb667f2f96 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 3.1.6.1
-PORTREVISION= 1
+PORTVERSION= 3.1.6.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable cryptohash>=0.11 \
cryptohash-conduit file-embed>=0.0.3.1 http-date \
http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \
- text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
+ unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
wai-extra>=3.0 warp>=3.0.11 zlib>=0.5
EXECUTABLE= warp
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index c2fddb83753b..61df9d101078 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625380
-SHA256 (cabal/wai-app-static-3.1.6.1.tar.gz) = b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668
-SIZE (cabal/wai-app-static-3.1.6.1.tar.gz) = 22686
+TIMESTAMP = 1525035879
+SHA256 (cabal/wai-app-static-3.1.6.2.tar.gz) = d0b0a566be61ef4c8f800922a71dbc4de64287f8f73782b1461cd5d294c1dc3e
+SIZE (cabal/wai-app-static-3.1.6.2.tar.gz) = 22509
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index f3184a58600c..3cbe974ea008 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 3.0.20.0
-PORTREVISION= 1
+PORTVERSION= 3.0.22.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= aeson ansi-terminal base64-bytestring blaze-builder \
case-insensitive cookie data-default-class \
fast-logger http-types iproute lifted-base \
network old-locale resourcet streaming-commons \
- stringsearch text unix-compat vault void \
+ stringsearch unix-compat vault void \
wai wai-logger word8 zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index da5c80ccadb7..4bfc199b9fa9 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625381
-SHA256 (cabal/wai-extra-3.0.20.0.tar.gz) = ad63ca529e812f5edec84e197a58433095a1376a127f8e9416235028bf021971
-SIZE (cabal/wai-extra-3.0.20.0.tar.gz) = 60542
+TIMESTAMP = 1524842206
+SHA256 (cabal/wai-extra-3.0.22.1.tar.gz) = 7e7c9075455015b90e079d7c1d16110f2fb27e33ff66620d84248c3a9805722f
+SIZE (cabal/wai-extra-3.0.22.1.tar.gz) = 61594
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index bb4510634f32..4aa61a390066 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 2.3.0
-PORTREVISION= 1
+PORTVERSION= 2.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo
index 292c96cd3142..696f866f084b 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625381
-SHA256 (cabal/wai-logger-2.3.0.tar.gz) = 90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0
-SIZE (cabal/wai-logger-2.3.0.tar.gz) = 5379
+TIMESTAMP = 1524842605
+SHA256 (cabal/wai-logger-2.3.2.tar.gz) = 8dd4ff875d9ac2c115f5d45cc4375635a6c3e55a75c632ff3781d1fb086eb470
+SIZE (cabal/wai-logger-2.3.2.tar.gz) = 5386
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 12649a9868df..6e78211a1480 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 3.2.1.1
-PORTREVISION= 1
+PORTVERSION= 3.2.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Web Application Interface
LICENSE= MIT
USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \
- text>=0.7 vault>=0.3
+ vault>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 5ee6267b1bb7..61ad245f2915 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625379
-SHA256 (cabal/wai-3.2.1.1.tar.gz) = 5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21
-SIZE (cabal/wai-3.2.1.1.tar.gz) = 10039
+TIMESTAMP = 1524252958
+SHA256 (cabal/wai-3.2.1.2.tar.gz) = 282351461f19fbac26aa0a7896d7ab583b4abef522fcd9aba944f1848e58234b
+SIZE (cabal/wai-3.2.1.2.tar.gz) = 9938
diff --git a/www/hs-wai/files/patch-wai.cabal b/www/hs-wai/files/patch-wai.cabal
deleted file mode 100644
index 739389af330b..000000000000
--- a/www/hs-wai/files/patch-wai.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- wai.cabal.orig 2017-07-09 19:57:56 UTC
-+++ wai.cabal
-@@ -21,7 +21,6 @@ Source-repository head
- Library
- Build-Depends: base >= 4 && < 5
- , bytestring >= 0.10
-- , bytestring-builder >= 0.10.4.0 && < 0.11
- , blaze-builder >= 0.2.1.4 && < 0.5
- , network >= 2.2.1.5
- , http-types >= 0.7
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
index f9b26ed9922c..cb69f1834691 100644
--- a/www/hs-warp-tls/Makefile
+++ b/www/hs-warp-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= warp-tls
PORTVERSION= 3.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 679be7122af4..5c47c1800a52 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 3.2.13
-PORTREVISION= 1
+PORTVERSION= 3.2.22
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,11 @@ COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \
+USE_CABAL= auto-update>=0.1.1 bsb-http-chunked case-insensitive>=0.2 \
hashable http-date http-types>=0.8.5 http2>=1.0.2 \
iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \
- stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \
- vault>=0.3 wai>=3.0 word8
+ streaming-commons>=0.1.10 unix-compat>=0.2 vault>=0.3 \
+ wai>=3.0 word8
FLAGS_ENABLE= allow-sendfilefd
FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 12af17495a45..68e738127d11 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625382
-SHA256 (cabal/warp-3.2.13.tar.gz) = 92395bf42d012e5c4deaea7f9e1fc2271a63c5380b4c5bc1cf16b7c53aa2c424
-SIZE (cabal/warp-3.2.13.tar.gz) = 78441
+TIMESTAMP = 1524927920
+SHA256 (cabal/warp-3.2.22.tar.gz) = 645b230c32050da227e4c2486a0ae6b6866706f563d2ba5e3761f581855f590e
+SIZE (cabal/warp-3.2.22.tar.gz) = 77658
diff --git a/www/hs-warp/files/patch-warp.cabal b/www/hs-warp/files/patch-warp.cabal
deleted file mode 100644
index bf0c57a64148..000000000000
--- a/www/hs-warp/files/patch-warp.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
---- warp.cabal.orig 2015-08-18 02:00:41 UTC
-+++ warp.cabal
-@@ -36,7 +36,6 @@ Library
- , auto-update >= 0.1.1 && < 0.2
- , blaze-builder >= 0.4
- , bytestring >= 0.9.1.4
-- , bytestring-builder
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -134,7 +133,6 @@ Test-Suite spec
- , auto-update
- , blaze-builder >= 0.4
- , bytestring >= 0.9.1.4
-- , bytestring-builder
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index 2e33e2cb90dc..fe27573d40d5 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
PORTVERSION= 0.14.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= LGPL21
USES= pkgconfig
USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \
- pango>=0.13.0.0 text>=1.0.0.0
+ pango>=0.13.0.0
LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index eccb65aea02b..981647276efe 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Sanitize untrusted HTML to prevent XSS attacks
LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \
- network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3
+ network-uri>=2.6 tagsoup>=0.12.2 utf8-string>=0.3
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
index 4213cca768a8..11ba0677fa72 100644
--- a/www/hs-yesod-auth-hashdb/Makefile
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth-hashdb
-PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTVERSION= 1.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Authentication plugin for Yesod
LICENSE= MIT
-USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \
+USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 \
yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \
yesod-persistent>=1.2
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
index 2e5e46fd24c2..2d8e795dfb6d 100644
--- a/www/hs-yesod-auth-hashdb/distinfo
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625384
-SHA256 (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8
-SIZE (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 15615
+TIMESTAMP = 1525187444
+SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c
+SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 89156ace84b8..8a240ce8dabb 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.4.17.2
-PORTREVISION= 1
+PORTVERSION= 1.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +16,7 @@ USE_CABAL= aeson>=0.7 authenticate>=1.3 base16-bytestring \
http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \
network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \
persistent-template>=2.1 random>=1.0.0.2 resourcet safe \
- shakespeare text>=0.7 unordered-containers wai>=1.4 \
+ shakespeare unordered-containers wai>=1.4 \
yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index c354a5785c08..63c4a97f60a6 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625384
-SHA256 (cabal/yesod-auth-1.4.17.2.tar.gz) = 63a4273faed4bb7ddf3b196e30ae54bcc4b228e388f11cca71d5005c9ea19983
-SIZE (cabal/yesod-auth-1.4.17.2.tar.gz) = 50569
+TIMESTAMP = 1525183168
+SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8
+SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index ac5fd1ac3b15..38b348b1026a 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-bin
PORTVERSION= 1.5.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,9 +15,9 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \
data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \
http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \
http-types>=0.7 lifted-base network \
- optparse-applicative>=0.11 parsec>=2.1 \
+ optparse-applicative>=0.11 \
project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \
- split>=0.2 streaming-commons tar>=0.4 text>=0.11 \
+ split>=0.2 streaming-commons tar>=0.4 \
transformers-compat typed-process unix-compat>=0.2 unordered-containers \
wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \
zlib>=0.5
@@ -25,5 +25,7 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \
EXECUTABLE= yesod
STANDALONE= yes
+IGNORE= Doesn't build with recent Cabal
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 571c9b3bed9f..cb38f99b7738 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.4.35
-PORTREVISION= 1
+PORTVERSION= 1.6.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,9 +14,9 @@ USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \
clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \
data-default deepseq-generics exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \
lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \
- mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \
+ mwc-random old-locale>=1.0.0.2 path-pieces>=0.1.2 \
primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \
- shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \
+ shakespeare>=2.0 transformers-base>=0.4 unix-compat unliftio \
unordered-containers>=0.2 vector>=0.9 wai>=3.0 \
wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index ff6ba7be2a00..ab9aed5ec225 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625385
-SHA256 (cabal/yesod-core-1.4.35.tar.gz) = 7e5d0bead1a415aeb8a1d5c62930506c81b8e5209f179d7f19c5627e45bb5cf1
-SIZE (cabal/yesod-core-1.4.35.tar.gz) = 93503
+TIMESTAMP = 1525033997
+SHA256 (cabal/yesod-core-1.6.4.tar.gz) = 8d7e42b70f18ee7a154d351df0bd3b6b025598f593598817ae88d6bb22092727
+SIZE (cabal/yesod-core-1.6.4.tar.gz) = 94604
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 69ec36dd9cc6..0e3e930b159f 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.4.12
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \
network>=2.6 network-uri>=2.6 persistent resourcet semigroups \
- shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \
+ shakespeare>=2.0 wai>=1.3 xss-sanitize>=0.3.0.1 \
yesod-core>=1.4 yesod-persistent>=1.4
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 9fcf7c8d2ddb..b0186c2e1c65 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-form-1.4.12.tar.gz) = 731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51
-SIZE (cabal/yesod-form-1.4.12.tar.gz) = 31515
+TIMESTAMP = 1525181435
+SHA256 (cabal/yesod-form-1.6.1.tar.gz) = b8ff14eafff4bb6c2b01b235e8ebeafe9802f545979c1c1227076b06edd3f616
+SIZE (cabal/yesod-form-1.6.1.tar.gz) = 32873
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index f1367e876a66..f1cbb5fdb562 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 445a92e0f131..21afddd170b4 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-persistent-1.4.2.tar.gz) = d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056
-SIZE (cabal/yesod-persistent-1.4.2.tar.gz) = 4887
+TIMESTAMP = 1525180776
+SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd
+SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935
diff --git a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal b/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
deleted file mode 100644
index ccaf7973e3f9..000000000000
--- a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- yesod-persistent.cabal.orig 2017-07-10 15:13:02 UTC
-+++ yesod-persistent.cabal
-@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md
- library
- build-depends: base >= 4 && < 5
- , yesod-core >= 1.4.0 && < 1.5
-- , persistent >= 2.1 && < 2.7
-- , persistent-template >= 2.1 && < 2.7
-+ , persistent >= 2.1 && < 2.8
-+ , persistent-template >= 2.1 && < 2.8
- , transformers >= 0.2.2
- , blaze-builder
- , conduit
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 702bb022ba8c..7fe66f47d6ac 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.5.3
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +11,11 @@ LICENSE= MIT
USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \
blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \
- cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \
- data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \
- http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \
- text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \
- wai-app-static>=3.1 yesod-core>=1.4
+ cryptohash>=0.11 cryptohash-conduit>=0.1 cryptonite-conduit \
+ css-text>=0.1.2 data-default file-embed>=0.0.4.1 hashable>=1.1 \
+ hjsmin http-types>=0.7 mime-types>=0.1 old-time>=1.0 \
+ resourcet>=0.4 unix-compat>=0.2 unordered-containers>=0.2 \
+ wai>=1.3 wai-app-static>=3.1 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index 2f52b2e8bfea..da2a619eadee 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-static-1.5.3.tar.gz) = b486aea2b24bc0497ace32b6318da3737d7f8ea8434327608eafdf1eb25d5d65
-SIZE (cabal/yesod-static-1.5.3.tar.gz) = 25521
+TIMESTAMP = 1525169575
+SHA256 (cabal/yesod-static-1.6.0.tar.gz) = bd0bf5924bb9c27fe24047816018158e92fc687053c190221af2f03bac94880e
+SIZE (cabal/yesod-static-1.6.0.tar.gz) = 25416
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index a2453ce0e81a..a4dac935fef8 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.5.7
-PORTREVISION= 1
+PORTVERSION= 1.6.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \
hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \
- monad-control network>=2.2 persistent>=1.0 pretty-show text wai>=3.0 \
+ monad-control network>=2.2 persistent>=1.0 pretty-show wai>=3.0 \
wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index ed6e0a7931c8..78e1b45aaced 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625387
-SHA256 (cabal/yesod-test-1.5.7.tar.gz) = 426b2aaf777b4c18aee150ed5bbe7ab95c987e622609b0cff1242f9ec0850113
-SIZE (cabal/yesod-test-1.5.7.tar.gz) = 19365
+TIMESTAMP = 1525176699
+SHA256 (cabal/yesod-test-1.6.4.tar.gz) = cffa1639237646836be0ead1bc0b1787a3fccb384cbb7e77dcbcf54c1ed3b95b
+SIZE (cabal/yesod-test-1.6.4.tar.gz) = 21745
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index fd601f8037aa..80d98bea8fe2 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= MIT
USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \
data-default fast-logger monad-control>=0.3 monad-logger \
- safe shakespeare>=2.0 streaming-commons text \
+ safe shakespeare>=2.0 streaming-commons \
unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \
warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \
yesod-form>=1.3 yesod-persistent>=1.4
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index fcddf8a19d0b..770ac6ad21e0 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625383
-SHA256 (cabal/yesod-1.4.5.tar.gz) = 267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9
-SIZE (cabal/yesod-1.4.5.tar.gz) = 9105
+TIMESTAMP = 1525179938
+SHA256 (cabal/yesod-1.6.0.tar.gz) = 8a242ffe1df10bc2c5dffb6e255ad21b11e96a9c4794bac20504b67f973da773
+SIZE (cabal/yesod-1.6.0.tar.gz) = 9072
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index d2b22667c42a..4b931f6681e0 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= GLURaw
-PORTVERSION= 2.0.0.3
-PORTREVISION= 1
+PORTVERSION= 2.0.0.4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo
index e446af03da01..2ef6947485d6 100644
--- a/x11-toolkits/hs-GLURaw/distinfo
+++ b/x11-toolkits/hs-GLURaw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538016
-SHA256 (cabal/GLURaw-2.0.0.3.tar.gz) = 582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee
-SIZE (cabal/GLURaw-2.0.0.3.tar.gz) = 10515
+TIMESTAMP = 1523908514
+SHA256 (cabal/GLURaw-2.0.0.4.tar.gz) = b863fd5cb26b1a37afb66ef8a81c0335bc073d33b0a67ec5190dfc62cb885dc4
+SIZE (cabal/GLURaw-2.0.0.4.tar.gz) = 10557
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 77ff76d56a0f..75010f8ff613 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= GLUT
PORTVERSION= 2.7.0.12
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index dc4a54e1130b..3d0f71edfbcd 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 3.0.2.0
-PORTREVISION= 1
+PORTVERSION= 3.0.2.1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -12,8 +11,7 @@ COMMENT= Binding for the OpenGL graphics system
LICENSE= BSD3CLAUSE
-USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 \
- text>=0.1
+USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 82f7f7194b5e..8729dbecbcb5 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499613084
-SHA256 (cabal/OpenGL-3.0.2.0.tar.gz) = faa99459724d614d2cf2d2b83c7bda4898ee71752a253bf4699c096822450efb
-SIZE (cabal/OpenGL-3.0.2.0.tar.gz) = 130658
+TIMESTAMP = 1524406154
+SHA256 (cabal/OpenGL-3.0.2.1.tar.gz) = 7acb891b911de8bb6933afeaa7f8c5291cc986da5557c922c0fc1717c5a559bf
+SIZE (cabal/OpenGL-3.0.2.1.tar.gz) = 130703
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index ab565609d47d..7d0e4e748dba 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= OpenGLRaw
-PORTVERSION= 3.2.4.0
-PORTREVISION= 1
+PORTVERSION= 3.3.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Raw binding for the OpenGL graphics system
LICENSE= BSD3CLAUSE
-USE_CABAL= fixed half text
+USE_CABAL= fixed half
USE_GL= gl glut
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
index e3b92186d64a..9b6fbe5fc058 100644
--- a/x11-toolkits/hs-OpenGLRaw/distinfo
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444850
-SHA256 (cabal/OpenGLRaw-3.2.4.0.tar.gz) = e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e
-SIZE (cabal/OpenGLRaw-3.2.4.0.tar.gz) = 799693
+TIMESTAMP = 1523444916
+SHA256 (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 17889867ae2bd67b98bc7d74f5df3b82abc4f01807c4d24d2efde84d9423b290
+SIZE (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 857906
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index 8fcd11d94f0b..28d8f5ce7c1e 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk
-PORTVERSION= 0.14.6
-PORTREVISION= 1
+PORTVERSION= 0.14.9
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= LGPL21
USES= pkgconfig
USE_CABAL= cairo>=0.13.0.0 gio>=0.13.0 glib>=0.13.0.0 mtl \
- pango>=0.13.0.0 text>=0.11.0.6
+ pango>=0.13.0.0
USE_GNOME= gtk20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo
index b4953c749437..3a319f7b2d39 100644
--- a/x11-toolkits/hs-gtk/distinfo
+++ b/x11-toolkits/hs-gtk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625639
-SHA256 (cabal/gtk-0.14.6.tar.gz) = 707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327
-SIZE (cabal/gtk-0.14.6.tar.gz) = 679274
+TIMESTAMP = 1524938622
+SHA256 (cabal/gtk-0.14.9.tar.gz) = bff7cdc93d66a3be9db038018c1315445411846beaa519f48107a8c7ab371fce
+SIZE (cabal/gtk-0.14.9.tar.gz) = 677659
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 4e6f0877a6fa..de703d66590d 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk2hs
PORTVERSION= 0.13.2.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 53a0316d99f9..ccecdd1ad821 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.13.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Binding to the GtkSourceView library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl text
+USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl
USE_GNOME= gtksourceview2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index e203981d84ff..fa97c6580a3c 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pango
-PORTVERSION= 0.13.3.1
-PORTREVISION= 1
+PORTVERSION= 0.13.5.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Pango text rendering engine
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text>=0.11.0.6
+USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl
USE_GNOME= pango
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo
index 1af1913cb903..537456e3ad5c 100644
--- a/x11-toolkits/hs-pango/distinfo
+++ b/x11-toolkits/hs-pango/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625640
-SHA256 (cabal/pango-0.13.3.1.tar.gz) = 306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb
-SIZE (cabal/pango-0.13.3.1.tar.gz) = 52564
+TIMESTAMP = 1524851066
+SHA256 (cabal/pango-0.13.5.0.tar.gz) = bf59b9273134e5d1c9c648a253e5a766cd1ef51afc2216175bce21a15b6d49e8
+SIZE (cabal/pango-0.13.5.0.tar.gz) = 52797
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 4c44deca46fc..f7701c595efa 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vte
PORTVERSION= 0.13.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 1ac2fdcb4a41..c2536d580bdd 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -2,14 +2,14 @@
PORTNAME= wx
PORTVERSION= 0.92.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell
USES= dos2unix
-USE_CABAL= stm wxcore>=0.91
+USE_CABAL= wxcore>=0.91
DOS2UNIX_FILES= src/Graphics/UI/WX/Window.hs
USE_WX= 3.0
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index b81f53235882..a05f4814747c 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -16,6 +16,8 @@ WX_COMPS= wx
IGNORE_DOCS= yes
+IGNORE= Doesn't build with recent GHC version
+
post-patch::
@${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \
s|/sbin/ldconfig -n|/sbin/ldconfig -m| ; \
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index e844d4f19b45..99f69a39f7c2 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -2,13 +2,13 @@
PORTNAME= wxcore
PORTVERSION= 0.92.3.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell core
-USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91
+USE_CABAL= wxc>=0.91 wxdirect>=0.91
USES= dos2unix pkgconfig
DOS2UNIX_GLOB= *.hs
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index 37036845b6e9..50fbc140b208 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxdirect
PORTVERSION= 0.92.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Helper tool for building wxHaskell
LICENSE= BSD3CLAUSE
USES= dos2unix
-USE_CABAL= parsec>=2.1.0 strict
+USE_CABAL= strict
EXECUTABLE= wxdirect
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
new file mode 100644
index 000000000000..b09a9129e57c
--- /dev/null
+++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
@@ -0,0 +1,11 @@
+--- wxdirect.cabal.orig 2018-04-16 18:38:04 UTC
++++ wxdirect.cabal
+@@ -53,7 +53,7 @@ executable wxdirect
+ strict,
+ time >= 1.0,
+ filepath < 1.5,
+- process >= 1.1 && < 1.5
++ process >= 1.1 && < 1.7
+
+ if flag(splitBase)
+ build-depends:
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 41185b2f7cc7..5667b080bca6 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
- X11>=1.6.1 X11-xft>=0.2 xmonad==0.13_2
+ X11>=1.6.1 X11-xft>=0.2 xmonad
USE_XORG= x11
RUN_DEPENDS+= bash:shells/bash
diff --git a/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support
new file mode 100644
index 000000000000..f54d82cd682a
--- /dev/null
+++ b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support
@@ -0,0 +1,95 @@
+diff --git XMonad/Hooks/FadeWindows.hs XMonad/Hooks/FadeWindows.hs
+index 4b8e62b6..01d06792 100644
+--- XMonad/Hooks/FadeWindows.hs
++++ XMonad/Hooks/FadeWindows.hs
+@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask
+ ,asks)
+ import Control.Monad.State (gets)
+ import qualified Data.Map as M
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
++import Data.Semigroup
+
+ import Graphics.X11.Xlib.Extras (Event(..))
+
+@@ -134,6 +135,9 @@ instance Monoid Opacity where
+ r `mappend` OEmpty = r
+ _ `mappend` r = r
+
++instance Semigroup Opacity where
++ (<>) = mappend
++
+ -- | A FadeHook is similar to a ManageHook, but records window opacity.
+ type FadeHook = Query Opacity
+
+diff --git XMonad/Hooks/WallpaperSetter.hs XMonad/Hooks/WallpaperSetter.hs
+index 00a3b1c3..d4f5ccb2 100644
+--- XMonad/Hooks/WallpaperSetter.hs
++++ XMonad/Hooks/WallpaperSetter.hs
+@@ -41,7 +41,8 @@ import Data.Ord (comparing)
+ import Control.Monad
+ import Control.Applicative
+ import Data.Maybe
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
++import Data.Semigroup
+
+ -- $usage
+ -- This module requires imagemagick and feh to be installed, as these are utilized
+@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
+ mappend (WallpaperList w1) (WallpaperList w2) =
+ WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
+
++instance Semigroup WallpaperList where
++ (<>) = mappend
++
+ -- | Complete wallpaper configuration passed to the hook
+ data WallpaperConf = WallpaperConf {
+ wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
+diff --git XMonad/Layout/Mosaic.hs XMonad/Layout/Mosaic.hs
+index 05655d4c..da44fc50 100644
+--- XMonad/Layout/Mosaic.hs
++++ XMonad/Layout/Mosaic.hs
+@@ -38,7 +38,8 @@ import Control.Monad(mplus)
+ import Data.Foldable(Foldable,foldMap, sum)
+ import Data.Function(on)
+ import Data.List(sortBy)
+-import Data.Monoid(Monoid,mempty, mappend)
++import Data.Monoid(Monoid,mempty, mappend, (<>))
++import Data.Semigroup
+
+
+ -- $usage
+@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
+ mappend x Empty = x
+ mappend x y = Branch x y
+
++instance Semigroup (Tree a) where
++ (<>) = mappend
++
+ makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
+ makeTree _ [] = Empty
+ makeTree _ [x] = Leaf x
+diff --git xmonad-contrib.cabal xmonad-contrib.cabal
+index dde3ccda..c401c6e6 100644
+--- xmonad-contrib.cabal
++++ xmonad-contrib.cabal
+@@ -36,7 +36,7 @@ cabal-version: >= 1.6
+ build-type: Simple
+ bug-reports: https://github.com/xmonad/xmonad-contrib/issues
+
+-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
+
+ source-repository head
+ type: git
+@@ -66,7 +66,8 @@ library
+ unix,
+ X11>=1.6.1 && < 1.9,
+ xmonad>=0.13 && < 0.14,
+- utf8-string
++ utf8-string,
++ semigroups
+
+ if flag(use_xft)
+ build-depends: X11-xft >= 0.2
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index a2c19f0ad174..9f7367d4742a 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Tiling window manager
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl setlocale utf8-string X11
+USE_CABAL= extensible-exceptions mtl semigroups setlocale utf8-string X11
USE_XORG= x11
MAN1PAGES= xmonad.1
diff --git a/x11-wm/hs-xmonad/files/patch-8.4.1-support b/x11-wm/hs-xmonad/files/patch-8.4.1-support
new file mode 100644
index 000000000000..2dcf5baf645b
--- /dev/null
+++ b/x11-wm/hs-xmonad/files/patch-8.4.1-support
@@ -0,0 +1,61 @@
+--- src/XMonad/Core.hs.orig 2017-02-09 02:46:45 UTC
++++ src/XMonad/Core.hs
+@@ -39,6 +39,7 @@ import qualified Control.Exception.Extensible as E
+ import Control.Applicative
+ import Control.Monad.State
+ import Control.Monad.Reader
++import Data.Semigroup
+ import Data.Default
+ import System.FilePath
+ import System.IO
+@@ -56,7 +57,7 @@ import Graphics.X11.Xlib.Extras (getWindowAttributes,
+ import Data.Typeable
+ import Data.List ((\\))
+ import Data.Maybe (isJust,fromMaybe)
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
+
+ import qualified Data.Map as M
+ import qualified Data.Set as S
+@@ -151,6 +152,9 @@ instance Applicative X where
+ pure = return
+ (<*>) = ap
+
++instance Semigroup a => Semigroup (X a) where
++ (<>) = liftM2 (<>)
++
+ instance (Monoid a) => Monoid (X a) where
+ mempty = return mempty
+ mappend = liftM2 mappend
+@@ -164,6 +168,9 @@ newtype Query a = Query (ReaderT Window X a)
+
+ runQuery :: Query a -> Window -> X a
+ runQuery (Query m) w = runReaderT m w
++
++instance Semigroup a => Semigroup (Query a) where
++ (<>) = liftM2 (<>)
+
+ instance Monoid a => Monoid (Query a) where
+ mempty = return mempty
+--- xmonad.cabal.orig 2017-02-10 22:07:40 UTC
++++ xmonad.cabal
+@@ -32,7 +32,8 @@ tested-with:
+ GHC==7.6.3,
+ GHC==7.8.4,
+ GHC==7.10.3,
+- GHC==8.0.1
++ GHC==8.0.1,
++ GHC==8.2.2
+
+ data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html
+
+@@ -78,7 +79,8 @@ library
+ process,
+ unix,
+ utf8-string >= 0.3 && < 1.1,
+- X11>=1.8 && < 1.9
++ X11>=1.8 && < 1.9,
++ semigroups
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index af8826fb32f8..ac674f17840a 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 70af637fc738..0f9bd197f5b1 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 948c08989170..849ed238f300 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.24.5
+PORTVERSION= 0.26
PORTREVISION= 1
CATEGORIES= x11 haskell
@@ -11,8 +11,7 @@ COMMENT= Minimalistic text-based status bar
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 parsec>=3.1 regex-compat stm>=2.3 \
- X11>=1.6.1
+USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 regex-compat X11>=1.6.1
USE_XORG= xpm
EXECUTABLE= xmobar
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 2a61c187aabb..9c549b539264 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625449
-SHA256 (cabal/xmobar-0.24.5.tar.gz) = 393aab8d86d09f218f5255bb8811ba12a4ca2f4eb64411c38b9713c58574bf69
-SIZE (cabal/xmobar-0.24.5.tar.gz) = 100658
+TIMESTAMP = 1524245719
+SHA256 (cabal/xmobar-0.26.tar.gz) = ff7dd9af151e0336d35fa4741a76fe8a95762649c11877442449b321f106e4a5
+SIZE (cabal/xmobar-0.26.tar.gz) = 101557