aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-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
466 files changed, 1289 insertions, 1068 deletions
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