aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2019-01-06 12:18:06 +0000
committerGleb Popov <arrowd@FreeBSD.org>2019-01-06 12:18:06 +0000
commite2c3fdc1fdeca1ffbdfef680e3e712ddc2e7e06f (patch)
treeec6e8ffeefbf83bfc231412c2c7a6b883ecd5bd8
parente8d137116e2942f75f1fed8f603384210db17ec0 (diff)
downloadports-e2c3fdc1fdeca1ffbdfef680e3e712ddc2e7e06f.tar.gz
ports-e2c3fdc1fdeca1ffbdfef680e3e712ddc2e7e06f.zip
Notes
-rw-r--r--archivers/hs-tar/Makefile2
-rw-r--r--archivers/hs-tar/files/patch-tar.cabal11
-rw-r--r--archivers/hs-zip-archive/Makefile2
-rw-r--r--archivers/hs-zip-archive/distinfo6
-rw-r--r--archivers/hs-zlib-bindings/Makefile2
-rw-r--r--archivers/hs-zlib/Makefile2
-rw-r--r--audio/hs-ALUT/Makefile2
-rw-r--r--audio/hs-OpenAL/Makefile2
-rw-r--r--audio/hs-libmpd/Makefile2
-rw-r--r--audio/hs-libmpd/distinfo6
-rw-r--r--benchmarks/Makefile1
-rw-r--r--benchmarks/hs-criterion-measurement/Makefile16
-rw-r--r--benchmarks/hs-criterion-measurement/distinfo3
-rw-r--r--benchmarks/hs-criterion-measurement/pkg-descr4
-rw-r--r--benchmarks/hs-criterion/Makefile9
-rw-r--r--benchmarks/hs-criterion/distinfo6
-rw-r--r--converters/hs-aeson-compat/Makefile2
-rw-r--r--converters/hs-aeson-compat/distinfo6
-rw-r--r--converters/hs-aeson-compat/files/patch-aeson-compat.cabal21
-rw-r--r--converters/hs-aeson-pretty/Makefile2
-rw-r--r--converters/hs-aeson/Makefile2
-rw-r--r--converters/hs-json/Makefile2
-rw-r--r--converters/hs-sandi/Makefile6
-rw-r--r--converters/hs-sandi/distinfo6
-rw-r--r--databases/hs-esqueleto/Makefile2
-rw-r--r--databases/hs-hedis/Makefile2
-rw-r--r--databases/hs-mysql/Makefile2
-rw-r--r--databases/hs-persistent-sqlite/Makefile2
-rw-r--r--databases/hs-persistent-sqlite/distinfo6
-rw-r--r--databases/hs-persistent-template/Makefile2
-rw-r--r--databases/hs-persistent-template/files/patch-persistent-template.cabal11
-rw-r--r--databases/hs-persistent/Makefile2
-rw-r--r--databases/hs-persistent/distinfo6
-rw-r--r--databases/hs-persistent/files/patch-persistent.cabal11
-rw-r--r--deskutils/hs-fdo-notify/Makefile2
-rw-r--r--devel/Makefile1
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-BoundedChan/Makefile2
-rw-r--r--devel/hs-ConfigFile/Makefile2
-rw-r--r--devel/hs-EdisonAPI/Makefile2
-rw-r--r--devel/hs-EdisonCore/Makefile2
-rw-r--r--devel/hs-GenericPretty/Makefile1
-rw-r--r--devel/hs-Glob/Makefile4
-rw-r--r--devel/hs-Glob/distinfo6
-rw-r--r--devel/hs-HUnit/Makefile2
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-List/Makefile2
-rw-r--r--devel/hs-ListLike/Makefile2
-rw-r--r--devel/hs-ListLike/files/patch-ListLike.cabal11
-rw-r--r--devel/hs-MemoTrie/Makefile2
-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-QuickCheck/Makefile2
-rw-r--r--devel/hs-ReadArgs/Makefile2
-rw-r--r--devel/hs-STMonadTrans/Makefile2
-rw-r--r--devel/hs-SafeSemaphore/Makefile2
-rw-r--r--devel/hs-ShellCheck/Makefile1
-rw-r--r--devel/hs-StateVar/Makefile4
-rw-r--r--devel/hs-StateVar/distinfo6
-rw-r--r--devel/hs-Stream/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.cabal2
-rw-r--r--devel/hs-alex/Makefile2
-rw-r--r--devel/hs-ansi-terminal/Makefile2
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile2
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-asn1-data/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-async/files/patch-async.cabal11
-rw-r--r--devel/hs-atomic-primops/Makefile2
-rw-r--r--devel/hs-atomic-primops/files/patch-atomic-primops.cabal11
-rw-r--r--devel/hs-auto-update/Makefile2
-rw-r--r--devel/hs-base-compat-batteries/Makefile2
-rw-r--r--devel/hs-base-compat/Makefile2
-rw-r--r--devel/hs-base-compat/distinfo6
-rw-r--r--devel/hs-base-orphans/Makefile4
-rw-r--r--devel/hs-base-orphans/distinfo6
-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/Makefile2
-rw-r--r--devel/hs-basement/distinfo6
-rw-r--r--devel/hs-basic-prelude/Makefile2
-rw-r--r--devel/hs-bifunctors/Makefile2
-rw-r--r--devel/hs-bifunctors/distinfo6
-rw-r--r--devel/hs-bifunctors/files/patch-bifunctors.cabal11
-rw-r--r--devel/hs-bitarray/Makefile14
-rw-r--r--devel/hs-bitarray/distinfo3
-rw-r--r--devel/hs-bitarray/pkg-descr3
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-blaze-builder/Makefile2
-rw-r--r--devel/hs-blaze-textual/Makefile2
-rw-r--r--devel/hs-bloomfilter/Makefile2
-rw-r--r--devel/hs-boxes/Makefile2
-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-bytestring-show/files/patch-bytestring-show.cabal2
-rw-r--r--devel/hs-c2hs/Makefile4
-rw-r--r--devel/hs-c2hs/distinfo6
-rw-r--r--devel/hs-cabal-install/Makefile6
-rw-r--r--devel/hs-cabal-install/distinfo6
-rw-r--r--devel/hs-cabal-install/files/patch-cabal-install.cabal11
-rw-r--r--devel/hs-call-stack/Makefile2
-rw-r--r--devel/hs-cereal/Makefile2
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-chunked-data/Makefile2
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile2
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo6
-rw-r--r--devel/hs-classy-prelude/Makefile2
-rw-r--r--devel/hs-classy-prelude/distinfo6
-rw-r--r--devel/hs-clock/Makefile2
-rw-r--r--devel/hs-cmdargs/Makefile2
-rw-r--r--devel/hs-code-page/Makefile2
-rw-r--r--devel/hs-colour/Makefile2
-rw-r--r--devel/hs-concurrent-output/Makefile4
-rw-r--r--devel/hs-concurrent-output/distinfo6
-rw-r--r--devel/hs-conduit-combinators/Makefile2
-rw-r--r--devel/hs-conduit-extra/Makefile2
-rw-r--r--devel/hs-conduit/Makefile2
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-constraints/Makefile2
-rw-r--r--devel/hs-constraints/distinfo6
-rw-r--r--devel/hs-convertible/Makefile2
-rw-r--r--devel/hs-cpphs/Makefile2
-rw-r--r--devel/hs-darcs/Makefile4
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal67
-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/Makefile2
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal14
-rw-r--r--devel/hs-date-cache/Makefile2
-rw-r--r--devel/hs-datetime/Makefile2
-rw-r--r--devel/hs-dbus/Makefile2
-rw-r--r--devel/hs-deepseq-generics/Makefile2
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal2
-rw-r--r--devel/hs-directory-tree/Makefile2
-rw-r--r--devel/hs-dlist-instances/Makefile2
-rw-r--r--devel/hs-dlist/Makefile4
-rw-r--r--devel/hs-dlist/distinfo6
-rw-r--r--devel/hs-easy-file/Makefile2
-rw-r--r--devel/hs-echo/Makefile2
-rw-r--r--devel/hs-edit-distance/Makefile2
-rw-r--r--devel/hs-either/Makefile2
-rw-r--r--devel/hs-enclosed-exceptions/Makefile2
-rw-r--r--devel/hs-equivalence/Makefile4
-rw-r--r--devel/hs-equivalence/distinfo6
-rw-r--r--devel/hs-errors/Makefile2
-rw-r--r--devel/hs-exceptions/Makefile2
-rw-r--r--devel/hs-exceptions/files/patch-exceptions.cabal11
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extra/Makefile2
-rw-r--r--devel/hs-fast-logger/Makefile2
-rw-r--r--devel/hs-fgl/Makefile4
-rw-r--r--devel/hs-fgl/distinfo6
-rw-r--r--devel/hs-file-embed/Makefile2
-rw-r--r--devel/hs-filemanip/Makefile2
-rw-r--r--devel/hs-filestore/Makefile2
-rw-r--r--devel/hs-filestore/distinfo6
-rw-r--r--devel/hs-fmlist/Makefile2
-rw-r--r--devel/hs-fortran-src/Makefile3
-rw-r--r--devel/hs-fortran-src/files/patch-fortran-src.cabal29
-rw-r--r--devel/hs-foundation/Makefile6
-rw-r--r--devel/hs-foundation/distinfo6
-rw-r--r--devel/hs-free/Makefile2
-rw-r--r--devel/hs-free/files/patch-free.cabal8
-rw-r--r--devel/hs-fsnotify/Makefile2
-rw-r--r--devel/hs-gconf/Makefile2
-rw-r--r--devel/hs-generic-deriving/Makefile2
-rw-r--r--devel/hs-generic-deriving/files/patch-generic-deriving.cabal11
-rw-r--r--devel/hs-geniplate-mirror/Makefile2
-rw-r--r--devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal10
-rw-r--r--devel/hs-ghc-events/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile4
-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/Makefile4
-rw-r--r--devel/hs-haddock-api/distinfo6
-rw-r--r--devel/hs-haddock-library/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-haddock/distinfo6
-rw-r--r--devel/hs-happy/Makefile2
-rw-r--r--devel/hs-hashable/Makefile2
-rw-r--r--devel/hs-hashable/files/patch-hashable.cabal11
-rw-r--r--devel/hs-hashtables/Makefile2
-rw-r--r--devel/hs-haskell-lexer/Makefile2
-rw-r--r--devel/hs-haskell-src-exts-util/Makefile1
-rw-r--r--devel/hs-haskell-src-exts/Makefile2
-rw-r--r--devel/hs-haskell-src-exts/distinfo6
-rw-r--r--devel/hs-haskell-src-meta/Makefile2
-rw-r--r--devel/hs-haskell-src-meta/distinfo6
-rw-r--r--devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts28
-rw-r--r--devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal13
-rw-r--r--devel/hs-haskell-src/Makefile2
-rw-r--r--devel/hs-hasktags/Makefile2
-rw-r--r--devel/hs-hex/Makefile2
-rw-r--r--devel/hs-hinotify/Makefile2
-rw-r--r--devel/hs-hint/Makefile3
-rw-r--r--devel/hs-hint/distinfo6
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile3
-rw-r--r--devel/hs-hlint/distinfo6
-rw-r--r--devel/hs-hoogle/Makefile2
-rw-r--r--devel/hs-hoogle/distinfo6
-rw-r--r--devel/hs-hourglass/Makefile2
-rw-r--r--devel/hs-hsb2hs/Makefile2
-rw-r--r--devel/hs-hslogger/Makefile4
-rw-r--r--devel/hs-hslogger/distinfo6
-rw-r--r--devel/hs-hslua-module-text/Makefile2
-rw-r--r--devel/hs-hslua-module-text/distinfo6
-rw-r--r--devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal18
-rw-r--r--devel/hs-hslua/Makefile2
-rw-r--r--devel/hs-hslua/distinfo6
-rw-r--r--devel/hs-hslua/files/patch-hslua.cabal20
-rw-r--r--devel/hs-hspec-core/Makefile2
-rw-r--r--devel/hs-hspec-discover/Makefile2
-rw-r--r--devel/hs-hspec-expectations/Makefile2
-rw-r--r--devel/hs-hspec/Makefile2
-rw-r--r--devel/hs-io-streams-haproxy/Makefile2
-rw-r--r--devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal2
-rw-r--r--devel/hs-io-streams/Makefile2
-rw-r--r--devel/hs-js-flot/Makefile2
-rw-r--r--devel/hs-js-jquery/Makefile2
-rw-r--r--devel/hs-keys/Makefile2
-rw-r--r--devel/hs-keys/distinfo6
-rw-r--r--devel/hs-kqueue/Makefile2
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal2
-rw-r--r--devel/hs-language-c/Makefile2
-rw-r--r--devel/hs-language-c/distinfo6
-rw-r--r--devel/hs-language-javascript/Makefile2
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lens/Makefile6
-rw-r--r--devel/hs-lens/distinfo6
-rw-r--r--devel/hs-lifted-async/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-map-syntax/files/patch-map-syntax.cabal13
-rw-r--r--devel/hs-memory/Makefile2
-rw-r--r--devel/hs-memory/distinfo6
-rw-r--r--devel/hs-microlens-th/Makefile2
-rw-r--r--devel/hs-microlens-th/distinfo6
-rw-r--r--devel/hs-microlens/Makefile2
-rw-r--r--devel/hs-microstache/Makefile2
-rw-r--r--devel/hs-microstache/files/patch-microstache.cabal36
-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/Makefile2
-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-monads-tf/Makefile2
-rw-r--r--devel/hs-mono-traversable-instances/Makefile2
-rw-r--r--devel/hs-mono-traversable/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-newtype-generics/Makefile2
-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_15fea2d4
-rw-r--r--devel/hs-old-time/Makefile2
-rw-r--r--devel/hs-old-time/files/patch-git_82790af6
-rw-r--r--devel/hs-optparse-applicative/Makefile4
-rw-r--r--devel/hs-optparse-applicative/distinfo6
-rw-r--r--devel/hs-parallel/Makefile4
-rw-r--r--devel/hs-parallel/distinfo6
-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/Makefile1
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-primitive/Makefile2
-rw-r--r--devel/hs-primitive/distinfo6
-rw-r--r--devel/hs-primitive/files/patch-primitive.cabal11
-rw-r--r--devel/hs-process-extras/Makefile2
-rw-r--r--devel/hs-profunctors/Makefile5
-rw-r--r--devel/hs-profunctors/distinfo6
-rw-r--r--devel/hs-profunctors/files/patch-profunctors.cabal10
-rw-r--r--devel/hs-project-template/Makefile2
-rw-r--r--devel/hs-psqueues/Makefile2
-rw-r--r--devel/hs-quickcheck-io/Makefile2
-rw-r--r--devel/hs-random/Makefile2
-rw-r--r--devel/hs-readable/Makefile2
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-refact/Makefile2
-rw-r--r--devel/hs-reflection/Makefile2
-rw-r--r--devel/hs-reflection/distinfo6
-rw-r--r--devel/hs-resource-pool/Makefile2
-rw-r--r--devel/hs-resourcet/Makefile2
-rw-r--r--devel/hs-safe-exceptions/Makefile2
-rw-r--r--devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal2
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-say/Makefile2
-rw-r--r--devel/hs-scientific/Makefile2
-rw-r--r--devel/hs-securemem/Makefile2
-rw-r--r--devel/hs-setenv/Makefile2
-rw-r--r--devel/hs-setlocale/Makefile2
-rw-r--r--devel/hs-setlocale/distinfo6
-rw-r--r--devel/hs-shake/Makefile2
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile2
-rw-r--r--devel/hs-simple-reflect/Makefile2
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-split/Makefile2
-rw-r--r--devel/hs-split/files/patch-split.cabal11
-rw-r--r--devel/hs-stm-chans/Makefile2
-rw-r--r--devel/hs-storable-record/Makefile2
-rw-r--r--devel/hs-storable-tuple/Makefile2
-rw-r--r--devel/hs-streaming-commons/Makefile2
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile2
-rw-r--r--devel/hs-syb-with-class/distinfo6
-rw-r--r--devel/hs-syb/Makefile2
-rw-r--r--devel/hs-system-fileio/Makefile2
-rw-r--r--devel/hs-system-filepath/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-test-framework/files/patch-test-framework.cabal11
-rw-r--r--devel/hs-text-icu/Makefile2
-rw-r--r--devel/hs-text-short/Makefile2
-rw-r--r--devel/hs-text-short/files/patch-text-short.cabal11
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-th-abstraction/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal11
-rw-r--r--devel/hs-th-lift-instances/Makefile2
-rw-r--r--devel/hs-th-lift/Makefile4
-rw-r--r--devel/hs-th-lift/distinfo6
-rw-r--r--devel/hs-th-orphans/Makefile2
-rw-r--r--devel/hs-th-orphans/distinfo6
-rw-r--r--devel/hs-th-reify-many/Makefile2
-rw-r--r--devel/hs-threads/Makefile2
-rw-r--r--devel/hs-threadscope/Makefile1
-rw-r--r--devel/hs-time-compat/Makefile2
-rw-r--r--devel/hs-time-locale-compat/Makefile4
-rw-r--r--devel/hs-time-locale-compat/distinfo6
-rw-r--r--devel/hs-timezone-olson/Makefile2
-rw-r--r--devel/hs-timezone-series/Makefile2
-rw-r--r--devel/hs-transformers-base/Makefile2
-rw-r--r--devel/hs-transformers-compat/Makefile2
-rw-r--r--devel/hs-typed-process/Makefile2
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-unexceptionalio/Makefile2
-rw-r--r--devel/hs-unicode-show/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-time/Makefile2
-rw-r--r--devel/hs-unliftio-core/Makefile2
-rw-r--r--devel/hs-unliftio-core/files/patch-unliftio-core.cabal2
-rw-r--r--devel/hs-unliftio/Makefile2
-rw-r--r--devel/hs-unliftio/distinfo6
-rw-r--r--devel/hs-unordered-containers/Makefile2
-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/Makefile6
-rw-r--r--devel/hs-uuagc-cabal/Makefile2
-rw-r--r--devel/hs-uuagc/Makefile6
-rw-r--r--devel/hs-uuid-types/Makefile2
-rw-r--r--devel/hs-uuid/Makefile2
-rw-r--r--devel/hs-uuid/files/patch-uuid.cabal11
-rw-r--r--devel/hs-uulib/Makefile2
-rw-r--r--devel/hs-vault/Makefile2
-rw-r--r--devel/hs-vault/distinfo6
-rw-r--r--devel/hs-vector-algorithms/Makefile4
-rw-r--r--devel/hs-vector-algorithms/distinfo6
-rw-r--r--devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal11
-rw-r--r--devel/hs-vector-binary-instances/Makefile2
-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/Makefile2
-rw-r--r--devel/hs-vector/files/patch-vector.cabal2
-rw-r--r--devel/hs-void/Makefile2
-rw-r--r--devel/hs-wl-pprint-text/Makefile1
-rw-r--r--devel/hs-word8/Makefile2
-rw-r--r--devel/stack/Makefile3
-rw-r--r--devel/stack/distinfo10
-rw-r--r--dns/hs-dns/Makefile2
-rw-r--r--dns/hs-gnuidn/Makefile2
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--games/hs-scroll/Makefile2
-rw-r--r--graphics/hs-JuicyPixels/Makefile2
-rw-r--r--graphics/hs-JuicyPixels/distinfo6
-rw-r--r--graphics/hs-cairo/Makefile2
-rw-r--r--graphics/hs-dia-base/Makefile2
-rw-r--r--graphics/hs-dia-base/files/patch-dia-base.cabal2
-rw-r--r--graphics/hs-dia-functions/Makefile4
-rw-r--r--graphics/hs-dia-functions/distinfo5
-rw-r--r--graphics/hs-dia-functions/files/patch-dia-functions.cabal21
-rw-r--r--graphics/hs-graphviz/Makefile1
-rw-r--r--graphics/hs-graphviz/files/patch-graphviz.cabal11
-rw-r--r--graphics/hs-svgcairo/Makefile2
-rw-r--r--lang/ghc/Makefile6
-rw-r--r--lang/ghc/bsd.cabal.options.mk2
-rw-r--r--lang/ghc/bsd.hackage.mk6
-rw-r--r--lang/ghc/distinfo6
-rw-r--r--lang/ghc/files/extra-patch-aclocal.m440
-rw-r--r--lang/ghc/files/patch-configure22
-rw-r--r--lang/ghc/files/patch-fix-build-on-arm231
-rw-r--r--lang/ghc/files/patch-ghc.mk11
-rw-r--r--lang/ghc/files/patch-llvm-targets12
-rw-r--r--lang/ghc/files/patch-rts_posix_OSMem.c250
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-unlambda/Makefile2
-rw-r--r--mail/hs-email-validate/Makefile2
-rw-r--r--mail/hs-email-validate/distinfo6
-rw-r--r--mail/hs-mime-mail/Makefile2
-rw-r--r--mail/hs-mime-types/Makefile2
-rw-r--r--mail/hs-mime/Makefile2
-rw-r--r--math/Makefile1
-rw-r--r--math/hs-Agda-stdlib/Makefile1
-rw-r--r--math/hs-Agda/Makefile9
-rw-r--r--math/hs-Agda/distinfo6
-rw-r--r--math/hs-NumInstances/Makefile2
-rw-r--r--math/hs-adjunctions/Makefile4
-rw-r--r--math/hs-adjunctions/files/patch-adjunctions.cabal12
-rw-r--r--math/hs-categories/Makefile2
-rw-r--r--math/hs-comonad/Makefile5
-rw-r--r--math/hs-comonad/distinfo6
-rw-r--r--math/hs-comonad/files/patch-comonad.cabal11
-rw-r--r--math/hs-contravariant/Makefile2
-rw-r--r--math/hs-data-lens-template/Makefile2
-rw-r--r--math/hs-data-lens-template/files/patch-data-lens-template.cabal2
-rw-r--r--math/hs-data-lens/Makefile4
-rw-r--r--math/hs-data-lens/distinfo6
-rw-r--r--math/hs-data-lens/files/patch-data-lens.cabal12
-rw-r--r--math/hs-dense-linear-algebra/Makefile16
-rw-r--r--math/hs-dense-linear-algebra/distinfo3
-rw-r--r--math/hs-dense-linear-algebra/pkg-descr3
-rw-r--r--math/hs-distributive/Makefile2
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-fixed/Makefile2
-rw-r--r--math/hs-half/Makefile2
-rw-r--r--math/hs-ieee754/Makefile2
-rw-r--r--math/hs-integer-logarithms/Makefile2
-rw-r--r--math/hs-integer-logarithms/distinfo6
-rw-r--r--math/hs-kan-extensions/Makefile5
-rw-r--r--math/hs-kan-extensions/files/patch-kan-extensions.cabal12
-rw-r--r--math/hs-math-functions/Makefile6
-rw-r--r--math/hs-math-functions/distinfo6
-rw-r--r--math/hs-mwc-random/Makefile2
-rw-r--r--math/hs-pointed/Makefile4
-rw-r--r--math/hs-pointed/distinfo6
-rw-r--r--math/hs-pointed/files/patch-git_55eab022
-rw-r--r--math/hs-pointed/files/patch-pointed.cabal19
-rw-r--r--math/hs-probability/Makefile4
-rw-r--r--math/hs-probability/distinfo6
-rw-r--r--math/hs-semigroupoids/Makefile6
-rw-r--r--math/hs-semigroupoids/distinfo6
-rw-r--r--math/hs-semigroupoids/files/patch-semigroupoids.cabal11
-rw-r--r--math/hs-semigroups/Makefile2
-rw-r--r--math/hs-statistics/Makefile7
-rw-r--r--math/hs-statistics/distinfo6
-rw-r--r--math/hs-vector-space/Makefile2
-rw-r--r--math/hs-vector-space/distinfo6
-rw-r--r--net-p2p/hs-torrent/Makefile2
-rw-r--r--net/hs-aws/Makefile1
-rw-r--r--net/hs-bsb-http-chunked/Makefile2
-rw-r--r--net/hs-bsb-http-chunked/distinfo6
-rw-r--r--net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal9
-rw-r--r--net/hs-connection/Makefile2
-rw-r--r--net/hs-gsasl/Makefile2
-rw-r--r--net/hs-hoauth2/Makefile2
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-iproute/Makefile2
-rw-r--r--net/hs-maccatcher/Makefile2
-rw-r--r--net/hs-network-info/Makefile1
-rw-r--r--net/hs-network-multicast/Makefile2
-rw-r--r--net/hs-network-protocol-xmpp/Makefile2
-rw-r--r--net/hs-network-uri/Makefile2
-rw-r--r--net/hs-network/Makefile2
-rw-r--r--net/hs-pcap/Makefile2
-rw-r--r--net/hs-publicsuffixlist/Makefile2
-rw-r--r--net/hs-resolv/Makefile2
-rw-r--r--net/hs-resolv/files/patch-resolv.cabal11
-rw-r--r--net/hs-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/Makefile2
-rw-r--r--net/hs-socks/Makefile2
-rw-r--r--ports-mgmt/hs-porte/Makefile6
-rw-r--r--print/hs-hscolour/Makefile2
-rw-r--r--security/hs-Crypto/Makefile2
-rw-r--r--security/hs-DRBG/Makefile2
-rw-r--r--security/hs-HsOpenSSL/Makefile2
-rw-r--r--security/hs-RSA/Makefile2
-rw-r--r--security/hs-SHA/Makefile2
-rw-r--r--security/hs-cipher-aes/Makefile2
-rw-r--r--security/hs-cipher-aes128/Makefile4
-rw-r--r--security/hs-cipher-aes128/distinfo6
-rw-r--r--security/hs-cipher-blowfish/Makefile2
-rw-r--r--security/hs-cipher-camellia/Makefile2
-rw-r--r--security/hs-cipher-des/Makefile2
-rw-r--r--security/hs-cipher-rc4/Makefile2
-rw-r--r--security/hs-clientsession/Makefile2
-rw-r--r--security/hs-cprng-aes/Makefile2
-rw-r--r--security/hs-crypto-api/Makefile2
-rw-r--r--security/hs-crypto-cipher-types/Makefile2
-rw-r--r--security/hs-crypto-conduit/Makefile2
-rw-r--r--security/hs-crypto-numbers/Makefile2
-rw-r--r--security/hs-crypto-pubkey-types/Makefile2
-rw-r--r--security/hs-crypto-pubkey/Makefile2
-rw-r--r--security/hs-crypto-random-api/Makefile2
-rw-r--r--security/hs-crypto-random/Makefile2
-rw-r--r--security/hs-cryptocipher/Makefile2
-rw-r--r--security/hs-cryptohash-conduit/Makefile2
-rw-r--r--security/hs-cryptohash-cryptoapi/Makefile2
-rw-r--r--security/hs-cryptohash-md5/Makefile2
-rw-r--r--security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal2
-rw-r--r--security/hs-cryptohash-sha1/Makefile2
-rw-r--r--security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal2
-rw-r--r--security/hs-cryptohash-sha256/Makefile2
-rw-r--r--security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal2
-rw-r--r--security/hs-cryptohash/Makefile2
-rw-r--r--security/hs-cryptonite-conduit/Makefile2
-rw-r--r--security/hs-cryptonite/Makefile2
-rw-r--r--security/hs-digest/Makefile2
-rw-r--r--security/hs-ed25519/Makefile2
-rw-r--r--security/hs-entropy/Makefile4
-rw-r--r--security/hs-entropy/distinfo6
-rw-r--r--security/hs-gnutls/Makefile2
-rw-r--r--security/hs-hackage-security/Makefile2
-rw-r--r--security/hs-hackage-security/files/patch-hackage-security.cabal18
-rw-r--r--security/hs-monadcryptorandom/Makefile2
-rw-r--r--security/hs-nonce/Makefile2
-rw-r--r--security/hs-pem/Makefile2
-rw-r--r--security/hs-pureMD5/Makefile2
-rw-r--r--security/hs-pwstore-fast/Makefile2
-rw-r--r--security/hs-skein/Makefile2
-rw-r--r--security/hs-tls-session-manager/Makefile2
-rw-r--r--security/hs-tls/Makefile2
-rw-r--r--security/hs-x509-store/Makefile2
-rw-r--r--security/hs-x509-system/Makefile2
-rw-r--r--security/hs-x509-validation/Makefile2
-rw-r--r--security/hs-x509/Makefile2
-rw-r--r--shells/hs-shelly/Makefile2
-rw-r--r--sysutils/hs-angel/Makefile6
-rw-r--r--sysutils/hs-cpu/Makefile2
-rw-r--r--sysutils/hs-disk-free-space/Makefile2
-rw-r--r--sysutils/hs-ekg-core/Makefile2
-rw-r--r--sysutils/hs-ekg-core/distinfo6
-rw-r--r--sysutils/hs-ekg-core/files/patch-ekg-core.cabal11
-rw-r--r--sysutils/hs-ekg-json/Makefile5
-rw-r--r--sysutils/hs-ekg-json/files/patch-ekg-json.cabal13
-rw-r--r--sysutils/hs-ekg/Makefile2
-rw-r--r--sysutils/hs-mountpoints/Makefile2
-rw-r--r--textproc/Makefile3
-rw-r--r--textproc/cgrep/Makefile2
-rw-r--r--textproc/hs-Diff/Makefile2
-rw-r--r--textproc/hs-HStringTemplate/Makefile2
-rw-r--r--textproc/hs-HsYAML/Makefile16
-rw-r--r--textproc/hs-HsYAML/distinfo3
-rw-r--r--textproc/hs-HsYAML/files/patch-HsYAML.cabal15
-rw-r--r--textproc/hs-HsYAML/pkg-descr6
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-attoparsec-iso8601/Makefile4
-rw-r--r--textproc/hs-attoparsec-iso8601/distinfo6
-rw-r--r--textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal10
-rw-r--r--textproc/hs-attoparsec/Makefile2
-rw-r--r--textproc/hs-bencode/Makefile2
-rw-r--r--textproc/hs-blaze-html/Makefile2
-rw-r--r--textproc/hs-blaze-markup/Makefile2
-rw-r--r--textproc/hs-blaze-markup/distinfo6
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-cassava/Makefile2
-rw-r--r--textproc/hs-cassava/files/patch-cassava.cabal11
-rw-r--r--textproc/hs-cmark-gfm/Makefile2
-rw-r--r--textproc/hs-cmark/Makefile2
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-doctemplates/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile2
-rw-r--r--textproc/hs-feed/Makefile2
-rw-r--r--textproc/hs-feed/distinfo6
-rw-r--r--textproc/hs-feed/files/patch-feed.cabal31
-rw-r--r--textproc/hs-hexpat/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-hs-bibutils/Makefile2
-rw-r--r--textproc/hs-hs-bibutils/distinfo6
-rw-r--r--textproc/hs-html-conduit/Makefile2
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-unicode/Makefile2
-rw-r--r--textproc/hs-hxt/Makefile2
-rw-r--r--textproc/hs-lhs2tex/Makefile2
-rw-r--r--textproc/hs-lhs2tex/distinfo6
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Document.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Main.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Math.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_NewCode.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs10
-rw-r--r--textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs10
-rw-r--r--textproc/hs-libxml-sax/Makefile2
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-libyaml/Makefile16
-rw-r--r--textproc/hs-libyaml/distinfo3
-rw-r--r--textproc/hs-libyaml/pkg-descr5
-rw-r--r--textproc/hs-magic/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo6
-rw-r--r--textproc/hs-pandoc-types/Makefile2
-rw-r--r--textproc/hs-pandoc-types/distinfo6
-rw-r--r--textproc/hs-pandoc/Makefile10
-rw-r--r--textproc/hs-pandoc/distinfo6
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal32
-rw-r--r--textproc/hs-parsec-numbers/Makefile1
-rw-r--r--textproc/hs-polyparse/Makefile4
-rw-r--r--textproc/hs-polyparse/distinfo6
-rw-r--r--textproc/hs-pretty-show/Makefile2
-rw-r--r--textproc/hs-regex-applicative/Makefile2
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile2
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-pcre/Makefile2
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-tdfa/Makefile2
-rw-r--r--textproc/hs-regex-tdfa/distinfo6
-rw-r--r--textproc/hs-rfc5051/Makefile4
-rw-r--r--textproc/hs-rfc5051/distinfo6
-rw-r--r--textproc/hs-scanner/Makefile2
-rw-r--r--textproc/hs-skylighting-core/Makefile2
-rw-r--r--textproc/hs-skylighting-core/distinfo6
-rw-r--r--textproc/hs-skylighting/Makefile2
-rw-r--r--textproc/hs-skylighting/distinfo6
-rw-r--r--textproc/hs-stringsearch/Makefile2
-rw-r--r--textproc/hs-stringsearch/files/patch-stringsearch.cabal11
-rw-r--r--textproc/hs-tagsoup/Makefile2
-rw-r--r--textproc/hs-tagstream-conduit/Makefile2
-rw-r--r--textproc/hs-texmath/Makefile2
-rw-r--r--textproc/hs-texmath/distinfo6
-rw-r--r--textproc/hs-unicode-transforms/Makefile16
-rw-r--r--textproc/hs-unicode-transforms/distinfo3
-rw-r--r--textproc/hs-unicode-transforms/pkg-descr3
-rw-r--r--textproc/hs-uri-bytestring-aeson/Makefile2
-rw-r--r--textproc/hs-uri-bytestring-aeson/distinfo6
-rw-r--r--textproc/hs-uri-bytestring/Makefile2
-rw-r--r--textproc/hs-uri-bytestring/distinfo6
-rw-r--r--textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal10
-rw-r--r--textproc/hs-uri-encode/Makefile2
-rw-r--r--textproc/hs-uri/Makefile2
-rw-r--r--textproc/hs-xml-conduit/Makefile2
-rw-r--r--textproc/hs-xml-hamlet/Makefile2
-rw-r--r--textproc/hs-xml-types/Makefile2
-rw-r--r--textproc/hs-xml/Makefile2
-rw-r--r--textproc/hs-xmlhtml/Makefile2
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal8
-rw-r--r--textproc/hs-yaml/Makefile4
-rw-r--r--textproc/hs-yaml/distinfo6
-rw-r--r--www/hs-DAV/Makefile2
-rw-r--r--www/hs-HTTP/Makefile2
-rw-r--r--www/hs-HTTP/distinfo6
-rw-r--r--www/hs-HTTP/files/patch-HTTP.cabal20
-rw-r--r--www/hs-authenticate/Makefile2
-rw-r--r--www/hs-cgi/Makefile4
-rw-r--r--www/hs-cgi/distinfo6
-rw-r--r--www/hs-cgi/files/patch-cgi.cabal16
-rw-r--r--www/hs-cookie/Makefile2
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-happstack-server/Makefile2
-rw-r--r--www/hs-happstack-server/distinfo6
-rw-r--r--www/hs-happstack-server/files/patch-happstack-server.cabal11
-rw-r--r--www/hs-heist/Makefile2
-rw-r--r--www/hs-heist/distinfo6
-rw-r--r--www/hs-hjsmin/Makefile2
-rw-r--r--www/hs-http-api-data/Makefile8
-rw-r--r--www/hs-http-api-data/distinfo6
-rw-r--r--www/hs-http-client-tls/Makefile2
-rw-r--r--www/hs-http-client/Makefile2
-rw-r--r--www/hs-http-conduit/Makefile2
-rw-r--r--www/hs-http-date/Makefile2
-rw-r--r--www/hs-http-reverse-proxy/Makefile2
-rw-r--r--www/hs-http-server/Makefile2
-rw-r--r--www/hs-http-types/Makefile2
-rw-r--r--www/hs-http-types/distinfo6
-rw-r--r--www/hs-http2/Makefile2
-rw-r--r--www/hs-multipart/Makefile2
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-path-pieces/Makefile2
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile2
-rw-r--r--www/hs-snap-core/Makefile2
-rw-r--r--www/hs-snap-server/Makefile2
-rw-r--r--www/hs-snap-server/files/patch-snap-server.cabal16
-rw-r--r--www/hs-snap/Makefile1
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-wai-app-static/Makefile2
-rw-r--r--www/hs-wai-extra/Makefile2
-rw-r--r--www/hs-wai-logger/Makefile2
-rw-r--r--www/hs-wai/Makefile2
-rw-r--r--www/hs-warp-tls/Makefile2
-rw-r--r--www/hs-warp/Makefile2
-rw-r--r--www/hs-webkit/Makefile2
-rw-r--r--www/hs-xss-sanitize/Makefile2
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile2
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo6
-rw-r--r--www/hs-yesod-auth/Makefile2
-rw-r--r--www/hs-yesod-auth/distinfo6
-rw-r--r--www/hs-yesod-bin/Makefile1
-rw-r--r--www/hs-yesod-bin/files/patch-yesod-bin.cabal11
-rw-r--r--www/hs-yesod-core/Makefile2
-rw-r--r--www/hs-yesod-form/Makefile2
-rw-r--r--www/hs-yesod-persistent/Makefile2
-rw-r--r--www/hs-yesod-persistent/distinfo6
-rw-r--r--www/hs-yesod-static/Makefile2
-rw-r--r--www/hs-yesod-test/Makefile2
-rw-r--r--www/hs-yesod/Makefile2
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile2
-rw-r--r--x11-toolkits/hs-GLUT/Makefile4
-rw-r--r--x11-toolkits/hs-GLUT/distinfo6
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo6
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo6
-rw-r--r--x11-toolkits/hs-gtk/Makefile2
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/hs-pango/Makefile2
-rw-r--r--x11-toolkits/hs-vte/Makefile2
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile2
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal10
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile1
-rw-r--r--x11-wm/hs-xmonad/Makefile1
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile2
-rw-r--r--x11/hs-xmobar/Makefile12
-rw-r--r--x11/hs-xmobar/distinfo6
772 files changed, 1798 insertions, 1905 deletions
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index b192555e499d..75ba704830c4 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tar
PORTVERSION= 0.5.1.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-tar/files/patch-tar.cabal b/archivers/hs-tar/files/patch-tar.cabal
new file mode 100644
index 000000000000..95780361a043
--- /dev/null
+++ b/archivers/hs-tar/files/patch-tar.cabal
@@ -0,0 +1,11 @@
+--- tar.cabal.orig 2018-03-09 15:46:26 UTC
++++ tar.cabal
+@@ -41,7 +41,7 @@ library
+ build-depends: base == 4.*,
+ filepath < 1.5,
+ array < 0.6,
+- containers >= 0.2 && < 0.6,
++ containers >= 0.2 && < 0.7,
+ deepseq >= 1.1 && < 1.5
+
+ if flag(old-time)
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index e7ea744ee74b..56d3b6624070 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.3.2.4
+PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= archivers haskell
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 33032289f8d2..ea184c490deb 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523638345
-SHA256 (cabal/zip-archive-0.3.2.4.tar.gz) = 20612ed34d8d14deef120440c75f951a5c92c9f39f0de1b82ebac6d5923b3785
-SIZE (cabal/zip-archive-0.3.2.4.tar.gz) = 18370
+TIMESTAMP = 1546094995
+SHA256 (cabal/zip-archive-0.4.tar.gz) = 5fbea91d95ae1b1ec73aed8a8c67c8bae89bc3b6f7d9da898f07209e4a4ada19
+SIZE (cabal/zip-archive-0.4.tar.gz) = 20859
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 664da89d74cf..33b4de3df748 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index f49249e77bf1..ebe2f073c2c8 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zlib
PORTVERSION= 0.6.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index dd550ccfc991..092cbfd08126 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ALUT
PORTVERSION= 2.4.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index b9faa3e6cfa5..5e1d7e9ab45b 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenAL
PORTVERSION= 1.7.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index c611e110c9b3..e34b9c545e30 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.9.0.8
+PORTVERSION= 0.9.0.9
PORTREVISION= 1
CATEGORIES= audio haskell
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 4a520cedd255..064673f83d9c 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524150587
-SHA256 (cabal/libmpd-0.9.0.8.tar.gz) = 582b0a405e39148d3a5046e8ad00c9e217688e60c70393eb36cd651e1991ed4e
-SIZE (cabal/libmpd-0.9.0.8.tar.gz) = 38932
+TIMESTAMP = 1545836737
+SHA256 (cabal/libmpd-0.9.0.9.tar.gz) = 5b867ee675de1f490e58f5cb3903e1ea7e430ebca4b6d86e6b9c2c1c87a861a4
+SIZE (cabal/libmpd-0.9.0.9.tar.gz) = 38960
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index ef85039a141d..1b1dc0061107 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -28,6 +28,7 @@
SUBDIR += himenobench
SUBDIR += hpl
SUBDIR += hs-criterion
+ SUBDIR += hs-criterion-measurement
SUBDIR += httperf
SUBDIR += imb
SUBDIR += interbench
diff --git a/benchmarks/hs-criterion-measurement/Makefile b/benchmarks/hs-criterion-measurement/Makefile
new file mode 100644
index 000000000000..67b3ba7fd636
--- /dev/null
+++ b/benchmarks/hs-criterion-measurement/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= criterion-measurement
+PORTVERSION= 0.1.1.0
+PORTREVISION= 1
+CATEGORIES= benchmarks haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Criterion measurement functionality and associated types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson base-compat vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/benchmarks/hs-criterion-measurement/distinfo b/benchmarks/hs-criterion-measurement/distinfo
new file mode 100644
index 000000000000..6ccdbb723f72
--- /dev/null
+++ b/benchmarks/hs-criterion-measurement/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546179688
+SHA256 (cabal/criterion-measurement-0.1.1.0.tar.gz) = f5f87769386a927dbf487d2f256fc6804f2902078e86dcf113e35178a582ab56
+SIZE (cabal/criterion-measurement-0.1.1.0.tar.gz) = 16423
diff --git a/benchmarks/hs-criterion-measurement/pkg-descr b/benchmarks/hs-criterion-measurement/pkg-descr
new file mode 100644
index 000000000000..64825fc44c7b
--- /dev/null
+++ b/benchmarks/hs-criterion-measurement/pkg-descr
@@ -0,0 +1,4 @@
+Measurement-related functionality extracted from Criterion, with minimal
+dependencies. The rationale for this is to enable alternative analysis front-ends.
+
+WWW: https://github.com/bos/criterion
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 5aa28f644c9a..cd6376c88e7c 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 1.4.1.0
+PORTVERSION= 1.5.3.0
PORTREVISION= 1
CATEGORIES= benchmarks haskell
@@ -12,9 +12,10 @@ COMMENT= Robust, reliable performance measurement and analysis
LICENSE= BSD3CLAUSE
USE_CABAL= aeson ansi-wl-pprint base-compat base-compat-batteries \
- cassava code-page exceptions Glob js-flot js-jquery \
- microstache mtl mwc-random optparse-applicative statistics \
- transformers-compat vector vector-algorithms
+ cassava code-page criterion-measurement exceptions Glob \
+ js-flot js-jquery microstache mtl mwc-random \
+ optparse-applicative statistics transformers-compat vector \
+ vector-algorithms
INSTALL_PORTEXAMPLES= \
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index 89a0e29d642b..b7962fe1a0a3 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525009665
-SHA256 (cabal/criterion-1.4.1.0.tar.gz) = c49306676aa7927c3ca3c1807b081d1e86771eb8da99c8391f9c4dacb24a826c
-SIZE (cabal/criterion-1.4.1.0.tar.gz) = 130976
+TIMESTAMP = 1546158685
+SHA256 (cabal/criterion-1.5.3.0.tar.gz) = b602a99439de710778b8d8ad4a3799caf872db4c8c793bfd13b725aa936c049f
+SIZE (cabal/criterion-1.5.3.0.tar.gz) = 118552
diff --git a/converters/hs-aeson-compat/Makefile b/converters/hs-aeson-compat/Makefile
index dbc4cdc5a23b..25a9e5d50a83 100644
--- a/converters/hs-aeson-compat/Makefile
+++ b/converters/hs-aeson-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aeson-compat
-PORTVERSION= 0.3.7.1
+PORTVERSION= 0.3.9
PORTREVISION= 1
CATEGORIES= converters haskell
diff --git a/converters/hs-aeson-compat/distinfo b/converters/hs-aeson-compat/distinfo
index c857e8367439..00762e554d5c 100644
--- a/converters/hs-aeson-compat/distinfo
+++ b/converters/hs-aeson-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524342688
-SHA256 (cabal/aeson-compat-0.3.7.1.tar.gz) = 59740dc1e37b08e60abb47f38b87de5b9805611a1b468cd18294d5982a1dcacb
-SIZE (cabal/aeson-compat-0.3.7.1.tar.gz) = 6913
+TIMESTAMP = 1545681160
+SHA256 (cabal/aeson-compat-0.3.9.tar.gz) = e043941ba761c13a3854fc087521b864b56b2df874154e42aedb67b2a77f23c8
+SIZE (cabal/aeson-compat-0.3.9.tar.gz) = 7441
diff --git a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
deleted file mode 100644
index ece7354ed571..000000000000
--- a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
+++ /dev/null
@@ -1,21 +0,0 @@
---- aeson-compat.cabal.orig 2017-07-24 12:29:50 UTC
-+++ aeson-compat.cabal
-@@ -31,14 +31,14 @@ library
- src
- ghc-options: -Wall
- build-depends:
-- base >=4.6 && <4.11
-- , base-compat >=0.6.0 && <0.10
-- , aeson >=0.7.0.6 && <1.3
-+ base >=4.6 && <4.12
-+ , base-compat >=0.6.0 && <0.11
-+ , aeson >=0.7.0.6 && <1.4
- , attoparsec >=0.12 && <0.14
- , attoparsec-iso8601 >=1.0.0.0 && <1.1
- , bytestring >=0.10 && <0.11
- , containers >=0.5 && <0.6
-- , exceptions >=0.8 && <0.9
-+ , exceptions >=0.8 && <0.11
- , hashable >=1.2 && <1.3
- , scientific >=0.3 && <0.4
- , text >=1.2 && <1.3
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
index 596b68f6b3b2..46c7ffd3c77e 100644
--- a/converters/hs-aeson-pretty/Makefile
+++ b/converters/hs-aeson-pretty/Makefile
@@ -2,7 +2,7 @@
PORTNAME= aeson-pretty
PORTVERSION= 0.8.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index a4debf7cf589..8a55c8c30115 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -2,7 +2,7 @@
PORTNAME= aeson
PORTVERSION= 1.3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index e51e71ef7c3e..8a993988edd7 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,7 +3,7 @@
PORTNAME= json
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
index 1bcd5b1a6f5a..bbea70d5eeeb 100644
--- a/converters/hs-sandi/Makefile
+++ b/converters/hs-sandi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sandi
-PORTVERSION= 0.4.2
+PORTVERSION= 0.4.3
PORTREVISION= 1
CATEGORIES= converters haskell
@@ -14,5 +14,9 @@ CONFLICTS_INSTALL= hs-dataenc-[0-9]*
USE_CABAL= conduit exceptions stringsearch
+post-extract:
+ ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs
+ ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
index 81db367b0bcd..49114eccdc77 100644
--- a/converters/hs-sandi/distinfo
+++ b/converters/hs-sandi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524431120
-SHA256 (cabal/sandi-0.4.2.tar.gz) = 2bc1fc4f8e71009adc9f38304f63684f2795c31077670214147f261bd2bc7337
-SIZE (cabal/sandi-0.4.2.tar.gz) = 19198
+TIMESTAMP = 1545835387
+SHA256 (cabal/sandi-0.4.3.tar.gz) = 76dc1332023b49635d9ae2fa7f3d0618f05fbe6dfdfe54416d19c16993fd214a
+SIZE (cabal/sandi-0.4.3.tar.gz) = 19237
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
index 08073021445c..34d2eb7408e1 100644
--- a/databases/hs-esqueleto/Makefile
+++ b/databases/hs-esqueleto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= esqueleto
PORTVERSION= 2.5.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile
index e626873f9e98..88b221f23571 100644
--- a/databases/hs-hedis/Makefile
+++ b/databases/hs-hedis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hedis
PORTVERSION= 0.10.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index 7f1fbaff4d16..f1a23c1070a5 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mysql
PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index 008a91479cee..699fd2000f95 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 2.8.1.2
+PORTVERSION= 2.9.1
PORTREVISION= 1
CATEGORIES= databases haskell
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 0151970acef4..fb57fcff0a9e 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525169028
-SHA256 (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2f7157f3830370f60c7c36490ea49b7c52caf0f2a7349f86cf47970189f9ad0c
-SIZE (cabal/persistent-sqlite-2.8.1.2.tar.gz) = 2044695
+TIMESTAMP = 1546102088
+SHA256 (cabal/persistent-sqlite-2.9.1.tar.gz) = 52407dd8195f36462e0dce9cea75176b9eaa3f0adf2feef6ca3ff01f422905d2
+SIZE (cabal/persistent-sqlite-2.9.1.tar.gz) = 2169017
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 9aa60ba48c2a..a13d1d10eca0 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -2,7 +2,7 @@
PORTNAME= persistent-template
PORTVERSION= 2.5.4
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-template/files/patch-persistent-template.cabal b/databases/hs-persistent-template/files/patch-persistent-template.cabal
index be71582a8075..04b069714821 100644
--- a/databases/hs-persistent-template/files/patch-persistent-template.cabal
+++ b/databases/hs-persistent-template/files/patch-persistent-template.cabal
@@ -1,6 +1,6 @@
---- persistent-template.cabal.orig 2018-05-01 13:03:22 UTC
+--- persistent-template.cabal.orig 2018-03-08 15:56:53 UTC
+++ persistent-template.cabal
-@@ -23,7 +23,7 @@ library
+@@ -23,13 +23,13 @@ library
, text >= 0.5
, transformers >= 0.2 && < 0.6
, containers
@@ -9,3 +9,10 @@
, aeson-compat >= 0.3.2.0 && < 0.4
, monad-logger
, unordered-containers
+ , tagged
+ , path-pieces
+- , http-api-data >= 0.2 && < 0.4
++ , http-api-data >= 0.2 && < 0.5
+ , ghc-prim
+ exposed-modules: Database.Persist.TH
+ ghc-options: -Wall
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 695e77d385f4..c6fbb62b3ed7 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 2.8.2
+PORTVERSION= 2.9.0
PORTREVISION= 1
CATEGORIES= databases haskell
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index 95e379803d48..5dddd4ac79f9 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524929752
-SHA256 (cabal/persistent-2.8.2.tar.gz) = 696bb279259e307778dc7fbd49565c48a66429f14e793a41a13cfae0968c1ec0
-SIZE (cabal/persistent-2.8.2.tar.gz) = 58648
+TIMESTAMP = 1546018609
+SHA256 (cabal/persistent-2.9.0.tar.gz) = e7865ceb4aa1e93ca8c65c789f92c8046a39ecf41283682bcace33e89b77f261
+SIZE (cabal/persistent-2.9.0.tar.gz) = 60901
diff --git a/databases/hs-persistent/files/patch-persistent.cabal b/databases/hs-persistent/files/patch-persistent.cabal
new file mode 100644
index 000000000000..3494ecaa6136
--- /dev/null
+++ b/databases/hs-persistent/files/patch-persistent.cabal
@@ -0,0 +1,11 @@
+--- persistent.cabal.orig 2018-10-14 06:53:03 UTC
++++ persistent.cabal
+@@ -33,7 +33,7 @@ library
+ , resourcet >= 1.1.10
+ , resource-pool >= 0.2.2.0
+ , path-pieces >= 0.1
+- , http-api-data >= 0.2 && < 0.4
++ , http-api-data >= 0.2 && < 0.5
+ , aeson >= 0.5
+ , monad-logger >= 0.3.28
+ , base64-bytestring
diff --git a/deskutils/hs-fdo-notify/Makefile b/deskutils/hs-fdo-notify/Makefile
index 20edd67bbc29..d2ac3b2864bd 100644
--- a/deskutils/hs-fdo-notify/Makefile
+++ b/deskutils/hs-fdo-notify/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fdo-notify
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index c41cbe65770c..cec8d4011b4e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -974,6 +974,7 @@
SUBDIR += hs-basement
SUBDIR += hs-basic-prelude
SUBDIR += hs-bifunctors
+ SUBDIR += hs-bitarrays
SUBDIR += hs-bits-atomic
SUBDIR += hs-blaze-builder
SUBDIR += hs-blaze-textual
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 9cb15582c3a2..7cb9856bc6cb 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Boolean
PORTVERSION= 0.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index 554ef0c129ab..79c510347105 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 7b03c92fade7..75c544cb8d4f 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile
index 07626bc9f892..6497ef7a937d 100644
--- a/devel/hs-EdisonAPI/Makefile
+++ b/devel/hs-EdisonAPI/Makefile
@@ -2,7 +2,7 @@
PORTNAME= EdisonAPI
PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile
index 726321a0b2e4..314929a174e8 100644
--- a/devel/hs-EdisonCore/Makefile
+++ b/devel/hs-EdisonCore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= EdisonCore
PORTVERSION= 1.3.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-GenericPretty/Makefile b/devel/hs-GenericPretty/Makefile
index 7d316066b80f..2a5a80ad7bf7 100644
--- a/devel/hs-GenericPretty/Makefile
+++ b/devel/hs-GenericPretty/Makefile
@@ -2,6 +2,7 @@
PORTNAME= GenericPretty
DISTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= hello@blubee.me
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index 3cf2b5ed27ec..abdb5f66917a 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= Glob
-PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTVERSION= 0.10.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Glob/distinfo b/devel/hs-Glob/distinfo
index af2aff5a2e01..8515c771a808 100644
--- a/devel/hs-Glob/distinfo
+++ b/devel/hs-Glob/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499452388
-SHA256 (cabal/Glob-0.8.0.tar.gz) = 38f011be0e7818ab1e76880882b15217cd7d5be56a3dab631c14d614e2b2e896
-SIZE (cabal/Glob-0.8.0.tar.gz) = 23943
+TIMESTAMP = 1545559590
+SHA256 (cabal/Glob-0.10.0.tar.gz) = 473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324
+SIZE (cabal/Glob-0.10.0.tar.gz) = 29500
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 5245a776a6a0..69cdb71ee57e 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HUnit
PORTVERSION= 1.6.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 69635bffc48e..552426214f0d 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 2528b677477a..71452d5d931f 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -2,7 +2,7 @@
PORTNAME= List
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ListLike/Makefile b/devel/hs-ListLike/Makefile
index de97e7124ee4..20879b3beb20 100644
--- a/devel/hs-ListLike/Makefile
+++ b/devel/hs-ListLike/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ListLike
PORTVERSION= 4.6
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ListLike/files/patch-ListLike.cabal b/devel/hs-ListLike/files/patch-ListLike.cabal
new file mode 100644
index 000000000000..eb05615b136c
--- /dev/null
+++ b/devel/hs-ListLike/files/patch-ListLike.cabal
@@ -0,0 +1,11 @@
+--- ListLike.cabal.orig 2018-01-17 03:21:02 UTC
++++ ListLike.cabal
+@@ -50,7 +50,7 @@ Library
+ Data.ListLike.FMList
+ -- Other-Modules: Data.ConfigFile.Lexer
+ Build-Depends: base >= 4.6 && < 5
+- ,containers >= 0.3 && < 0.6
++ ,containers >= 0.3 && < 0.7
+ ,bytestring >= 0.9.1 && < 0.11
+ ,array >= 0.3 && < 0.6
+ ,text >= 0.11 && < 1.3
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index d1c524794328..359a05c8cc1f 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MemoTrie
PORTVERSION= 0.6.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 999afdd85a6a..b6e781932465 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MissingH
PORTVERSION= 1.4.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,6 +11,8 @@ COMMENT= Large utility library
LICENSE= BSD3CLAUSE
+BROKEN= Doesn't compile with newest GHC
+
USE_CABAL= hslogger HUnit mtl network old-time random regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index 78cdfcebc1bc..fec4a06be173 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MonadRandom
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 6713634f9bdc..fa03084fc8a2 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ObjectName
PORTVERSION= 1.1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Only/Makefile b/devel/hs-Only/Makefile
index ddf8bc03ea30..fb0952e20cb2 100644
--- a/devel/hs-Only/Makefile
+++ b/devel/hs-Only/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Only
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 602156be6bdf..7b48c83fcd33 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= QuickCheck
PORTVERSION= 2.10.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 2f945c6dfe09..790e2ace1ea6 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ReadArgs
PORTVERSION= 1.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index cf4c9a5b4fdd..0413dd1dc845 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -2,7 +2,7 @@
PORTNAME= STMonadTrans
PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 5c1497f2da7c..f6fc65b49312 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 9c56db75b05d..a27d87939ccd 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ShellCheck
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= pizzamig@FreeBSD.org
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index e5b09dde2245..0d977cd2f0e5 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= StateVar
-PORTVERSION= 1.1.0.4
-PORTREVISION= 3
+PORTVERSION= 1.1.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
index ecf2f362f8b5..012e946be278 100644
--- a/devel/hs-StateVar/distinfo
+++ b/devel/hs-StateVar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499443877
-SHA256 (cabal/StateVar-1.1.0.4.tar.gz) = 7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7
-SIZE (cabal/StateVar-1.1.0.4.tar.gz) = 4587
+TIMESTAMP = 1545490750
+SHA256 (cabal/StateVar-1.1.1.1.tar.gz) = eb6436516ab2d5e3d3e070b5a1595c4dceea760a58a9cc8d23dad5f6008f2223
+SIZE (cabal/StateVar-1.1.1.1.tar.gz) = 4762
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 9db1161c2ee0..39615a7a1cd0 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.7.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 702b757b58ab..eb7a9928b016 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index 6f57c7e57514..819b43bab069 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= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 319d4a5d0a3a..cae853705d2a 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= 3
+PORTREVISION= 5
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 0dfb929b58a4..b39d8f612726 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -5,7 +5,7 @@
Build-Depends:
- base >= 4.0 && < 4.10,
- QuickCheck >= 2.4 && < 2.9
-+ base >= 4.0 && < 4.12,
++ base >= 4.0 && < 4.13,
+ QuickCheck >= 2.4 && < 2.11
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index ab970e3ebf1c..90b8f970eec9 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alex
PORTVERSION= 3.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index f6899c772649..bce668e1afb6 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ansi-terminal
PORTVERSION= 0.8.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index f31bf87b42e3..39bb24050ad7 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 4886390b7e6c..951d5cd871c0 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 2fb35ab33279..2a3f73c1b956 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index c6821bae237b..73618246ae36 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index 48eb1631180f..e3f387078419 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index 5ad72ea53f38..b625065575d4 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index cbe77e1093a3..f6c25eaaf285 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -2,7 +2,7 @@
PORTNAME= async
PORTVERSION= 2.2.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/files/patch-async.cabal b/devel/hs-async/files/patch-async.cabal
new file mode 100644
index 000000000000..4bf49a1d7138
--- /dev/null
+++ b/devel/hs-async/files/patch-async.cabal
@@ -0,0 +1,11 @@
+--- async.cabal.orig 2018-02-04 16:37:42 UTC
++++ async.cabal
+@@ -50,7 +50,7 @@ library
+ if impl(ghc>=7.1)
+ other-extensions: Trustworthy
+ exposed-modules: Control.Concurrent.Async
+- build-depends: base >= 4.3 && < 4.12, hashable >= 1.1.1.0 && < 1.3, stm >= 2.2 && < 2.5
++ build-depends: base >= 4.3 && < 4.13, hashable >= 1.1.1.0 && < 1.3, stm >= 2.2 && < 2.6
+
+ test-suite test-async
+ default-language: Haskell2010
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index c3eed8f9b88a..3b79ae661d7d 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -2,7 +2,7 @@
PORTNAME= atomic-primops
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/files/patch-atomic-primops.cabal b/devel/hs-atomic-primops/files/patch-atomic-primops.cabal
new file mode 100644
index 000000000000..8e6cc6ec8f98
--- /dev/null
+++ b/devel/hs-atomic-primops/files/patch-atomic-primops.cabal
@@ -0,0 +1,11 @@
+--- atomic-primops.cabal.orig 2018-03-09 00:46:22 UTC
++++ atomic-primops.cabal
+@@ -49,7 +49,7 @@ Library
+
+ -- casMutVar# had a bug in GHC 7.2, thus we require GHC 7.4 or greater
+ -- (base 4.5 or greater). We also need the "Any" kind.
+- build-depends: base >= 4.6.0.0 && < 4.12, ghc-prim, primitive
++ build-depends: base >= 4.6.0.0 && < 4.13, ghc-prim, primitive
+
+ -- TODO: Try to push support back to 7.0, but make it default to an implementation
+ -- other than Unboxed.
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index 2ea9f8b1c792..abb69474b00b 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-compat-batteries/Makefile b/devel/hs-base-compat-batteries/Makefile
index 10bbb957b90c..feebba825c89 100644
--- a/devel/hs-base-compat-batteries/Makefile
+++ b/devel/hs-base-compat-batteries/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-compat-batteries
PORTVERSION= 0.10.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile
index d5cbf2d03fc1..95c0a6815fdd 100644
--- a/devel/hs-base-compat/Makefile
+++ b/devel/hs-base-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= base-compat
-PORTVERSION= 0.10.1
+PORTVERSION= 0.10.5
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo
index fc4342052a2a..2e3c002d7ada 100644
--- a/devel/hs-base-compat/distinfo
+++ b/devel/hs-base-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525011068
-SHA256 (cabal/base-compat-0.10.1.tar.gz) = b2ec2193d4a76a92c0ddcd69bb1b5879d50c98dd38422b0d86f85aea3112bb6d
-SIZE (cabal/base-compat-0.10.1.tar.gz) = 31954
+TIMESTAMP = 1545832489
+SHA256 (cabal/base-compat-0.10.5.tar.gz) = 990aea21568956d44ab018c5dbfbaea014b9a0d5295d29ca7550149419a6fb41
+SIZE (cabal/base-compat-0.10.5.tar.gz) = 33158
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
index 778f58602ca6..650642b81429 100644
--- a/devel/hs-base-orphans/Makefile
+++ b/devel/hs-base-orphans/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= base-orphans
-PORTVERSION= 0.6
-PORTREVISION= 3
+PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
index 914152611128..f429bafa4c53 100644
--- a/devel/hs-base-orphans/distinfo
+++ b/devel/hs-base-orphans/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444442
-SHA256 (cabal/base-orphans-0.6.tar.gz) = c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e
-SIZE (cabal/base-orphans-0.6.tar.gz) = 18087
+TIMESTAMP = 1545676672
+SHA256 (cabal/base-orphans-0.8.tar.gz) = aceec656bfb4222ad3035c3d87d80130b42b595b72888f9ab59c6dbb7ed24817
+SIZE (cabal/base-orphans-0.8.tar.gz) = 19606
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 8714c9d08064..d76de9a75dd5 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 9d66f051b22c..d8798bba41a1 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= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index ad8d8fd23501..2b3294664846 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= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basement/Makefile b/devel/hs-basement/Makefile
index 3d1a30b1fafb..c28ae7cb5357 100644
--- a/devel/hs-basement/Makefile
+++ b/devel/hs-basement/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= basement
-PORTVERSION= 0.0.7
+PORTVERSION= 0.0.8
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-basement/distinfo b/devel/hs-basement/distinfo
index a99967e24fac..3a118eed4555 100644
--- a/devel/hs-basement/distinfo
+++ b/devel/hs-basement/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523131438
-SHA256 (cabal/basement-0.0.7.tar.gz) = b501b9b378f35b80c60321031dbbf9ed7af46c66353f072e00f00abdd2244f70
-SIZE (cabal/basement-0.0.7.tar.gz) = 133178
+TIMESTAMP = 1545492262
+SHA256 (cabal/basement-0.0.8.tar.gz) = c7f41b97f2b0a71804c3c7d760047dc9adc9734e789084ca1198c4764ce192a4
+SIZE (cabal/basement-0.0.8.tar.gz) = 134739
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index 20dd4a88b3a4..9c641d50e36a 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -2,7 +2,7 @@
PORTNAME= basic-prelude
PORTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index b0113da25ca0..aed0fda1ed3f 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 5.5.2
+PORTVERSION= 5.5.3
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index ef67a3242c6a..81a64f0ec82a 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523787744
-SHA256 (cabal/bifunctors-5.5.2.tar.gz) = 332bb2ea19e77dac55282daff8046d89f69514ced5b987779d887e53b5d7cb11
-SIZE (cabal/bifunctors-5.5.2.tar.gz) = 37983
+TIMESTAMP = 1545676170
+SHA256 (cabal/bifunctors-5.5.3.tar.gz) = d434528fd2ea765bace57c4ade0bc9fa32ba2c425f563b33a4b60f625ecfc9ca
+SIZE (cabal/bifunctors-5.5.3.tar.gz) = 40366
diff --git a/devel/hs-bifunctors/files/patch-bifunctors.cabal b/devel/hs-bifunctors/files/patch-bifunctors.cabal
deleted file mode 100644
index 02e2dfd47322..000000000000
--- a/devel/hs-bifunctors/files/patch-bifunctors.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- bifunctors.cabal.orig 2018-04-15 11:07:07 UTC
-+++ bifunctors.cabal
-@@ -43,7 +43,7 @@ library
- base-orphans >= 0.5.2 && < 1,
- comonad >= 4 && < 6,
- containers >= 0.1 && < 0.6,
-- template-haskell >= 2.4 && < 2.13,
-+ template-haskell >= 2.4 && < 2.14,
- th-abstraction >= 0.2.2 && < 0.3,
- transformers >= 0.2 && < 0.6,
- transformers-compat >= 0.5 && < 0.6
diff --git a/devel/hs-bitarray/Makefile b/devel/hs-bitarray/Makefile
new file mode 100644
index 000000000000..a8eef3dcabfe
--- /dev/null
+++ b/devel/hs-bitarray/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+PORTNAME= bitarray
+PORTVERSION= 0.0.1.1
+PORTREVISION= 1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Mutable and immutable bit arrays
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-bitarray/distinfo b/devel/hs-bitarray/distinfo
new file mode 100644
index 000000000000..326667ebf96b
--- /dev/null
+++ b/devel/hs-bitarray/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546106508
+SHA256 (cabal/bitarray-0.0.1.1.tar.gz) = b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802
+SIZE (cabal/bitarray-0.0.1.1.tar.gz) = 3701
diff --git a/devel/hs-bitarray/pkg-descr b/devel/hs-bitarray/pkg-descr
new file mode 100644
index 000000000000..968247895ca1
--- /dev/null
+++ b/devel/hs-bitarray/pkg-descr
@@ -0,0 +1,3 @@
+Mutable and immutable bit arrays.
+
+WWW: https://github.com/bos/math-functions
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 80bc5dffc863..b0477c692968 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= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index f772a7acf61c..b915df2ed084 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-builder
PORTVERSION= 0.4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index e39294c18379..6c9c24f2c6bb 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 56f828fcfa5f..18eef3d640d9 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 2.0.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index 3c49e6668270..6dbf88fb111f 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= boxes
PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index e8682699b7aa..4573e3199aa0 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= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index 0df757725149..120e0d5f5e78 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 5bf7d6b9edcd..1cda2506e52f 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index 64f4ecc0f073..f2fe3c4f98ac 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
index 7562ae3e700e..553849f5556f 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 702d4a345eca..4e6cdbfb6cf6 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index 9fb44ec6cc23..f8d06508b1f5 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= 6
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/files/patch-bytestring-show.cabal b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
index fa60616d91cd..4ce05dd94cae 100644
--- a/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
+++ b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
@@ -5,7 +5,7 @@
library
- build-depends: base < 5, binary < 0.8, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
-+ build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
++ build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.7
exposed-modules:
Text.Show.ByteString
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 9437925eb0ba..f383f366ae0a 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.28.3
-PORTREVISION= 3
+PORTVERSION= 0.28.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index 508a59745bf5..189c3a166a4e 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513181196
-SHA256 (cabal/c2hs-0.28.3.tar.gz) = 80cc6db945ee7c0328043b4e69213b2a1cb0806fb35c8362f9dea4a2c312f1cc
-SIZE (cabal/c2hs-0.28.3.tar.gz) = 253559
+TIMESTAMP = 1545846841
+SHA256 (cabal/c2hs-0.28.6.tar.gz) = 91dd121ac565009f2fc215c50f3365ed66705071a698a545e869041b5d7ff4da
+SIZE (cabal/c2hs-0.28.6.tar.gz) = 204988
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 1827732bfbca..03b3f55e86ad 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 2.2.0.0
-PORTREVISION= 2
+PORTVERSION= 2.4.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= async base16-bytestring base64-bytestring \
cryptohash-sha256 echo ed25519 edit-distance \
hackage-security hashable HTTP mtl network network-uri \
- random resolv tar zlib
+ random resolv tar zip-archive zlib
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index f3b8a3bc4d12..7f673b3d2951 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523277454
-SHA256 (cabal/cabal-install-2.2.0.0.tar.gz) = c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9
-SIZE (cabal/cabal-install-2.2.0.0.tar.gz) = 662421
+TIMESTAMP = 1546095159
+SHA256 (cabal/cabal-install-2.4.0.0.tar.gz) = 1329e9564b736b0cfba76d396204d95569f080e7c54fe355b6d9618e3aa0bef6
+SIZE (cabal/cabal-install-2.4.0.0.tar.gz) = 614491
diff --git a/devel/hs-cabal-install/files/patch-cabal-install.cabal b/devel/hs-cabal-install/files/patch-cabal-install.cabal
new file mode 100644
index 000000000000..f7472f03ca18
--- /dev/null
+++ b/devel/hs-cabal-install/files/patch-cabal-install.cabal
@@ -0,0 +1,11 @@
+--- cabal-install.cabal.orig 1970-01-01 00:00:00 UTC
++++ cabal-install.cabal
+@@ -325,7 +325,7 @@ executable cabal
+ zlib >= 0.5.3 && < 0.7,
+ hackage-security >= 0.5.2.2 && < 0.6,
+ text >= 1.2.3 && < 1.3,
+- zip-archive >= 0.3.2.5 && < 0.4,
++ zip-archive >= 0.3.2.5 && < 0.5,
+ parsec >= 3.1.13.0 && < 3.2
+
+ if flag(native-dns)
diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile
index dd0bdcd21698..5761df5c2c29 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 7d6b12df1751..b59ad415cf99 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cereal
PORTVERSION= 0.5.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 0b1e0444c8d3..f53c743ecd6a 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -3,7 +3,7 @@
PORTNAME= checkers
PORTVERSION= 0.4.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index ff65f70a0223..b24a937b2aca 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -2,7 +2,7 @@
PORTNAME= chunked-data
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 9928bab0f75a..16e7b27dc71e 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index f4cfe351a028..2a8a9575ad9f 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525092204
-SHA256 (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 39ef2567a3542ebf91f6ebc103cc4afb64c2a4ec051c7ce578b577ef9931c424
-SIZE (cabal/classy-prelude-conduit-1.4.0.tar.gz) = 1979
+TIMESTAMP = 1546020418
+SHA256 (cabal/classy-prelude-conduit-1.5.0.tar.gz) = da27783595cd6b94ea5cb93f3e81084a664e65ed4766757a5e7f81fb3df8fd00
+SIZE (cabal/classy-prelude-conduit-1.5.0.tar.gz) = 1985
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index b847bbf37c11..c69bf56527cf 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index 0b2a4726f7fd..32fb5677f377 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525004675
-SHA256 (cabal/classy-prelude-1.4.0.tar.gz) = 2b3b255676ab0fdeb39aebafa3543535ddd684d00c645b643e50cb9e2d25f9e0
-SIZE (cabal/classy-prelude-1.4.0.tar.gz) = 12056
+TIMESTAMP = 1545847066
+SHA256 (cabal/classy-prelude-1.5.0.tar.gz) = d3bae4b17fdf73d7255f550ad172b1f709a8743371aa3a40c13c2cdc9fa7a4da
+SIZE (cabal/classy-prelude-1.5.0.tar.gz) = 12053
diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile
index ea55132d4f50..aa29c46f857e 100644
--- a/devel/hs-clock/Makefile
+++ b/devel/hs-clock/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clock
PORTVERSION= 0.7.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index ef4ed37fb1e5..4d787ca8a367 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cmdargs
PORTVERSION= 0.10.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile
index 934cc5f0ca67..7557bc3e5754 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile
index dc39c056419e..0a98af180c0e 100644
--- a/devel/hs-colour/Makefile
+++ b/devel/hs-colour/Makefile
@@ -2,7 +2,7 @@
PORTNAME= colour
PORTVERSION= 2.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile
index d8e01cb57d32..e5e3b6bba676 100644
--- a/devel/hs-concurrent-output/Makefile
+++ b/devel/hs-concurrent-output/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= concurrent-output
-PORTVERSION= 1.10.5
-PORTREVISION= 2
+PORTVERSION= 1.10.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo
index 1d3fd4ffc09a..6725bb321521 100644
--- a/devel/hs-concurrent-output/distinfo
+++ b/devel/hs-concurrent-output/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523694433
-SHA256 (cabal/concurrent-output-1.10.5.tar.gz) = 98c096228664d591eb2c352080955a202e883cdab8452efae3cae407e30fa5c3
-SIZE (cabal/concurrent-output-1.10.5.tar.gz) = 21970
+TIMESTAMP = 1545835357
+SHA256 (cabal/concurrent-output-1.10.9.tar.gz) = 8cc49408e957c65359182fbfcda80717b931915d101e4be55ccb26c44b098e57
+SIZE (cabal/concurrent-output-1.10.9.tar.gz) = 22177
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index 0d0f2bc5a642..3da1188d9d79 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -2,7 +2,7 @@
PORTNAME= conduit-combinators
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index a52e07bed353..0e54f93a6950 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= conduit-extra
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index 9b7a4ab35f74..fae9864a236a 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= conduit
PORTVERSION= 1.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 45a1115ae478..7fc9414fc06b 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
index 34e18b238b6e..043df51423d7 100644
--- a/devel/hs-constraints/Makefile
+++ b/devel/hs-constraints/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= constraints
-PORTVERSION= 0.10
+PORTVERSION= 0.10.1
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
index eda0daed2a9b..fa9219ec400b 100644
--- a/devel/hs-constraints/distinfo
+++ b/devel/hs-constraints/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523445706
-SHA256 (cabal/constraints-0.10.tar.gz) = c224b82e53c21791083c83fed2f2c938bd715a63c8efa90a5abcc3d8859126c6
-SIZE (cabal/constraints-0.10.tar.gz) = 19703
+TIMESTAMP = 1545654328
+SHA256 (cabal/constraints-0.10.1.tar.gz) = 5880ec261e053841b307c7c8c59614f46c2efbd5189f0f2a3c817589cedec3f7
+SIZE (cabal/constraints-0.10.1.tar.gz) = 19901
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 3e1d2e35de02..59954aeef9ef 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,7 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.1.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index fc8b7323d9a8..94b53cd151a2 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cpphs
PORTVERSION= 1.20.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index dd8233ad407a..0bba80a27d91 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darcs
PORTVERSION= 2.14.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,6 +11,8 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
+BROKEN= Doesn't build with recent GHC
+
USE_CABAL= async attoparsec base16-bytestring cryptohash \
data-ordlist fgl graphviz hashable html HTTP \
mmap mtl random \
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 000000000000..22b6c6930190
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,67 @@
+--- darcs.cabal.orig 2018-06-24 18:17:58 UTC
++++ darcs.cabal
+@@ -74,7 +74,7 @@ flag curl
+ description: Use libcurl for HTTP support.
+
+ -- in future this could extend to any other external libraries,
+--- e.g. libiconv
++-- e.g. libiconv
+ flag pkgconfig
+ description: Use pkgconfig to configure libcurl
+ default: False
+@@ -112,7 +112,7 @@ flag warn-as-error
+ -- ----------------------------------------------------------------------
+
+ custom-setup
+- setup-depends: base >= 4.9 && < 4.12,
++ setup-depends: base >= 4.9 && < 4.13,
+ Cabal >= 1.24,
+ process >= 1.2.3.0 && < 1.7,
+ filepath >= 1.4.1 && < 1.5.0.0,
+@@ -380,8 +380,8 @@ Library
+ else
+ build-depends: unix >= 2.7.1.0 && < 2.8
+
+- build-depends: base >= 4.9 && < 4.12,
+- stm >= 2.1 && < 2.5,
++ build-depends: base >= 4.9 && < 4.13,
++ stm >= 2.1 && < 2.6,
+ binary >= 0.5 && < 0.10,
+ containers >= 0.5.6.2 && < 0.7,
+ regex-compat-tdfa >= 0.95.1 && < 0.96,
+@@ -389,7 +389,7 @@ Library
+ mtl >= 2.2.1 && < 2.3,
+ transformers >= 0.4.2.0 && < 0.6,
+ parsec >= 3.1.9 && < 3.2,
+- fgl >= 5.5.2.3 && < 5.7,
++ fgl >= 5.5.2.3 && < 5.8,
+ graphviz >= 2999.18.1 && < 2999.20.1,
+ html >= 1.0.1.2 && < 1.1,
+ filepath >= 1.4.1 && < 1.5.0.0,
+@@ -401,7 +401,7 @@ Library
+ tar >= 0.5 && < 0.6,
+ data-ordlist == 0.4.*,
+ attoparsec >= 0.13.0.1 && < 0.14,
+- zip-archive >= 0.3 && < 0.4,
++ zip-archive >= 0.3 && < 0.5,
+ async >= 2.0.2 && < 2.3,
+ sandi >= 0.4 && < 0.5,
+ unix-compat >= 0.4.2 && < 0.6,
+@@ -499,7 +499,7 @@ Executable darcs
+ cc-options: -D_REENTRANT
+
+ build-depends: darcs,
+- base >= 4.9 && < 4.12
++ base >= 4.9 && < 4.13
+
+ -- ----------------------------------------------------------------------
+ -- unit test driver
+@@ -534,7 +534,7 @@ test-suite darcs-test
+ test-framework >= 0.8.1.1 && < 0.9,
+ test-framework-hunit >= 0.3.0.2 && < 0.4,
+ test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
+- zip-archive >= 0.3 && < 0.4
++ zip-archive >= 0.3 && < 0.5
+
+ -- https://github.com/yesodweb/Shelly.hs/issues/177
+ if os(windows)
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index ba18588daa01..ae7bc38afc66 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= 3
+PORTREVISION= 4
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 357aabacb87b..47224c96d7ec 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= 3
+PORTREVISION= 4
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 646197b904d0..3dcb7c5bdcac 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= 11
+PORTREVISION= 12
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 663df96c5c27..1cb2b62b6a31 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= 11
+PORTREVISION= 12
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 9381d32d6a3c..01e99f3727d2 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= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 8342c592db89..f91569e07754 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile
index 532f15260ccc..eacfcbdc8002 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index 828b0f62cb1f..7dad0f366849 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
index 5f5e8aae66ee..8675e5b75bc8 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index ee302546693e..ad016a9afae0 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-pprint
PORTVERSION= 0.2.4.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
index 7540b55da347..648b16e8289f 100644
--- a/devel/hs-data-pprint/files/patch-data-pprint.cabal
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -1,14 +1,24 @@
---- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC
+--- data-pprint.cabal.orig 2016-05-24 15:33:57 UTC
+++ data-pprint.cabal
+@@ -30,7 +30,7 @@ description:
+ > [1..10] === reverse [10..1]
+ > reverse [10..] === [1..]
+ > [1..] === [1..99] ++ [101..]
+- > ([1..], [1..]) === ([1..], [1..100])
++ > ([1..], [1..]) === ([1..], [1..100])
+ > (error "x", [1..]) === (0 `div` 0, reverse [1..])
+ > error ("xx" ++ show (length [1..])) === 1
+ > error ("xx" ++ error "yy") === 1
@@ -68,10 +68,10 @@ library
System.IO.Parallel
other-modules:
build-depends:
- base >= 4.0 && < 4.10,
-+ base >= 4.0 && < 4.12,
++ base >= 4.0 && < 4.13,
pretty >= 1.0 && < 1.2,
mtl >= 2.0 && < 2.3,
deepseq >= 1.1 && < 1.5,
- time >= 1.2 && < 1.6,
+ time >= 1.2 && < 1.9,
parallel >= 3.1 && < 3.3
+
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 8ee14fcd1060..644a878c46ba 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 0ad34fc1f188..6b36ac6f607d 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile
index d68450a2bbac..701e37286ec6 100644
--- a/devel/hs-dbus/Makefile
+++ b/devel/hs-dbus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dbus
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index 3b70dae180ff..0ef333455957 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -2,7 +2,7 @@
PORTNAME= deepseq-generics
PORTVERSION= 0.2.0.0
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
index 0a299b3510fe..4c00ca2ee16d 100644
--- a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
+++ b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
@@ -5,6 +5,6 @@
default-language: Haskell2010
exposed-modules: Control.DeepSeq.Generics
- build-depends: base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
-+ build-depends: base >= 4.5 && < 4.12, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
++ build-depends: base >= 4.5 && < 4.13, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
other-extensions: BangPatterns, FlexibleContexts, TypeOperators
ghc-options: -Wall
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index 5209cea42727..9e52d65800cb 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index 80cac02652b6..966d27a5bfa0 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 5ddb46840242..baf48fe20b0c 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.8.0.3
-PORTREVISION= 3
+PORTVERSION= 0.8.0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index c6c49fd409be..202304fab950 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627832
-SHA256 (cabal/dlist-0.8.0.3.tar.gz) = 876782c96957ff480863effb33878f48dd55de7fa64d036e12bf1fbd49542f2f
-SIZE (cabal/dlist-0.8.0.3.tar.gz) = 8596
+TIMESTAMP = 1546158989
+SHA256 (cabal/dlist-0.8.0.5.tar.gz) = 98a88aa839b40d4aee8b08880030d282d627b63de311f5414dca6e831a951b43
+SIZE (cabal/dlist-0.8.0.5.tar.gz) = 8987
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
index cb76e14c7e05..ccc6a5788839 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-echo/Makefile b/devel/hs-echo/Makefile
index 970da031f3cc..a70fc162b0b8 100644
--- a/devel/hs-echo/Makefile
+++ b/devel/hs-echo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= echo
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 52a9a59426e0..393704f851b6 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 262e608ef280..27c24526b40b 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -2,7 +2,7 @@
PORTNAME= either
PORTVERSION= 5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index 03bc59ee2d8f..c750176dfaf3 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index 25250b4d741b..09669e592cc0 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= equivalence
-PORTVERSION= 0.3.2
-PORTREVISION= 3
+PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 0851897e619b..cf4889881a68 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627833
-SHA256 (cabal/equivalence-0.3.2.tar.gz) = 7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529
-SIZE (cabal/equivalence-0.3.2.tar.gz) = 8378
+TIMESTAMP = 1545554667
+SHA256 (cabal/equivalence-0.3.3.tar.gz) = ee8dd8ce12298e6252f331e3844f684cfe7f32b70e529fe7b8dd63153eb2500a
+SIZE (cabal/equivalence-0.3.3.tar.gz) = 8371
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index e99df8839eaf..b34b5e5643e6 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -2,7 +2,7 @@
PORTNAME= errors
PORTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index f0a4fd3d7e6a..bf1bd6e13349 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= exceptions
PORTVERSION= 0.10.0
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-exceptions/files/patch-exceptions.cabal b/devel/hs-exceptions/files/patch-exceptions.cabal
new file mode 100644
index 000000000000..226ef6627b34
--- /dev/null
+++ b/devel/hs-exceptions/files/patch-exceptions.cabal
@@ -0,0 +1,11 @@
+--- exceptions.cabal.orig 2018-03-11 14:52:28 UTC
++++ exceptions.cabal
+@@ -35,7 +35,7 @@ library
+ build-depends:
+ base >= 4.3 && < 5,
+ stm >= 2.2 && < 3,
+- template-haskell >= 2.2 && < 2.14,
++ template-haskell >= 2.2 && < 2.15,
+ transformers >= 0.2 && < 0.6,
+ transformers-compat >= 0.3 && < 0.7,
+ mtl >= 2.0 && < 2.3
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 88f3591e1af3..eecf0fff3e9c 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= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
index 04e701b9cd64..b08e93db1966 100644
--- a/devel/hs-extra/Makefile
+++ b/devel/hs-extra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= extra
PORTVERSION= 1.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index a782b780306f..e249082bbc20 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fast-logger
PORTVERSION= 2.4.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 000f8fd48dbc..b44da7382c6a 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.5.3.1
-PORTREVISION= 3
+PORTVERSION= 5.7.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 917f6f6c0665..f62feacaa5c3 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499541554
-SHA256 (cabal/fgl-5.5.3.1.tar.gz) = dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c
-SIZE (cabal/fgl-5.5.3.1.tar.gz) = 54868
+TIMESTAMP = 1545555065
+SHA256 (cabal/fgl-5.7.0.1.tar.gz) = ffce7af67d4e7ee2f6a7c44fbb749c4253ce9bb35b8b1ffe1c93a173a01fe910
+SIZE (cabal/fgl-5.7.0.1.tar.gz) = 56186
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 52a9af97dbaf..9d1b116e7a4a 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 617bf9a6f992..29164a508be6 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,7 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index 57d596cff217..11be97e2c3bd 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.3.2
+PORTVERSION= 0.6.3.4
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 2c868f219743..c7443962d627 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523961106
-SHA256 (cabal/filestore-0.6.3.2.tar.gz) = 1b8090d20c940ac3444dd9649ed71e934601dba9f2fb9579e67fff6dcd32a15b
-SIZE (cabal/filestore-0.6.3.2.tar.gz) = 31870
+TIMESTAMP = 1545674897
+SHA256 (cabal/filestore-0.6.3.4.tar.gz) = a06b24a0c522ecec62e6b5bcc2d0c014ced0aa86821b3a522ebd33aa25b63e60
+SIZE (cabal/filestore-0.6.3.4.tar.gz) = 32070
diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile
index bb4a4e5147ab..87eaeae46e90 100644
--- a/devel/hs-fmlist/Makefile
+++ b/devel/hs-fmlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fmlist
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fortran-src/Makefile b/devel/hs-fortran-src/Makefile
index 268cb869b438..40cd1a81e5bd 100644
--- a/devel/hs-fortran-src/Makefile
+++ b/devel/hs-fortran-src/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fortran-src
DISTVERSION= 0.2.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= hello@blubee.me
@@ -9,6 +10,8 @@ COMMENT= Parser and analyses for Fortran standard 66, 77, 90 & 95
LICENSE= APACHE20
+BROKEN= Doesn't build with newest GHC
+
USE_CABAL= fgl>=5.0 GenericPretty>=1.2.2 uniplate>=1.6 alex>=3.1 \
happy>=1.19 unordered-containers>=0.2.9.0 syb>=0.7 \
hashable>=1.2.3.0
diff --git a/devel/hs-fortran-src/files/patch-fortran-src.cabal b/devel/hs-fortran-src/files/patch-fortran-src.cabal
new file mode 100644
index 000000000000..36251a873ae0
--- /dev/null
+++ b/devel/hs-fortran-src/files/patch-fortran-src.cabal
@@ -0,0 +1,29 @@
+--- fortran-src.cabal.orig 2018-05-18 02:24:45 UTC
++++ fortran-src.cabal
+@@ -28,7 +28,7 @@ executable fortran-src
+ uniplate >= 1.6 && < 2,
+ GenericPretty >= 1.2.2 && < 2,
+ pretty >= 1.1 && < 2,
+- containers >= 0.5 && < 0.6,
++ containers >= 0.5 && < 0.7,
+ text >= 1.2 && < 2,
+ bytestring >= 0.10 && < 0.11,
+ binary >= 0.8.3.0 && < 0.9,
+@@ -78,7 +78,7 @@ library
+ uniplate >= 1.6 && < 2,
+ GenericPretty >= 1.2.2 && < 2,
+ pretty >= 1.1 && < 2,
+- containers >= 0.5 && < 0.6,
++ containers >= 0.5 && < 0.7,
+ text >= 1.2 && < 2,
+ bytestring >= 0.10 && < 0.11,
+ binary >= 0.8.3.0 && < 0.9,
+@@ -102,7 +102,7 @@ test-suite spec
+ filepath >= 1.4 && < 2,
+ GenericPretty >= 1.2.2 && < 2,
+ pretty >= 1.1 && < 2,
+- containers >= 0.5 && < 0.6,
++ containers >= 0.5 && < 0.7,
+ text >= 1.2 && < 2,
+ bytestring >= 0.10 && < 0.11,
+ binary >= 0.8.3.0 && < 0.9,
diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile
index 40936ea202bb..4d29720ad91a 100644
--- a/devel/hs-foundation/Makefile
+++ b/devel/hs-foundation/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= foundation
-PORTVERSION= 0.0.20
+PORTVERSION= 0.0.21
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -12,5 +12,9 @@ LICENSE= BSD3CLAUSE
USE_CABAL= basement
+post-extract:
+ ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs
+ ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo
index 292ff4763860..b3f2200c4583 100644
--- a/devel/hs-foundation/distinfo
+++ b/devel/hs-foundation/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523130712
-SHA256 (cabal/foundation-0.0.20.tar.gz) = ba6ae63a9ce0846bf942af2c3ace56600f051c61e83a0b55dd625de23a78e42d
-SIZE (cabal/foundation-0.0.20.tar.gz) = 122940
+TIMESTAMP = 1545589565
+SHA256 (cabal/foundation-0.0.21.tar.gz) = 4ed3a0e7f8052b52d27c9806eff3bea51acc2587f74f81db4b8e03e938f283e0
+SIZE (cabal/foundation-0.0.21.tar.gz) = 120009
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index e3026905c543..d3abce4d56dc 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -2,7 +2,7 @@
PORTNAME= free
PORTVERSION= 5.0.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-free/files/patch-free.cabal b/devel/hs-free/files/patch-free.cabal
index eb57b615aa32..9c7d446b9414 100644
--- a/devel/hs-free/files/patch-free.cabal
+++ b/devel/hs-free/files/patch-free.cabal
@@ -1,11 +1,13 @@
---- free.cabal.orig 2018-04-15 20:31:19 UTC
+--- free.cabal.orig 2018-03-08 00:33:22 UTC
+++ free.cabal
-@@ -84,7 +84,7 @@ library
+@@ -84,8 +84,8 @@ library
transformers-base < 0.5,
transformers-compat >= 0.3 && < 1,
template-haskell >= 2.7.0.0 && < 3,
- exceptions >= 0.6 && < 0.10,
+- containers < 0.6
+ exceptions >= 0.6 && < 0.11,
- containers < 0.6
++ containers < 0.7
exposed-modules:
+ Control.Applicative.Free
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 81501d1a59ca..92fcad234245 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fsnotify
PORTVERSION= 0.2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 8988fbcfc268..4da3d62e393a 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gconf
PORTVERSION= 0.13.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 7979351f468a..60067bc6302f 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -2,7 +2,7 @@
PORTNAME= generic-deriving
PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/files/patch-generic-deriving.cabal b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal
index a23890ada602..3903715f50bc 100644
--- a/devel/hs-generic-deriving/files/patch-generic-deriving.cabal
+++ b/devel/hs-generic-deriving/files/patch-generic-deriving.cabal
@@ -1,11 +1,14 @@
---- generic-deriving.cabal.orig 2018-04-11 11:59:07 UTC
+--- generic-deriving.cabal.orig 2018-01-11 21:49:37 UTC
+++ generic-deriving.cabal
-@@ -77,7 +77,7 @@ library
+@@ -75,9 +75,9 @@ library
+ build-depends: base >= 4.3 && < 4.9
+ other-modules: Generics.Deriving.TH.Pre4_9
- build-depends: containers >= 0.1 && < 0.6
+- build-depends: containers >= 0.1 && < 0.6
++ build-depends: containers >= 0.1 && < 0.7
, ghc-prim < 1
- , template-haskell >= 2.4 && < 2.13
-+ , template-haskell >= 2.4 && < 2.14
++ , template-haskell >= 2.4 && < 2.15
default-language: Haskell2010
ghc-options: -Wall
diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile
index 7421dfb0962c..6c6e8287cc3a 100644
--- a/devel/hs-geniplate-mirror/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -2,7 +2,7 @@
PORTNAME= geniplate-mirror
PORTVERSION= 0.7.6
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal b/devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal
new file mode 100644
index 000000000000..ac725f7bf8b4
--- /dev/null
+++ b/devel/hs-geniplate-mirror/files/patch-geniplate-mirror.cabal
@@ -0,0 +1,10 @@
+--- geniplate-mirror.cabal.orig 2018-02-07 14:46:43 UTC
++++ geniplate-mirror.cabal
+@@ -28,6 +28,6 @@ source-repository head
+ location: https://github.com/danr/geniplate
+
+ library
+- Build-Depends: base >= 4 && < 5.0, template-haskell < 2.14, mtl
++ Build-Depends: base >= 4 && < 5.0, template-haskell < 2.15, mtl
+
+ Exposed-modules: Data.Generics.Geniplate
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 2dd026fbbc57..5bbae60381b1 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.7.2
+PORTVERSION= 0.8.0.1
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index df5d18eb0f43..87fb1cf64302 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523991488
-SHA256 (cabal/ghc-events-0.7.2.tar.gz) = b01643f72a448fcd63a0b48781d71b21fb0bb22a54967f0b8a39db0e5638ffbf
-SIZE (cabal/ghc-events-0.7.2.tar.gz) = 203071
+TIMESTAMP = 1545835185
+SHA256 (cabal/ghc-events-0.8.0.1.tar.gz) = 29c5f07f1f0fbf64f8f74b806a5ce3b3ad39bbd443bb7241451e91ad48a6a898
+SIZE (cabal/ghc-events-0.8.0.1.tar.gz) = 1441899
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 7365fa3291ad..fe4cef94b727 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= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index e86b40178a3d..f562c193a442 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= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 9c3771bc4571..f34bfb3a814d 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gio
PORTVERSION= 0.13.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 6def43693fb5..c621d2448211 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= git-annex
PORTVERSION= 6.20170520
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile
index ad4ed4e3ecb8..4fcbe353b3cb 100644
--- a/devel/hs-gitrev/Makefile
+++ b/devel/hs-gitrev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gitrev
PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index cc59f8dcb682..21e03e6d7c48 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -2,7 +2,7 @@
PORTNAME= glib
PORTVERSION= 0.13.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 820972a4bfc4..c17dd324fa92 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.13.3.1
+PORTVERSION= 0.13.4.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,6 +10,8 @@ COMMENT= Tools to build the Gtk2Hs suite of User Interface Libraries
LICENSE= GPLv2
+BROKEN= Doesn't build with recent GHC
+
USE_CABAL= hashtables random
USE_ALEX= yes
USE_HAPPY= yes
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 0660f9d2a5a6..f2e9047292d8 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523786090
-SHA256 (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 220f2f4aa1e01b8585fddf35bfc9f3a9dd300f2308d3c2b800c621cdd2ce7154
-SIZE (cabal/gtk2hs-buildtools-0.13.3.1.tar.gz) = 177911
+TIMESTAMP = 1545833512
+SHA256 (cabal/gtk2hs-buildtools-0.13.4.0.tar.gz) = 0f3e6ba90839efd43efe8cecbddb6478a55e2ce7788c57a0add4df477dede679
+SIZE (cabal/gtk2hs-buildtools-0.13.4.0.tar.gz) = 177959
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs
deleted file mode 100644
index 9a31ddab2e46..000000000000
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_c_CPretty.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- c2hs/c/CPretty.hs.orig 2018-04-15 10:03:19 UTC
-+++ c2hs/c/CPretty.hs
-@@ -34,6 +34,8 @@ module CPretty (
- -- we are just providing instances to the class `Pretty'
- ) where
-
-+import Prelude hiding ((<>))
-+
- import Idents (Ident, identToLexeme)
- import Text.PrettyPrint.HughesPJ
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal b/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal
deleted file mode 100644
index 7c3def870f97..000000000000
--- a/devel/hs-gtk2hs-buildtools/files/patch-gtk2hs-buildtools.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk2hs-buildtools.cabal.orig 2018-04-15 10:01:41 UTC
-+++ gtk2hs-buildtools.cabal
-@@ -40,7 +40,7 @@ Library
- build-depends: base >= 4 && < 5,
- process, array, pretty,
- filepath, random,
-- Cabal >= 1.24.0.0 && < 2.1,
-+ Cabal >= 1.24.0.0 && < 2.3,
- filepath >= 1.3.0.0 && < 1.5,
- directory >= 1.2.0.0 && < 1.4,
- containers >= 0.5.5.1 && < 0.6
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
index 12bb27836375..b976582bebee 100644
--- a/devel/hs-haddock-api/Makefile
+++ b/devel/hs-haddock-api/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-api
-PORTVERSION= 2.19.0.1
+PORTVERSION= 2.21.0
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,6 +10,8 @@ COMMENT= Documentation-generation tool for Haskell libraries
LICENSE= BSD3CLAUSE
+BROKEN= Doesn't build with recent GHC
+
USE_CABAL= ghc-paths haddock-library>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
index 9162a8f99dba..deed8b7f2f19 100644
--- a/devel/hs-haddock-api/distinfo
+++ b/devel/hs-haddock-api/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523989416
-SHA256 (cabal/haddock-api-2.19.0.1.tar.gz) = 432be5729450dc1923637d4a3533932582a490e1fe81d48af8be9e2ba93ed130
-SIZE (cabal/haddock-api-2.19.0.1.tar.gz) = 177912
+TIMESTAMP = 1545846892
+SHA256 (cabal/haddock-api-2.21.0.tar.gz) = dcaeb11b9fa22544b932492198b373abf598c87fedc3ea05ae125a6230ecd148
+SIZE (cabal/haddock-api-2.21.0.tar.gz) = 177939
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index 0b4bd740a608..b07069164dfb 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.5.0.1
+PORTVERSION= 1.7.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index c3bd020f4ec1..891f29a53ddc 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523633978
-SHA256 (cabal/haddock-library-1.5.0.1.tar.gz) = ff2c10f043524135c809303c0d81c7f27a954f0174784e59a497e75e287aabb2
-SIZE (cabal/haddock-library-1.5.0.1.tar.gz) = 47111
+TIMESTAMP = 1545833664
+SHA256 (cabal/haddock-library-1.7.0.tar.gz) = e7c2794a7eb352824f098cafa07bc0506f2c3633808bfbf4c64aef0ba664d011
+SIZE (cabal/haddock-library-1.7.0.tar.gz) = 26315
diff --git a/devel/hs-haddock-library/files/patch-haddock-library.cabal b/devel/hs-haddock-library/files/patch-haddock-library.cabal
deleted file mode 100644
index dc8ed6c8aaba..000000000000
--- a/devel/hs-haddock-library/files/patch-haddock-library.cabal
+++ /dev/null
@@ -1,45 +0,0 @@
---- haddock-library.cabal.orig 2018-04-13 16:29:12 UTC
-+++ haddock-library.cabal
-@@ -49,42 +49,6 @@ library
- if impl(ghc >= 8.0)
- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
-
--library attoparsec
-- default-language: Haskell2010
--
-- build-depends:
-- base >= 4.5 && < 4.12
-- , bytestring >= 0.9.2.1 && < 0.11
-- , deepseq >= 1.3 && < 1.5
--
-- hs-source-dirs: vendor/attoparsec-0.13.1.0
--
-- -- NB: haddock-library needs only small part of lib:attoparsec
-- -- internally, so we only bundle that subset here
-- exposed-modules:
-- Data.Attoparsec.ByteString
-- Data.Attoparsec.ByteString.Char8
-- Data.Attoparsec.Combinator
--
-- other-modules:
-- Data.Attoparsec
-- Data.Attoparsec.ByteString.Buffer
-- Data.Attoparsec.ByteString.FastSet
-- Data.Attoparsec.ByteString.Internal
-- Data.Attoparsec.Internal
-- Data.Attoparsec.Internal.Fhthagn
-- Data.Attoparsec.Internal.Types
-- Data.Attoparsec.Number
--
-- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2
--
-- ghc-options: -Wall
-- if impl(ghc >= 8.0)
-- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
-- else
-- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0
--
--
- test-suite spec
- type: exitcode-stdio-1.0
- default-language: Haskell2010
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 8db0476e70e7..4a83aabbf621 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.19.0.1
+PORTVERSION= 2.21.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index fea2027f0c71..8884abf48a7f 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524638302
-SHA256 (cabal/haddock-2.19.0.1.tar.gz) = 6769a3fae0a7c2c7ebb41029d4d3c7916eb7d75fe6f307a0f7d00b07814c32bc
-SIZE (cabal/haddock-2.19.0.1.tar.gz) = 276623
+TIMESTAMP = 1546019118
+SHA256 (cabal/haddock-2.21.0.tar.gz) = 0863cea77db75032ea8eb3b31e363300cf59ce347c56bd0d3aa64b0b298378b6
+SIZE (cabal/haddock-2.21.0.tar.gz) = 264884
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 489d6c15ce54..48e0e9574e63 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.19.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index e032afdd0302..b1d09fa43fba 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashable
PORTVERSION= 1.2.7.0
-PORTREVISION= 1
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hashable/files/patch-hashable.cabal b/devel/hs-hashable/files/patch-hashable.cabal
new file mode 100644
index 000000000000..6a39053c03b6
--- /dev/null
+++ b/devel/hs-hashable/files/patch-hashable.cabal
@@ -0,0 +1,11 @@
+--- hashable.cabal.orig 2018-03-07 22:02:09 UTC
++++ hashable.cabal
+@@ -48,7 +48,7 @@ Library
+ Exposed-modules: Data.Hashable
+ Data.Hashable.Lifted
+ Other-modules: Data.Hashable.Class
+- Build-depends: base >= 4.4 && < 4.12,
++ Build-depends: base >= 4.4 && < 4.13,
+ bytestring >= 0.9 && < 0.11,
+ deepseq >= 1.3 && < 1.5
+ if impl(ghc)
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index ff411f2bf737..c5fba566caf2 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashtables
PORTVERSION= 1.2.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile
index bda391cfb328..b35b4ab78ef8 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts-util/Makefile b/devel/hs-haskell-src-exts-util/Makefile
index ce4d24ec961a..f23239bf76a7 100644
--- a/devel/hs-haskell-src-exts-util/Makefile
+++ b/devel/hs-haskell-src-exts-util/Makefile
@@ -2,6 +2,7 @@
PORTNAME= haskell-src-exts-util
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 3ca8e7c6e23a..5a21882db545 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.20.2
+PORTVERSION= 1.21.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index ff44be61de7c..506f1e9f26c8 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523958315
-SHA256 (cabal/haskell-src-exts-1.20.2.tar.gz) = 9f6686e8bc8b849991207304e524747b0d1dcedfea351ac073ce971b36f9a3ea
-SIZE (cabal/haskell-src-exts-1.20.2.tar.gz) = 1387571
+TIMESTAMP = 1545681093
+SHA256 (cabal/haskell-src-exts-1.21.0.tar.gz) = 95dac187824edfa23b6a2363880b5e113df8ce4a641e8a0f76e6d45aaa699ff3
+SIZE (cabal/haskell-src-exts-1.21.0.tar.gz) = 1231435
diff --git a/devel/hs-haskell-src-meta/Makefile b/devel/hs-haskell-src-meta/Makefile
index d9b16c897ab9..cd4c58b52f20 100644
--- a/devel/hs-haskell-src-meta/Makefile
+++ b/devel/hs-haskell-src-meta/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haskell-src-meta
-PORTVERSION= 0.8.0.2
+PORTVERSION= 0.8.0.3
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-haskell-src-meta/distinfo b/devel/hs-haskell-src-meta/distinfo
index d6a3d72b14dc..ac98cdb1e404 100644
--- a/devel/hs-haskell-src-meta/distinfo
+++ b/devel/hs-haskell-src-meta/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524930351
-SHA256 (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 4b7b143b94fcf147b96bb34822c2feeae29daadd3a22796ee36cadd5ca262c8b
-SIZE (cabal/haskell-src-meta-0.8.0.2.tar.gz) = 20217
+TIMESTAMP = 1545757485
+SHA256 (cabal/haskell-src-meta-0.8.0.3.tar.gz) = 8473e3555080860c2043581b398dbab67319584a568463b074a092fd4d095822
+SIZE (cabal/haskell-src-meta-0.8.0.3.tar.gz) = 20473
diff --git a/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts b/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts
new file mode 100644
index 000000000000..f2ceb2a8c0f6
--- /dev/null
+++ b/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts
@@ -0,0 +1,28 @@
+From 109ee29d5fd0f4e23fdd2f80eb122d66341b64a9 Mon Sep 17 00:00:00 2001
+From: Galen Huntington <galen@alumni.reed.edu>
+Date: Sun, 23 Dec 2018 22:57:21 -0800
+Subject: [PATCH] Support haskell-src-exts 1.21.
+
+---
+ haskell-src-meta.cabal | 2 +-
+ src/Language/Haskell/Meta/Syntax/Translate.hs | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
+index 0dba4f5..aa95cff 100644
+--- src/Language/Haskell/Meta/Syntax/Translate.hs
++++ src/Language/Haskell/Meta/Syntax/Translate.hs
+@@ -314,11 +314,13 @@ instance ToName TyVarBndr where
+ toName (PlainTV n) = n
+ toName (KindedTV n _) = n
+
++#if !MIN_VERSION_haskell_src_exts(1,21,0)
+ instance ToType (Hs.Kind l) where
+ toType (Hs.KindStar _) = StarT
+ toType (Hs.KindFn _ k1 k2) = toType k1 .->. toType k2
+ toType (Hs.KindParen _ kp) = toType kp
+ toType (Hs.KindVar _ n) = VarT (toName n)
++#endif
+
+ toKind :: Hs.Kind l -> Kind
+ toKind = toType
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
index d7fb48b310c8..50852723535e 100644
--- a/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal
+++ b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal
@@ -1,16 +1,17 @@
---- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC
+--- haskell-src-meta.cabal.orig 2018-06-19 10:23:31 UTC
+++ haskell-src-meta.cabal
@@ -17,11 +17,11 @@ description: The translation from haskell-src-e
extra-source-files: ChangeLog README.md examples/*.hs
library
-- build-depends: base >= 4.6 && < 4.11,
-+ build-depends: base >= 4.6 && < 4.12,
- haskell-src-exts >= 1.18 && < 1.21,
+- build-depends: base >= 4.6 && < 4.12,
+- haskell-src-exts >= 1.18 && < 1.21,
++ build-depends: base >= 4.6 && < 4.13,
++ haskell-src-exts >= 1.18 && < 1.22,
pretty >= 1.0 && < 1.2,
syb >= 0.1 && < 0.8,
-- template-haskell >= 2.8 && < 2.13,
-+ template-haskell >= 2.8 && < 2.14,
+- template-haskell >= 2.8 && < 2.14,
++ template-haskell >= 2.8 && < 2.15,
th-orphans >= 0.9.1 && < 0.14
if impl(ghc < 7.8)
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 86c5728632f4..3f7f889b7f5e 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index f117af077331..2b2a6b60fb59 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hasktags
PORTVERSION= 0.69.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile
index e1e579f48652..0216aca4c945 100644
--- a/devel/hs-hex/Makefile
+++ b/devel/hs-hex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hex
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 8c41329f1c3f..9dc6dae5133a 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hinotify
PORTVERSION= 0.3.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index a353e96e92e9..3169479de001 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.8.0
+PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 973e078fc8a8..902400af9715 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531857801
-SHA256 (cabal/hint-0.8.0.tar.gz) = 2e702d62c8f56b799d767f3d3707bec12597bc529a051ad90bd5840581551c41
-SIZE (cabal/hint-0.8.0.tar.gz) = 31126
+TIMESTAMP = 1545674257
+SHA256 (cabal/hint-0.9.0.tar.gz) = 7425af412a66d22f254608b4e9f552d65fd96c6cc5885af7b2ed0af62923f8bc
+SIZE (cabal/hint-0.9.0.tar.gz) = 31062
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index c20a4775bc82..0eb4a950a40a 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index 84304936e977..31121134512c 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 2.1.8
+PORTVERSION= 2.1.12
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 3ca7c1ca7069..39b5c3de08ac 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531821668
-SHA256 (cabal/hlint-2.1.8.tar.gz) = 9713ebf3d0ae16c169d0e02486ba93bfdc6349d9b82dccf8a19a58c1177e75ce
-SIZE (cabal/hlint-2.1.8.tar.gz) = 111934
+TIMESTAMP = 1545836418
+SHA256 (cabal/hlint-2.1.12.tar.gz) = 7de5c4a21cb3d957579398a5fe7c8bc2f56279616309b91cb1e9fda3e55e6fb4
+SIZE (cabal/hlint-2.1.12.tar.gz) = 114373
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 5e4ea4d684d9..4c0cf512115a 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 5.0.17.3
+PORTVERSION= 5.0.17.4
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index a32055b9277b..77d9a907ea71 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525080726
-SHA256 (cabal/hoogle-5.0.17.3.tar.gz) = 66bebaf75600fef1c5fc0613ccc55c137aaed4c8f69653cf903f4fb003b98f9c
-SIZE (cabal/hoogle-5.0.17.3.tar.gz) = 86528
+TIMESTAMP = 1545936497
+SHA256 (cabal/hoogle-5.0.17.4.tar.gz) = 499b2b7a77806ed486d7ed8daad29c3827cec38a32dbd02769b72fba87f62d15
+SIZE (cabal/hoogle-5.0.17.4.tar.gz) = 93902
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
index 8aa297d8486d..abb18a84df29 100644
--- a/devel/hs-hourglass/Makefile
+++ b/devel/hs-hourglass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hourglass
PORTVERSION= 0.2.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
index d1dc2aa87893..962b139d2cde 100644
--- a/devel/hs-hsb2hs/Makefile
+++ b/devel/hs-hsb2hs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hsb2hs
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 098d35e250db..ebc4d25650ef 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.10
-PORTREVISION= 3
+PORTVERSION= 1.2.12
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index ca3967e131eb..fa0fcfdf5223 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627844
-SHA256 (cabal/hslogger-1.2.10.tar.gz) = d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b
-SIZE (cabal/hslogger-1.2.10.tar.gz) = 35889
+TIMESTAMP = 1545658038
+SHA256 (cabal/hslogger-1.2.12.tar.gz) = f97a4c89d0921f237999de5d44950127dbe8baa177960ccccbfb79cccfd46c7a
+SIZE (cabal/hslogger-1.2.12.tar.gz) = 36228
diff --git a/devel/hs-hslua-module-text/Makefile b/devel/hs-hslua-module-text/Makefile
index 621153fa7ef8..4e797e9d5b25 100644
--- a/devel/hs-hslua-module-text/Makefile
+++ b/devel/hs-hslua-module-text/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hslua-module-text
-PORTVERSION= 0.1.2.1
+PORTVERSION= 0.2.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hslua-module-text/distinfo b/devel/hs-hslua-module-text/distinfo
index c44e0dfaef4f..e983819d892b 100644
--- a/devel/hs-hslua-module-text/distinfo
+++ b/devel/hs-hslua-module-text/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524943044
-SHA256 (cabal/hslua-module-text-0.1.2.1.tar.gz) = aeb384f9743b76360f3779e44065fe297fb60f27519933f203b75bd8c2ba8e2d
-SIZE (cabal/hslua-module-text-0.1.2.1.tar.gz) = 3594
+TIMESTAMP = 1545833621
+SHA256 (cabal/hslua-module-text-0.2.0.tar.gz) = 711705b9befac9b65cc44e13483dc5b6ddcca45bc049813863653276908d8f7e
+SIZE (cabal/hslua-module-text-0.2.0.tar.gz) = 3583
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
deleted file mode 100644
index 0cf1a95c964c..000000000000
--- a/devel/hs-hslua-module-text/files/patch-hslua-module-text.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
---- hslua-module-text.cabal.orig 2018-04-28 19:25:33 UTC
-+++ hslua-module-text.cabal
-@@ -20,7 +20,7 @@ source-repository head
-
- library
- exposed-modules: Foreign.Lua.Module.Text
-- build-depends: base >= 4.7 && < 4.11
-+ build-depends: base >= 4.7 && < 4.12
- , hslua >= 0.9 && < 0.10
- , text >= 1 && < 1.3
- hs-source-dirs: src
-@@ -37,4 +37,4 @@ test-suite test-hslua
- , hslua-module-text
- , tasty
- , tasty-hunit
-- , text
-\ No newline at end of file
-+ , text
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index 75385fabec0d..8985a398d818 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.9.5.1
+PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index e99ab64d26f4..c3e209494538 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524940935
-SHA256 (cabal/hslua-0.9.5.1.tar.gz) = 681ffb1775e948143c0dd4be3086259f2eda8a9f7b09ce94016150c57e9d74d0
-SIZE (cabal/hslua-0.9.5.1.tar.gz) = 228252
+TIMESTAMP = 1545846233
+SHA256 (cabal/hslua-1.0.1.tar.gz) = ca4e74bbbd6917877bf61e86505d6550603aa62659c2ec8c3780d8be29feb1a0
+SIZE (cabal/hslua-1.0.1.tar.gz) = 235701
diff --git a/devel/hs-hslua/files/patch-hslua.cabal b/devel/hs-hslua/files/patch-hslua.cabal
index 83ac5715b79a..565ff33c2831 100644
--- a/devel/hs-hslua/files/patch-hslua.cabal
+++ b/devel/hs-hslua/files/patch-hslua.cabal
@@ -1,12 +1,10 @@
---- hslua.cabal.orig 2018-04-28 18:45:32 UTC
+--- hslua.cabal.orig 2018-10-01 07:39:40 UTC
+++ hslua.cabal
-@@ -77,8 +77,7 @@ library
- build-depends: base >= 4.7 && < 5
- , bytestring >= 0.10.2 && < 0.11
- , containers >= 0.5 && < 0.6
-- , exceptions >= 0.8 && < 0.10
-- , fail >= 4.9 && < 5
-+ , exceptions >= 0.8 && < 0.11
- , mtl >= 2.2 && < 2.3
- , text
- exposed-modules: Foreign.Lua
+@@ -91,7 +91,6 @@ library
+ , bytestring >= 0.10.2 && < 0.11
+ , containers >= 0.5 && < 0.7
+ , exceptions >= 0.8 && < 0.11
+- , fail >= 4.9 && < 5
+ , mtl >= 2.2 && < 2.3
+ , text >= 1.0 && < 1.3
+ hs-source-dirs: src
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
index a7a46ee42751..cec80f01791b 100644
--- a/devel/hs-hspec-core/Makefile
+++ b/devel/hs-hspec-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hspec-core
PORTVERSION= 2.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index a151e5bfc769..dc0e4df556eb 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hspec-discover
PORTVERSION= 2.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index d1d7d07d1d49..8389a81f26eb 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 2ca599c16baa..e13e035304d1 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hspec
PORTVERSION= 2.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile
index b04dfa01f2e4..b6688caa0256 100644
--- a/devel/hs-io-streams-haproxy/Makefile
+++ b/devel/hs-io-streams-haproxy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= io-streams-haproxy
PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
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 9a29416c3620..e74a0d18e947 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
@@ -5,7 +5,7 @@
c-sources: cbits/byteorder.c
- build-depends: base >= 4.5 && < 4.11,
-+ build-depends: base >= 4.5 && < 4.12,
++ build-depends: base >= 4.5 && < 4.13,
attoparsec >= 0.7 && < 0.14,
bytestring >= 0.9 && < 0.11,
io-streams >= 1.3 && < 1.6,
diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile
index 0fa76e942b6e..9a850c4c1767 100644
--- a/devel/hs-io-streams/Makefile
+++ b/devel/hs-io-streams/Makefile
@@ -2,7 +2,7 @@
PORTNAME= io-streams
PORTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
index 8c59213a20f3..c02894441ecd 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
index cecbf2ef7810..4c3bb76a18cb 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index 408d88deaed6..8d6190227235 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.12
+PORTVERSION= 3.12.1
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 30170011a0af..1a8eae8b0734 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523890076
-SHA256 (cabal/keys-3.12.tar.gz) = d4bfa78ff9df50224f1722925ae148279377193d04277a7dad224a47b34d5e55
-SIZE (cabal/keys-3.12.tar.gz) = 13353
+TIMESTAMP = 1545679232
+SHA256 (cabal/keys-3.12.1.tar.gz) = 7fcea48187df82c02c159dea07a581cddf371023e6a3c34de7fa69a8ef2315fb
+SIZE (cabal/keys-3.12.1.tar.gz) = 13608
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index b0ae9d3f6045..920d6f236dae 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kqueue
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
index fff95670d49a..377fcc5ae936 100644
--- a/devel/hs-kqueue/files/patch-kqueue.cabal
+++ b/devel/hs-kqueue/files/patch-kqueue.cabal
@@ -5,7 +5,7 @@
Exposed-modules: System.KQueue
System.KQueue.HighLevel
- Build-depends: base >= 4.0 && < 4.10
-+ Build-depends: base >= 4.0 && < 4.12
++ Build-depends: base >= 4.0 && < 4.13
, directory >= 1.0 && < 1.4
, filepath >= 1.1 && < 1.5
, mtl >= 1.1 && < 2.3
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 934baa402b00..d4ad80ab816a 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.7.2
+PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 823403e89134..a7dfd6f023af 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523449230
-SHA256 (cabal/language-c-0.7.2.tar.gz) = 63ad22ddd8e51747c8d64239029cf4afd3e7d4060c9b9478145479f5d4d549e5
-SIZE (cabal/language-c-0.7.2.tar.gz) = 121429
+TIMESTAMP = 1545654745
+SHA256 (cabal/language-c-0.8.2.tar.gz) = b729d3b2263b0f029a66c37ae1c05b86b68bad1cde6c0b407bfd5201b91fce15
+SIZE (cabal/language-c-0.8.2.tar.gz) = 193533
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 66ad1a1e105a..6e996e940745 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -2,7 +2,7 @@
PORTNAME= language-javascript
PORTVERSION= 0.6.0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 648a1f7e1aae..5c9bfed402ba 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -2,7 +2,7 @@
PORTNAME= largeword
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 24af3eaee895..3afb2e52f5c0 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index deedc149aa13..324054e6b88e 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.16.1
+PORTVERSION= 4.17
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,8 +10,10 @@ COMMENT= Lenses, Folds and Traversals
LICENSE= BSD3CLAUSE
+BROKEN= Doesn't build with recent GHC
+
USE_CABAL= base-orphans>=0.3 bifunctors>=5 call-stack comonad>=4 \
- contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \
+ contravariant distributive>=0.3 exceptions>=0.1.1 \
free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \
parallel>=3.1.0.1 profunctors>=5 reflection>=2 \
semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 \
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 789bb48a2e8b..62ce9c7ae627 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524407577
-SHA256 (cabal/lens-4.16.1.tar.gz) = f5bec97b1d5cf3d6487afebc79b927bd5a18f1fd594b104de36a35bf606ea4c6
-SIZE (cabal/lens-4.16.1.tar.gz) = 991132
+TIMESTAMP = 1545677566
+SHA256 (cabal/lens-4.17.tar.gz) = 473664de541023bef44aa29105abbb1e35542e9254cdc846963183e0dd3f08cc
+SIZE (cabal/lens-4.17.tar.gz) = 991660
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
index f2f0a5a3e991..c9d18fa0a8a7 100644
--- a/devel/hs-lifted-async/Makefile
+++ b/devel/hs-lifted-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-async
-PORTVERSION= 0.10.0.1
+PORTVERSION= 0.10.0.3
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
index 881e89c193dc..3586e43d619e 100644
--- a/devel/hs-lifted-async/distinfo
+++ b/devel/hs-lifted-async/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523785768
-SHA256 (cabal/lifted-async-0.10.0.1.tar.gz) = 0d925b16fffe6fb3db994165401aeb0752595d1feec3011eba5b8b2c8524c4b1
-SIZE (cabal/lifted-async-0.10.0.1.tar.gz) = 10129
+TIMESTAMP = 1545833386
+SHA256 (cabal/lifted-async-0.10.0.3.tar.gz) = 83d09c355cf7c5d35f179f6f084524f451966ed29beac721f0500ee607822b8c
+SIZE (cabal/lifted-async-0.10.0.3.tar.gz) = 10217
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 73b840783f01..77c66bfe0863 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index c7a859bf3b49..57b9465790a6 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile
index abb08bd085c9..2ccc8951203e 100644
--- a/devel/hs-map-syntax/Makefile
+++ b/devel/hs-map-syntax/Makefile
@@ -2,7 +2,7 @@
PORTNAME= map-syntax
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/files/patch-map-syntax.cabal b/devel/hs-map-syntax/files/patch-map-syntax.cabal
new file mode 100644
index 000000000000..efc4658e12e2
--- /dev/null
+++ b/devel/hs-map-syntax/files/patch-map-syntax.cabal
@@ -0,0 +1,13 @@
+--- map-syntax.cabal.orig 2018-04-03 20:48:24 UTC
++++ map-syntax.cabal
+@@ -37,8 +37,8 @@ Library
+ Data.Map.Syntax
+
+ build-depends:
+- base >= 4.3 && < 4.12,
+- containers >= 0.3 && < 0.6,
++ base >= 4.3 && < 4.13,
++ containers >= 0.3 && < 0.7,
+ mtl >= 2.0 && < 2.3
+
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -fno-warn-unused-do-bind
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
index 4f76bc9608f5..a07322f759ee 100644
--- a/devel/hs-memory/Makefile
+++ b/devel/hs-memory/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= memory
-PORTVERSION= 0.14.16
+PORTVERSION= 0.14.18
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
index baf6072f3420..61d277f6ef7b 100644
--- a/devel/hs-memory/distinfo
+++ b/devel/hs-memory/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523375674
-SHA256 (cabal/memory-0.14.16.tar.gz) = 7bb0834ab28ce1248f3be09df211d49d20d703cdcda3ed16cde99356e2d72b0f
-SIZE (cabal/memory-0.14.16.tar.gz) = 42207
+TIMESTAMP = 1545678187
+SHA256 (cabal/memory-0.14.18.tar.gz) = f5458d170a291788ac8da896bb44b0cc84021c99dd596c52adf2f7a7f6c03507
+SIZE (cabal/memory-0.14.18.tar.gz) = 42266
diff --git a/devel/hs-microlens-th/Makefile b/devel/hs-microlens-th/Makefile
index 07c0dd82f53b..0264dd29178c 100644
--- a/devel/hs-microlens-th/Makefile
+++ b/devel/hs-microlens-th/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= microlens-th
-PORTVERSION= 0.4.2.1
+PORTVERSION= 0.4.2.3
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-microlens-th/distinfo b/devel/hs-microlens-th/distinfo
index ba492245a245..1538bfb68286 100644
--- a/devel/hs-microlens-th/distinfo
+++ b/devel/hs-microlens-th/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523954941
-SHA256 (cabal/microlens-th-0.4.2.1.tar.gz) = ec57108e9ab54c085dd316b60ac156e6624078a46682a60ed2462005cae4fc42
-SIZE (cabal/microlens-th-0.4.2.1.tar.gz) = 20972
+TIMESTAMP = 1545657437
+SHA256 (cabal/microlens-th-0.4.2.3.tar.gz) = 321018c6c0aad3f68eb26f6c7e7a518db43039e3f8f19c4634ceb4c7f8051c8f
+SIZE (cabal/microlens-th-0.4.2.3.tar.gz) = 20960
diff --git a/devel/hs-microlens/Makefile b/devel/hs-microlens/Makefile
index 48b8d35e9610..74b2de186149 100644
--- a/devel/hs-microlens/Makefile
+++ b/devel/hs-microlens/Makefile
@@ -2,7 +2,7 @@
PORTNAME= microlens
PORTVERSION= 0.4.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-microstache/Makefile b/devel/hs-microstache/Makefile
index f33cf4d3e4de..b60751cf6a86 100644
--- a/devel/hs-microstache/Makefile
+++ b/devel/hs-microstache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= microstache
PORTVERSION= 1.0.1.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-microstache/files/patch-microstache.cabal b/devel/hs-microstache/files/patch-microstache.cabal
index f02f657fe665..95046832b0eb 100644
--- a/devel/hs-microstache/files/patch-microstache.cabal
+++ b/devel/hs-microstache/files/patch-microstache.cabal
@@ -1,11 +1,39 @@
---- microstache.cabal.orig 2018-04-22 20:59:09 UTC
+--- microstache.cabal.orig 2017-07-20 19:26:17 UTC
+++ microstache.cabal
-@@ -40,7 +40,7 @@ source-repository head
+@@ -40,10 +40,10 @@ source-repository head
library
build-depends:
- aeson >=0.11 && < 1.3,
-+ aeson >=0.11 && < 1.4,
++ aeson >=0.11 && < 1.5,
base >=4.5 && < 5.0,
bytestring >=0.9.2.1 && < 0.11,
- containers >=0.4.2.1 && < 0.6,
+- containers >=0.4.2.1 && < 0.6,
++ containers >=0.4.2.1 && < 0.7,
+ deepseq >=1.3.0.0 && < 1.5,
+ directory >=1.1.0.2 && < 1.4,
+ filepath >=1.3.0.0 && < 1.5,
+@@ -83,7 +83,7 @@ test-suite tests
+ if !impl(ghc >= 8.0)
+ build-depends:
+ semigroups == 0.18.*
+- other-modules:
++ other-modules:
+ Text.Microstache.ParserSpec
+ Text.Microstache.RenderSpec
+ Text.Microstache.TypeSpec
+@@ -93,12 +93,12 @@ test-suite mustache-spec
+ main-is: Spec.hs
+ hs-source-dirs: mustache-spec
+ type: exitcode-stdio-1.0
+- build-depends:
++ build-depends:
+ hspec,
+ aeson,
+ base,
+ bytestring,
+- containers,
++ containers,
+ parsec,
+ microstache,
+ text
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index 8bac82d911e6..95fe7d4b7f98 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index e2554ecf15b4..1bb9b6edecab 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mmorph
PORTVERSION= 1.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 90bbceaaf018..2268fac91da3 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index 8f2fc549ce6c..e15d1bab9cfc 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-logger
PORTVERSION= 0.3.28.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index 6839a6957e88..a5021882e036 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index b0f6fefd26f2..e456f7fd3053 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= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 17962eb72afe..a094f205e80c 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-unlift/Makefile b/devel/hs-monad-unlift/Makefile
index 9866f907f7ca..455726bd714a 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 0b59705b2b4d..c95bd8518627 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable-instances/Makefile b/devel/hs-mono-traversable-instances/Makefile
index f5a7a1f5ea64..591ffd1f9f37 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index 9dec96c49732..ef1b3ac0b897 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mono-traversable
PORTVERSION= 1.0.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index 1660591ddbc4..1097256cae1e 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index cda4535dde05..89837ce7f23a 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mueval
PORTVERSION= 0.9.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 01151e0a9316..3ae6f914a968 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
index 09b2f5ed3a84..21f1056a1c46 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ncurses/Makefile b/devel/hs-ncurses/Makefile
index bc70eb5171fe..aaed6c30f895 100644
--- a/devel/hs-ncurses/Makefile
+++ b/devel/hs-ncurses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncurses
PORTVERSION= 0.2.16
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-newtype-generics/Makefile b/devel/hs-newtype-generics/Makefile
index 9c0e8fa480d1..2652e98ffdad 100644
--- a/devel/hs-newtype-generics/Makefile
+++ b/devel/hs-newtype-generics/Makefile
@@ -2,7 +2,7 @@
PORTNAME= newtype-generics
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
index 84aa353981e4..ed5d75a8d8e3 100644
--- a/devel/hs-newtype/Makefile
+++ b/devel/hs-newtype/Makefile
@@ -2,7 +2,7 @@
PORTNAME= newtype
PORTVERSION= 0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
index 3b48541a8441..ef6c594a1099 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= 4
+PORTREVISION= 6
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 c78bf11e3c9a..e937c048c9eb 100644
--- a/devel/hs-old-locale/files/patch-git_15fea2d
+++ b/devel/hs-old-locale/files/patch-git_15fea2d
@@ -14,8 +14,8 @@ index 37057a8..52aa83a 100644
@@ -31,5 +31,5 @@ Library
exposed-modules:
System.Locale
-
+
- build-depends: base >= 4.2 && < 4.9
-+ build-depends: base >= 4.2 && < 4.12
++ build-depends: base >= 4.2 && < 4.13
ghc-options: -Wall
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
index 94c7ab7789bb..c9677396c952 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= 4
+PORTREVISION= 6
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 842bf10e1c62..ec394c8c0a72 100644
--- a/devel/hs-old-time/files/patch-git_82790af
+++ b/devel/hs-old-time/files/patch-git_82790af
@@ -13,11 +13,11 @@ index d322965..3a0e85c 100644
+++ old-time.cabal
@@ -53,7 +53,7 @@ Library
HsTime.h
-
+
build-depends:
- base >= 4.7 && < 4.9,
-+ base >= 4.7 && < 4.12,
++ base >= 4.7 && < 4.13,
old-locale == 1.0.*
-
+
ghc-options: -Wall
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 60479fb5efc7..dd7a988a452f 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.14.0.0
-PORTREVISION= 3
+PORTVERSION= 0.14.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index cba28fc18757..00997187bef7 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499447048
-SHA256 (cabal/optparse-applicative-0.14.0.0.tar.gz) = b55b32fdd5d101b2d6edb2746a66648fc2cd1b850d7adea185f201ac71b83c1a
-SIZE (cabal/optparse-applicative-0.14.0.0.tar.gz) = 53120
+TIMESTAMP = 1545655938
+SHA256 (cabal/optparse-applicative-0.14.3.0.tar.gz) = 72476302fe555a508917b2d7d6121c7b58ea5434cdc08aeb5d4b652e8f0e7663
+SIZE (cabal/optparse-applicative-0.14.3.0.tar.gz) = 53480
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 845c42360ef1..7fb60bc0ab2f 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.1.1
-PORTREVISION= 2
+PORTVERSION= 3.2.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index 5c4be6485683..b5150cf011b6 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499444913
-SHA256 (cabal/parallel-3.2.1.1.tar.gz) = 323bb9bc9e36fb9bfb08e68a772411302b1599bfffbc6de20fa3437ce1473c17
-SIZE (cabal/parallel-3.2.1.1.tar.gz) = 13367
+TIMESTAMP = 1545498989
+SHA256 (cabal/parallel-3.2.2.0.tar.gz) = 170453a71a2a8b31cca63125533f7771d7debeb639700bdabdd779c34d8a6ef6
+SIZE (cabal/parallel-3.2.2.0.tar.gz) = 14681
diff --git a/devel/hs-parallel/files/patch-parallel.cabal b/devel/hs-parallel/files/patch-parallel.cabal
deleted file mode 100644
index a95e09349d97..000000000000
--- a/devel/hs-parallel/files/patch-parallel.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- parallel.cabal.orig 2018-04-10 09:45:32 UTC
-+++ parallel.cabal
-@@ -34,7 +34,7 @@ library
-
- build-depends:
- array >= 0.3 && < 0.6,
-- base >= 4.3 && < 4.11,
-+ base >= 4.3 && < 4.12,
- containers >= 0.4 && < 0.6,
- deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 67b27a22e08c..db1d3b996444 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index 8fc49f204d96..545e90c5b4e2 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
index 156c5a2a84ac..3e9568413bca 100644
--- a/devel/hs-preprocessor-tools/Makefile
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -2,6 +2,7 @@
PORTNAME= preprocessor-tools
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index e839639b49d7..1f5f7bc2b1b6 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 94aa4722fe42..263a1551a37e 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.6.3.0
+PORTVERSION= 0.6.4.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 2b25698e8a2d..5131e72cd85e 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523292481
-SHA256 (cabal/primitive-0.6.3.0.tar.gz) = cddeff804e0f577f1be0179d5d145dfc170f8bfb66f663b9fba67104a45d9555
-SIZE (cabal/primitive-0.6.3.0.tar.gz) = 25336
+TIMESTAMP = 1545490019
+SHA256 (cabal/primitive-0.6.4.0.tar.gz) = 4cbeaf7924dd79221f327ea101a29bf35c4976dc3319df157ff46ea68e6a0c64
+SIZE (cabal/primitive-0.6.4.0.tar.gz) = 45937
diff --git a/devel/hs-primitive/files/patch-primitive.cabal b/devel/hs-primitive/files/patch-primitive.cabal
new file mode 100644
index 000000000000..c61901226eed
--- /dev/null
+++ b/devel/hs-primitive/files/patch-primitive.cabal
@@ -0,0 +1,11 @@
+--- primitive.cabal.orig 2018-05-30 18:38:36 UTC
++++ primitive.cabal
+@@ -53,7 +53,7 @@ Library
+ Data.Primitive.Internal.Compat
+ Data.Primitive.Internal.Operations
+
+- Build-Depends: base >= 4.5 && < 4.12
++ Build-Depends: base >= 4.5 && < 4.13
+ , ghc-prim >= 0.2 && < 0.6
+ , transformers >= 0.2 && < 0.6
+
diff --git a/devel/hs-process-extras/Makefile b/devel/hs-process-extras/Makefile
index e1d51026b5b8..9523c3885920 100644
--- a/devel/hs-process-extras/Makefile
+++ b/devel/hs-process-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= process-extras
PORTVERSION= 0.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 02c520a0909e..d755e714554b 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 5.2.2
+PORTVERSION= 5.3
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,8 +10,7 @@ COMMENT= Profunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= base-orphans bifunctors comonad contravariant \
- distributive tagged
+USE_CABAL= base-orphans bifunctors comonad distributive tagged
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index 2bac91b4fc8d..3904ac4f7b80 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523817696
-SHA256 (cabal/profunctors-5.2.2.tar.gz) = e981e6a33ac99d38a947a749179bbea3c294ecf6bfde41660fe6d8d5a2e43768
-SIZE (cabal/profunctors-5.2.2.tar.gz) = 28155
+TIMESTAMP = 1545676462
+SHA256 (cabal/profunctors-5.3.tar.gz) = 74632acc5bb76e04ade95e187be432b607da0e863c0e08f3cabafb23d8b4a3b7
+SIZE (cabal/profunctors-5.3.tar.gz) = 28744
diff --git a/devel/hs-profunctors/files/patch-profunctors.cabal b/devel/hs-profunctors/files/patch-profunctors.cabal
new file mode 100644
index 000000000000..5fc7f80f6af0
--- /dev/null
+++ b/devel/hs-profunctors/files/patch-profunctors.cabal
@@ -0,0 +1,10 @@
+--- profunctors.cabal.orig 2018-07-03 01:33:59 UTC
++++ profunctors.cabal
+@@ -38,7 +38,6 @@ library
+ base-orphans >= 0.4 && < 0.9,
+ bifunctors >= 5.2 && < 6,
+ comonad >= 4 && < 6,
+- contravariant >= 1 && < 2,
+ distributive >= 0.4.4 && < 1,
+ semigroups >= 0.11 && < 0.19,
+ tagged >= 0.4.4 && < 1,
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index 07dbe705deff..4d6b83f18de9 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -2,7 +2,7 @@
PORTNAME= project-template
PORTVERSION= 0.2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-psqueues/Makefile b/devel/hs-psqueues/Makefile
index 3e920fde460c..4cbe94394c21 100644
--- a/devel/hs-psqueues/Makefile
+++ b/devel/hs-psqueues/Makefile
@@ -2,7 +2,7 @@
PORTNAME= psqueues
PORTVERSION= 0.2.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index e02a40df2229..f6bc92a81aaf 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index 86d22c304238..70133c9126d0 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= random
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readable/Makefile b/devel/hs-readable/Makefile
index e484de6dc7c0..0babd8d5d84c 100644
--- a/devel/hs-readable/Makefile
+++ b/devel/hs-readable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= readable
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 78be4e204039..d78a83a74a9e 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-refact/Makefile b/devel/hs-refact/Makefile
index 05a111b76190..527ceaac55e0 100644
--- a/devel/hs-refact/Makefile
+++ b/devel/hs-refact/Makefile
@@ -2,7 +2,7 @@
PORTNAME= refact
PORTVERSION= 0.3.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index fe7daa819e3c..cec6bc8d1fee 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 2.1.3
+PORTVERSION= 2.1.4
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 5016d7aa1ae5..01337fe4fbcb 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523900374
-SHA256 (cabal/reflection-2.1.3.tar.gz) = 88f81923abd7211e51de7071cd5800b30784e374c193de8cdd7b1c201f8de405
-SIZE (cabal/reflection-2.1.3.tar.gz) = 18085
+TIMESTAMP = 1545655551
+SHA256 (cabal/reflection-2.1.4.tar.gz) = f22fc478d43a36ec3d6c48c57ec53636c0bf936f3733b9a2b34e1a2e6351c44d
+SIZE (cabal/reflection-2.1.4.tar.gz) = 18364
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index a0ee988419ea..b03a2d05424a 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 6e9f5cab9c27..a3c192292d7a 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -2,7 +2,7 @@
PORTNAME= resourcet
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe-exceptions/Makefile b/devel/hs-safe-exceptions/Makefile
index eafeaad75993..1c6fe5b0f4d7 100644
--- a/devel/hs-safe-exceptions/Makefile
+++ b/devel/hs-safe-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= safe-exceptions
PORTVERSION= 0.1.7.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal
index 65a07f779527..e042b781aeef 100644
--- a/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal
+++ b/devel/hs-safe-exceptions/files/patch-safe-exceptions.cabal
@@ -5,7 +5,7 @@
hs-source-dirs: src
exposed-modules: Control.Exception.Safe
- build-depends: base >= 4.7 && < 4.11
-+ build-depends: base >= 4.7 && < 4.12
++ build-depends: base >= 4.7 && < 4.13
, deepseq >= 1.2 && < 1.5
- , exceptions >= 0.8 && < 0.9
+ , exceptions >= 0.8 && < 0.11
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index 38c6137acff2..1775722bb697 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= safe
PORTVERSION= 0.3.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-say/Makefile b/devel/hs-say/Makefile
index 243f7e5c25bb..290959456d5b 100644
--- a/devel/hs-say/Makefile
+++ b/devel/hs-say/Makefile
@@ -2,7 +2,7 @@
PORTNAME= say
PORTVERSION= 0.1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index f2b0f94a9c4a..59070de58e15 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -2,7 +2,7 @@
PORTNAME= scientific
PORTVERSION= 0.3.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index 0f8409eabb6d..95bb1eca1e8a 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= securemem
PORTVERSION= 0.1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index ae60f17d66bb..4f0aec0ac211 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,7 +2,7 @@
PORTNAME= setenv
PORTVERSION= 0.1.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setlocale/Makefile b/devel/hs-setlocale/Makefile
index bb818eac2c4f..ca78a667b9ce 100644
--- a/devel/hs-setlocale/Makefile
+++ b/devel/hs-setlocale/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= setlocale
-PORTVERSION= 1.0.0.6
+PORTVERSION= 1.0.0.8
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-setlocale/distinfo b/devel/hs-setlocale/distinfo
index 516f2deb21f9..b3bbb4263b45 100644
--- a/devel/hs-setlocale/distinfo
+++ b/devel/hs-setlocale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523637605
-SHA256 (cabal/setlocale-1.0.0.6.tar.gz) = 587af63153c1f3642de2c2f526b3a3c82c46ece3bd09ffd96a0eedbfd1c288e6
-SIZE (cabal/setlocale-1.0.0.6.tar.gz) = 2113
+TIMESTAMP = 1545559211
+SHA256 (cabal/setlocale-1.0.0.8.tar.gz) = 6dd148e47714707c311d20af606284ab392392a84ffb71da4004010e67d5b969
+SIZE (cabal/setlocale-1.0.0.8.tar.gz) = 2111
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index 6dbc2491e077..158238993a3f 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shake
PORTVERSION= 0.16.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 76fae60a720c..0161d27ff8ef 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index 87be648337a7..741b4584a8ea 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,7 +2,7 @@
PORTNAME= silently
PORTVERSION= 1.2.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index a4a5adbf1e5e..2680923d6305 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 667cb51d9e73..f1252468d5e0 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index e28a7fa0f560..234abd7c879d 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -3,7 +3,7 @@
PORTNAME= split
PORTVERSION= 0.2.3.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/files/patch-split.cabal b/devel/hs-split/files/patch-split.cabal
new file mode 100644
index 000000000000..4c0952e6f619
--- /dev/null
+++ b/devel/hs-split/files/patch-split.cabal
@@ -0,0 +1,11 @@
+--- split.cabal.orig 2018-01-24 03:00:12 UTC
++++ split.cabal
+@@ -51,7 +51,7 @@ Source-repository head
+
+ Library
+ ghc-options: -Wall
+- build-depends: base <4.12
++ build-depends: base <4.13
+ exposed-modules: Data.List.Split, Data.List.Split.Internals
+ default-language: Haskell2010
+ Hs-source-dirs: src
diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile
index 34be4bdffb7d..856392aa298e 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-storable-record/Makefile b/devel/hs-storable-record/Makefile
index f77a43c5cceb..24cb10bf07e0 100644
--- a/devel/hs-storable-record/Makefile
+++ b/devel/hs-storable-record/Makefile
@@ -2,7 +2,7 @@
PORTNAME= storable-record
PORTVERSION= 0.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-storable-tuple/Makefile b/devel/hs-storable-tuple/Makefile
index e84f402f939f..2bad8c98d334 100644
--- a/devel/hs-storable-tuple/Makefile
+++ b/devel/hs-storable-tuple/Makefile
@@ -2,7 +2,7 @@
PORTNAME= storable-tuple
PORTVERSION= 0.0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index 2d513076762b..e64e470e31b5 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -2,7 +2,7 @@
PORTNAME= streaming-commons
PORTVERSION= 0.2.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 3b0deb0a93d9..c0b2fcd37006 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index edf11ab73795..82bb01d6bc12 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.9
+PORTVERSION= 0.6.1.10
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 9aac13185178..3642d02ff535 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524154298
-SHA256 (cabal/syb-with-class-0.6.1.9.tar.gz) = 06a96de923d9e67e4399fab5ddcc792cefcc7e87d5c6b72a648ba6c0fedffbaa
-SIZE (cabal/syb-with-class-0.6.1.9.tar.gz) = 12526
+TIMESTAMP = 1545562890
+SHA256 (cabal/syb-with-class-0.6.1.10.tar.gz) = a77e3f231141b173b50bad8939a2eafbc0b14c615556464ad95851b5d9ef133a
+SIZE (cabal/syb-with-class-0.6.1.10.tar.gz) = 12530
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 0a9c8ac90dbe..72183a0d2900 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb
PORTVERSION= 0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 0f3b534ff50c..877078f4226a 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 29691236dec6..e5ea05c43d68 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -2,7 +2,7 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 3d2e14e49ac0..db5845b04710 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tagged
PORTVERSION= 0.8.5
-PORTREVISION= 3
+PORTREVISION= 5
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 2028756a946c..583b5b33b0b4 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.14
++ build-depends: template-haskell >= 2.8 && < 2.15
if flag(deepseq)
build-depends: deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index 70acef0238c3..e20f68821d91 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,7 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-terminal-size/Makefile b/devel/hs-terminal-size/Makefile
index c25f870ab368..ba8d6045bf36 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 8349e3af6000..8d31e937ee03 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 7134b3449370..1feec1a9b656 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 956146bddcc3..b8d2e7ddd109 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8.2.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/files/patch-test-framework.cabal b/devel/hs-test-framework/files/patch-test-framework.cabal
new file mode 100644
index 000000000000..655a85e05ba8
--- /dev/null
+++ b/devel/hs-test-framework/files/patch-test-framework.cabal
@@ -0,0 +1,11 @@
+--- test-framework.cabal.orig 2017-12-30 17:49:37 UTC
++++ test-framework.cabal
+@@ -48,7 +48,7 @@ Library
+ , ansi-terminal >= 0.4.0 && < 0.9
+ , ansi-wl-pprint >= 0.5.1 && < 0.7
+ , random >= 1.0 && < 1.2
+- , containers >= 0.1 && < 0.6
++ , containers >= 0.1 && < 0.7
+ , regex-posix >= 0.72 && < 0.96
+ , old-locale >= 1.0 && < 1.1
+ , time >= 1.1.2 && < 1.9
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 1f169c83285c..12db8d064487 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-short/Makefile b/devel/hs-text-short/Makefile
index 2b77fb49f252..0ac39e22dcca 100644
--- a/devel/hs-text-short/Makefile
+++ b/devel/hs-text-short/Makefile
@@ -2,7 +2,7 @@
PORTNAME= text-short
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-short/files/patch-text-short.cabal b/devel/hs-text-short/files/patch-text-short.cabal
new file mode 100644
index 000000000000..59e5cf8c1871
--- /dev/null
+++ b/devel/hs-text-short/files/patch-text-short.cabal
@@ -0,0 +1,11 @@
+--- text-short.cabal.orig 2018-12-24 13:33:33 UTC
++++ text-short.cabal
+@@ -33,7 +33,7 @@ library
+
+ other-modules: Data.Text.Short.Internal
+
+- build-depends: base >= 4.7 && < 4.12
++ build-depends: base >= 4.7 && < 4.13
+ , bytestring >= 0.10.4 && < 0.11
+ , hashable >= 1.2.6 && < 1.3
+ , deepseq >= 1.3 && < 1.5
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 32db5d510737..36108949c1e7 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-abstraction/Makefile b/devel/hs-th-abstraction/Makefile
index b11f3dd8f22f..6f7e6dbb3dd0 100644
--- a/devel/hs-th-abstraction/Makefile
+++ b/devel/hs-th-abstraction/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= th-abstraction
-PORTVERSION= 0.2.6.0
+PORTVERSION= 0.2.10.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-th-abstraction/distinfo b/devel/hs-th-abstraction/distinfo
index 70bd629dfdaf..98b35a9f71d9 100644
--- a/devel/hs-th-abstraction/distinfo
+++ b/devel/hs-th-abstraction/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523446140
-SHA256 (cabal/th-abstraction-0.2.6.0.tar.gz) = e52e289a547d68f203d65f2e63ec2d87a3c613007d2fe873615c0969b981823c
-SIZE (cabal/th-abstraction-0.2.6.0.tar.gz) = 23406
+TIMESTAMP = 1545494086
+SHA256 (cabal/th-abstraction-0.2.10.0.tar.gz) = c9dbffcaa4ed04f257427e61da135797190b572d4e37662f7821844cbd2114af
+SIZE (cabal/th-abstraction-0.2.10.0.tar.gz) = 29620
diff --git a/devel/hs-th-abstraction/files/patch-th-abstraction.cabal b/devel/hs-th-abstraction/files/patch-th-abstraction.cabal
deleted file mode 100644
index 02a07dfac45e..000000000000
--- a/devel/hs-th-abstraction/files/patch-th-abstraction.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- th-abstraction.cabal.orig 2018-04-11 11:32:45 UTC
-+++ th-abstraction.cabal
-@@ -28,7 +28,7 @@ library
- other-modules: Language.Haskell.TH.Datatype.Internal
- build-depends: base >=4.3 && <5,
- ghc-prim,
-- template-haskell >=2.5 && <2.13,
-+ template-haskell >=2.5 && <2.14,
- containers >=0.4 && <0.6
- hs-source-dirs: src
- default-language: Haskell2010
diff --git a/devel/hs-th-expand-syns/Makefile b/devel/hs-th-expand-syns/Makefile
index ff3dcbb23300..2d15d6a58a6b 100644
--- a/devel/hs-th-expand-syns/Makefile
+++ b/devel/hs-th-expand-syns/Makefile
@@ -2,7 +2,7 @@
PORTNAME= th-expand-syns
PORTVERSION= 0.4.4.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal b/devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal
new file mode 100644
index 000000000000..ef4f3f134a45
--- /dev/null
+++ b/devel/hs-th-expand-syns/files/patch-th-expand-syns.cabal
@@ -0,0 +1,11 @@
+--- th-expand-syns.cabal.orig 2017-12-26 20:43:27 UTC
++++ th-expand-syns.cabal
+@@ -26,7 +26,7 @@ source-repository head
+ location: git://github.com/DanielSchuessler/th-expand-syns.git
+
+ Library
+- build-depends: base >= 4 && < 5, template-haskell < 2.14, syb, containers
++ build-depends: base >= 4 && < 5, template-haskell < 2.15, syb, containers
+ ghc-options:
+ exposed-modules: Language.Haskell.TH.ExpandSyns
+ other-modules: Language.Haskell.TH.ExpandSyns.SemigroupCompat
diff --git a/devel/hs-th-lift-instances/Makefile b/devel/hs-th-lift-instances/Makefile
index 2c6f79c98de6..f096e1eccc60 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-th-lift/Makefile b/devel/hs-th-lift/Makefile
index c8f7c5ac841e..ee45419da4cd 100644
--- a/devel/hs-th-lift/Makefile
+++ b/devel/hs-th-lift/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= th-lift
-PORTVERSION= 0.7.8
+PORTVERSION= 0.7.11
PORTREVISION= 1
CATEGORIES= devel haskell
@@ -10,5 +10,7 @@ COMMENT= Derive Template Haskell's Lift class for datatypes.
LICENSE= BSD3CLAUSE
+USE_CABAL= th-abstraction
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-th-lift/distinfo b/devel/hs-th-lift/distinfo
index b0a656d79cbb..87bbafaadc8b 100644
--- a/devel/hs-th-lift/distinfo
+++ b/devel/hs-th-lift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523429375
-SHA256 (cabal/th-lift-0.7.8.tar.gz) = 2cf83385e848d9136a1d6e49ca845fd1d09935f2ff658c6f4e268d8ece02c12b
-SIZE (cabal/th-lift-0.7.8.tar.gz) = 12399
+TIMESTAMP = 1545493576
+SHA256 (cabal/th-lift-0.7.11.tar.gz) = d53cd1479d3cf35c513095f3954eee539e73c55266cec5f1fa0a82d53f30238c
+SIZE (cabal/th-lift-0.7.11.tar.gz) = 12756
diff --git a/devel/hs-th-orphans/Makefile b/devel/hs-th-orphans/Makefile
index b8cb7c9581cf..40294fe6204d 100644
--- a/devel/hs-th-orphans/Makefile
+++ b/devel/hs-th-orphans/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= th-orphans
-PORTVERSION= 0.13.5
+PORTVERSION= 0.13.6
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-th-orphans/distinfo b/devel/hs-th-orphans/distinfo
index 6e704d3dbc02..68a8641f82ef 100644
--- a/devel/hs-th-orphans/distinfo
+++ b/devel/hs-th-orphans/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524930811
-SHA256 (cabal/th-orphans-0.13.5.tar.gz) = 95644d4b7914317e1dd31095947b8371f1a18be0c09e75f0e29203eb774a25ad
-SIZE (cabal/th-orphans-0.13.5.tar.gz) = 6675
+TIMESTAMP = 1545681019
+SHA256 (cabal/th-orphans-0.13.6.tar.gz) = 7745e6b93a73cbc0a6aa0da0a7b7377f0be4fffb4fd311e5502de199ec1dd469
+SIZE (cabal/th-orphans-0.13.6.tar.gz) = 6773
diff --git a/devel/hs-th-reify-many/Makefile b/devel/hs-th-reify-many/Makefile
index 78f35de98d41..1018fbd0078d 100644
--- a/devel/hs-th-reify-many/Makefile
+++ b/devel/hs-th-reify-many/Makefile
@@ -2,7 +2,7 @@
PORTNAME= th-reify-many
PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index cbca9b9a6fff..0362dd1796d5 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -2,7 +2,7 @@
PORTNAME= threads
PORTVERSION= 0.5.1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 558d7e5d1570..609ac96354c7 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -2,6 +2,7 @@
PORTNAME= threadscope
PORTVERSION= 0.2.11.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 00c64cbfedb2..abd437050fe0 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= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
index 56fce23b72fa..9e70634344dc 100644
--- a/devel/hs-time-locale-compat/Makefile
+++ b/devel/hs-time-locale-compat/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= time-locale-compat
-PORTVERSION= 0.1.1.3
-PORTREVISION= 3
+PORTVERSION= 0.1.1.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-locale-compat/distinfo b/devel/hs-time-locale-compat/distinfo
index 0533bd70cba7..858500966a33 100644
--- a/devel/hs-time-locale-compat/distinfo
+++ b/devel/hs-time-locale-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627860
-SHA256 (cabal/time-locale-compat-0.1.1.3.tar.gz) = 9144bf68b47791a2ac73f45aeadbc5910be2da9ad174909e1a10a70b4576aced
-SIZE (cabal/time-locale-compat-0.1.1.3.tar.gz) = 1925
+TIMESTAMP = 1545832941
+SHA256 (cabal/time-locale-compat-0.1.1.5.tar.gz) = 07ff1566de7d851423a843b2de385442319348c621d4f779b3d365ce91ac502c
+SIZE (cabal/time-locale-compat-0.1.1.5.tar.gz) = 1956
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 1918fd532c88..163795ff407c 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -2,7 +2,7 @@
PORTNAME= timezone-olson
PORTVERSION= 0.1.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index f5db301a154b..bf31f855f0a4 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 08726e58932e..484dbd7c4b1e 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
index c86ec29aeb87..dd6c2824872f 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-typed-process/Makefile b/devel/hs-typed-process/Makefile
index 3d17ec25ddcc..57362e7db44d 100644
--- a/devel/hs-typed-process/Makefile
+++ b/devel/hs-typed-process/Makefile
@@ -2,7 +2,7 @@
PORTNAME= typed-process
PORTVERSION= 0.2.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 75630f187404..70a5d14af04a 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unexceptionalio/Makefile b/devel/hs-unexceptionalio/Makefile
index 8d253544884f..e0cca309195b 100644
--- a/devel/hs-unexceptionalio/Makefile
+++ b/devel/hs-unexceptionalio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unexceptionalio
PORTVERSION= 0.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unicode-show/Makefile b/devel/hs-unicode-show/Makefile
index bbca381f67c8..ec931f57ce8f 100644
--- a/devel/hs-unicode-show/Makefile
+++ b/devel/hs-unicode-show/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unicode-show
PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index b206911366cc..9f3e302dfb4b 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index 9013694772f8..2006ac03ac81 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index 0dea188f5cfc..2d571f29bb79 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unix-time
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unliftio-core/Makefile b/devel/hs-unliftio-core/Makefile
index d3ef5a53d370..7fba68f0ec2c 100644
--- a/devel/hs-unliftio-core/Makefile
+++ b/devel/hs-unliftio-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unliftio-core
PORTVERSION= 0.1.1.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unliftio-core/files/patch-unliftio-core.cabal b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal
index 6dd96c3ebaa3..8f2276dce17c 100644
--- a/devel/hs-unliftio-core/files/patch-unliftio-core.cabal
+++ b/devel/hs-unliftio-core/files/patch-unliftio-core.cabal
@@ -5,7 +5,7 @@
src
build-depends:
- base >=4.5 && <4.11
-+ base >=4.5 && <4.12
++ base >=4.5 && <4.13
, transformers >=0.2 && <0.6
exposed-modules:
Control.Monad.IO.Unlift
diff --git a/devel/hs-unliftio/Makefile b/devel/hs-unliftio/Makefile
index a8697f26a724..14133f87689b 100644
--- a/devel/hs-unliftio/Makefile
+++ b/devel/hs-unliftio/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unliftio
-PORTVERSION= 0.2.6.0
+PORTVERSION= 0.2.9.0
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-unliftio/distinfo b/devel/hs-unliftio/distinfo
index 1e358d9455c5..1e25a41bddbd 100644
--- a/devel/hs-unliftio/distinfo
+++ b/devel/hs-unliftio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523902179
-SHA256 (cabal/unliftio-0.2.6.0.tar.gz) = f87d5b6fa7f1bdb2d47e91c30411a3a878bc281a1259fc23abe146d1c4a4b366
-SIZE (cabal/unliftio-0.2.6.0.tar.gz) = 28311
+TIMESTAMP = 1545757713
+SHA256 (cabal/unliftio-0.2.9.0.tar.gz) = ff6596a932d1b52b409739fd7bbc07234b484cc72f459f2515b27c2b55cd39b8
+SIZE (cabal/unliftio-0.2.9.0.tar.gz) = 38909
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index eac9dc51e8d1..77e485678b1e 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= unordered-containers
PORTVERSION= 0.2.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index cefabfe4bf4c..747ad5e6cd1c 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= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 1355fe71ce01..c5c4c62ced67 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 81e02df43821..27173a105c36 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= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 1c673a108a75..dba3f827318a 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= 17
+PORTREVISION= 18
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +10,10 @@ COMMENT= Attribute Grammar System of Universiteit Utrecht
LICENSE= BSD3CLAUSE
+DEPRECATED= No release since 2011
+BROKEN= Doesn't build with newest GHC
+EXPIRATION_DATE=31.01.2019
+
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uulib>=0.9.14
EXECUTABLE= uuagc-bootstrap
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index fe863ea45e54..182ac01d2b6d 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 52385386f48d..de881f71a45f 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.52.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,6 +11,10 @@ COMMENT= Attribute Grammar System of Universiteit Utrecht
LICENSE= BSD3CLAUSE
+DEPRECATED= No release since 2015
+BROKEN= Doesn't build with recent Haskell libraries
+EXPIRATION_DATE=31.01.2019
+
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
uulib>=0.9.14
diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile
index c657c3b781f8..5e173024b127 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 5d148aa20151..e482aadc18a7 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuid
PORTVERSION= 1.3.13
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid/files/patch-uuid.cabal b/devel/hs-uuid/files/patch-uuid.cabal
index 673d36c51cbe..96a6ff80b2ea 100644
--- a/devel/hs-uuid/files/patch-uuid.cabal
+++ b/devel/hs-uuid/files/patch-uuid.cabal
@@ -1,10 +1,15 @@
---- uuid.cabal.orig 2018-04-29 12:00:18 UTC
+--- uuid.cabal.orig 2016-12-17 19:29:29 UTC
+++ uuid.cabal
-@@ -37,7 +37,7 @@ Library
- entropy >= 0.3.7 && < 0.4,
+@@ -34,10 +34,10 @@ Library
+ bytestring >= 0.10 && < 0.11,
+ cryptohash-sha1 >= 0.11.100 && < 0.12,
+ cryptohash-md5 >= 0.11.100 && < 0.12,
+- entropy >= 0.3.7 && < 0.4,
++ entropy >= 0.3.7 && < 0.5,
network-info == 0.2.*,
random >= 1.0.1 && < 1.2,
- time >= 1.1 && < 1.8,
+ time >= 1.1 && < 1.9,
text >= 1 && < 1.3,
uuid-types >= 1.0.2 && < 2
+
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 6319ac7587c6..99428c7f3c40 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uulib
PORTVERSION= 0.9.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 3b50e3e34b95..c051d2981290 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.1.0
+PORTVERSION= 0.3.1.2
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 9591f6f4842c..fe7914532030 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523431307
-SHA256 (cabal/vault-0.3.1.0.tar.gz) = d960a843c3dae1f6073f50e980dcdbbe2e46e9911273c9f122ba96494c4c979f
-SIZE (cabal/vault-0.3.1.0.tar.gz) = 5199
+TIMESTAMP = 1545653873
+SHA256 (cabal/vault-0.3.1.2.tar.gz) = 9e00e52ec0b054cfb9b1e44d8ce2eefb499cc1dcd4bcdd0d434b370d635e551c
+SIZE (cabal/vault-0.3.1.2.tar.gz) = 5307
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index b23ebcfe4725..7c63e6e80ffe 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= vector-algorithms
-PORTVERSION= 0.7.0.1
-PORTREVISION= 4
+PORTVERSION= 0.8.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index 0ad9e7af2ede..f6e30090768a 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627863
-SHA256 (cabal/vector-algorithms-0.7.0.1.tar.gz) = ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070
-SIZE (cabal/vector-algorithms-0.7.0.1.tar.gz) = 25435
+TIMESTAMP = 1545678245
+SHA256 (cabal/vector-algorithms-0.8.0.1.tar.gz) = 15bcde786dcf03861946885e030d3dbe3b683e1a6fc12d7317e115084f4637fe
+SIZE (cabal/vector-algorithms-0.8.0.1.tar.gz) = 26071
diff --git a/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal b/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
deleted file mode 100644
index ef5d891319d5..000000000000
--- a/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- vector-algorithms.cabal.orig 2017-07-07 20:17:27 UTC
-+++ vector-algorithms.cabal
-@@ -44,7 +44,7 @@ library
- hs-source-dirs: src
-
- build-depends: base >= 4.5 && < 5,
-- vector >= 0.6 && < 0.12,
-+ vector >= 0.6 && < 0.13,
- primitive >=0.3 && <0.7,
- bytestring >= 0.9 && < 1.0
-
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
index ec08645cb0b9..c6ca95ee9d9d 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector-binary-instances
-PORTVERSION= 0.2.4
+PORTVERSION= 0.2.5.1
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo
index 8dca970e903e..d9963ac93159 100644
--- a/devel/hs-vector-binary-instances/distinfo
+++ b/devel/hs-vector-binary-instances/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523451213
-SHA256 (cabal/vector-binary-instances-0.2.4.tar.gz) = 2b2f783e414dcf2e7dc34ad14264e5af83e5cd4784d5a0a64e4b4571963443f8
-SIZE (cabal/vector-binary-instances-0.2.4.tar.gz) = 4146
+TIMESTAMP = 1545833565
+SHA256 (cabal/vector-binary-instances-0.2.5.1.tar.gz) = 3945b99f8efd319c837700b7cef5163ee23e656e89227357e0b7a41d2a66c512
+SIZE (cabal/vector-binary-instances-0.2.5.1.tar.gz) = 4067
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
deleted file mode 100644
index d2dee98a591e..000000000000
--- a/devel/hs-vector-binary-instances/files/patch-vector-binary-instances.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- vector-binary-instances.cabal.orig 2018-04-11 12:56:40 UTC
-+++ vector-binary-instances.cabal
-@@ -50,7 +50,7 @@ Library
-
- -- Packages needed in order to build this package.
- Build-depends:
-- base > 3 && < 4.11,
-+ base > 3 && < 4.12,
- vector >= 0.6 && < 0.13,
- binary >= 0.5 && < 0.10
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 53e09be5d4cd..7c6947221895 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-instances
PORTVERSION= 3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index faee99540543..bc558b3222f2 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= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 4c4eb667004a..347be7550276 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector
PORTVERSION= 0.12.0.1
-PORTREVISION= 2
+PORTREVISION= 4
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
index 6d3a2e102e38..087af428e4af 100644
--- a/devel/hs-vector/files/patch-vector.cabal
+++ b/devel/hs-vector/files/patch-vector.cabal
@@ -5,7 +5,7 @@
vector.h
- Build-Depends: base >= 4.5 && < 4.10
-+ Build-Depends: base >= 4.5 && < 4.12
++ Build-Depends: base >= 4.5 && < 4.13
, primitive >= 0.5.0.1 && < 0.7
, ghc-prim >= 0.2 && < 0.6
, deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 9b31801d169a..feaa651bc31a 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -2,7 +2,7 @@
PORTNAME= void
PORTVERSION= 0.7.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile
index 8f1f67ad1d3b..f1a22bea038b 100644
--- a/devel/hs-wl-pprint-text/Makefile
+++ b/devel/hs-wl-pprint-text/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wl-pprint-text
PORTVERSION= 1.2.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 2e44d7d22975..b795f6f1dde3 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -2,7 +2,7 @@
PORTNAME= word8
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 160a39f8d68f..53e53cd12f4e 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -9,9 +9,8 @@
# bump the version here.
PORTNAME= stack
-PORTVERSION= 1.7.1
+PORTVERSION= 1.9.3
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= GH \
https://github.com/arrowd/stack-dependencies/releases/download/v${PORTVERSION}/:deps
diff --git a/devel/stack/distinfo b/devel/stack/distinfo
index e7db08312ba0..32ee18267cbd 100644
--- a/devel/stack/distinfo
+++ b/devel/stack/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1546458683
+SHA256 (stack-dependencies-1.9.3.tar.gz) = be9c9394f9c519bf38a597e284148ac372f7f697df84617e0c73e56cef1bd60f
+SIZE (stack-dependencies-1.9.3.tar.gz) = 164677793
+SHA256 (arrowd-stack-dependencies-v1.9.3_GH0.tar.gz) = c9b26a87d62a482307f7640d79214263e48f697ee323110c3bc8112fee36e9dc
+SIZE (arrowd-stack-dependencies-v1.9.3_GH0.tar.gz) = 999
diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile
index 1fe2ab271de2..d561664800e7 100644
--- a/dns/hs-dns/Makefile
+++ b/dns/hs-dns/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dns
PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index be8f56692598..9c55c8a24e75 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnuidn
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 4fc9a282b1b9..e4ef8cf96e5b 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/games/hs-scroll/Makefile b/games/hs-scroll/Makefile
index 94bda2cabdee..b3d2eba18c24 100644
--- a/games/hs-scroll/Makefile
+++ b/games/hs-scroll/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scroll
PORTVERSION= 1.20180421
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile
index fefb36ffe7d2..60a54079271e 100644
--- a/graphics/hs-JuicyPixels/Makefile
+++ b/graphics/hs-JuicyPixels/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= JuicyPixels
-PORTVERSION= 3.2.9.5
+PORTVERSION= 3.3.3
PORTREVISION= 1
CATEGORIES= graphics haskell
diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo
index 8d6bbc35d090..3b3357d75a9e 100644
--- a/graphics/hs-JuicyPixels/distinfo
+++ b/graphics/hs-JuicyPixels/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523462111
-SHA256 (cabal/JuicyPixels-3.2.9.5.tar.gz) = 849c6cf4a613f906f7e553a1baefe9c0dc61c13b41a5f5b9605cf80e328cc355
-SIZE (cabal/JuicyPixels-3.2.9.5.tar.gz) = 122952
+TIMESTAMP = 1545834119
+SHA256 (cabal/JuicyPixels-3.3.3.tar.gz) = 2c04b5b6504a780e9363dc8894837976e18ce0623182e38aab6bc5e76c40b3c4
+SIZE (cabal/JuicyPixels-3.3.3.tar.gz) = 130714
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 1a2690e7c220..31349f286fc7 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cairo
PORTVERSION= 0.13.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 346d8b89caed..3ea05ff41f1f 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dia-base
PORTVERSION= 0.1.1.4
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/files/patch-dia-base.cabal b/graphics/hs-dia-base/files/patch-dia-base.cabal
index fee7a5535871..7e375320b990 100644
--- a/graphics/hs-dia-base/files/patch-dia-base.cabal
+++ b/graphics/hs-dia-base/files/patch-dia-base.cabal
@@ -5,6 +5,6 @@
Build-Depends:
- base >= 4.0 && < 4.10,
-+ base >= 4.0 && < 4.12,
++ base >= 4.0 && < 4.13,
deepseq >= 1.1 && < 1.5
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index 480f1b093cf5..74dcf321fdbc 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= dia-functions
-PORTVERSION= 0.2.1.4
-PORTREVISION= 4
+PORTVERSION= 0.2.1.5
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-functions/distinfo b/graphics/hs-dia-functions/distinfo
index 78e9f27651b6..234e6eda9478 100644
--- a/graphics/hs-dia-functions/distinfo
+++ b/graphics/hs-dia-functions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dia-functions-0.2.1.4.tar.gz) = 4730fbef211f42b4567f4a034dc27bd82f2770adac55b3d04b555067dd550e92
-SIZE (cabal/dia-functions-0.2.1.4.tar.gz) = 8126
+TIMESTAMP = 1545837099
+SHA256 (cabal/dia-functions-0.2.1.5.tar.gz) = aff8ffc4ff79a48f7b275cf84b5a97092e1a674e3c978fdae405d66c3cf732e1
+SIZE (cabal/dia-functions-0.2.1.5.tar.gz) = 8127
diff --git a/graphics/hs-dia-functions/files/patch-dia-functions.cabal b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
index dba41c304907..5f823944b1a3 100644
--- a/graphics/hs-dia-functions/files/patch-dia-functions.cabal
+++ b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
@@ -1,11 +1,22 @@
---- dia-functions.cabal.orig 2017-07-11 15:29:54 UTC
+--- dia-functions.cabal.orig 2016-05-24 15:37:59 UTC
+++ dia-functions.cabal
-@@ -30,7 +30,7 @@ library
+@@ -19,7 +19,7 @@ cabal-version: >=1.2
+ build-type: Simple
+
+ library
+- GHC-Options: -Wall -fwarn-tabs -fno-warn-unused-matches -fno-warn-name-shadowing
++ GHC-Options: -Wall -fwarn-tabs -fno-warn-unused-matches -fno-warn-name-shadowing
+
+ Exposed-Modules:
+ Graphics.Diagrams.Colors,
+@@ -30,8 +30,8 @@ library
Build-Depends:
data-pprint >= 0.2 && < 0.3,
dia-base >= 0.1 && < 0.2,
-- base >= 4.0 && < 4.9,
-+ base >= 4.0 && < 5,
- containers >= 0.4 && < 0.6,
+- base >= 4.0 && < 4.10,
+- containers >= 0.4 && < 0.6,
++ base >= 4.0 && < 4.13,
++ containers >= 0.4 && < 0.7,
xhtml >= 3000.2 && < 3000.3,
mtl >= 2.0 && < 2.3,
+ deepseq >= 1.1 && < 1.5
diff --git a/graphics/hs-graphviz/Makefile b/graphics/hs-graphviz/Makefile
index 0471fe8da314..aecb728751eb 100644
--- a/graphics/hs-graphviz/Makefile
+++ b/graphics/hs-graphviz/Makefile
@@ -2,6 +2,7 @@
PORTNAME= graphviz
PORTVERSION= 2999.20.0.2
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-graphviz/files/patch-graphviz.cabal b/graphics/hs-graphviz/files/patch-graphviz.cabal
new file mode 100644
index 000000000000..5b6ffdebfcaf
--- /dev/null
+++ b/graphics/hs-graphviz/files/patch-graphviz.cabal
@@ -0,0 +1,11 @@
+--- graphviz.cabal.orig 2018-05-25 10:40:58 UTC
++++ graphviz.cabal
+@@ -64,7 +64,7 @@ Library {
+ process,
+ directory,
+ temporary >=1.1 && <1.4,
+- fgl >= 5.4 && < 5.7,
++ fgl >= 5.4 && < 5.8,
+ filepath,
+ polyparse >=1.9 && <1.13,
+ bytestring >= 0.9 && < 0.11,
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 9fec3e122237..f0c94368cd8a 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= svgcairo
PORTVERSION= 0.13.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 0c6d28d39da0..96a9a825c4a4 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -18,11 +18,11 @@ COMMENT= Compiler for the functional language Haskell
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-GHC_VERSION= 8.4.4
+GHC_VERSION= 8.6.3
HSCOLOUR_VERSION= 1.24.4
-LLVM_VERSION= 50
+LLVM_VERSION= 60
-CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.3
+CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.* ghc-8.6.2
.include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk"
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 9935dc931a02..5f49889c6623 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -18,7 +18,7 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION?= 8.4.4
+GHC_VERSION?= 8.6.3
HSCOLOUR_VERSION= 1.24.4
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 53471a89622a..1a0166f3093c 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -95,6 +95,7 @@ basement_port?= devel/hs-basement
basic-prelude_port?= devel/hs-basic-prelude
bencode_port?= textproc/hs-bencode
bifunctors_port?= devel/hs-bifunctors
+bitarray_port?= devel/hs-bitarray
bits-atomic_port?= devel/hs-bits-atomic
blaze-builder_port?= devel/hs-blaze-builder
blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator
@@ -158,6 +159,7 @@ cpphs_port?= devel/hs-cpphs
cprng-aes_port?= security/hs-cprng-aes
cpu_port?= sysutils/hs-cpu
criterion_port?= benchmarks/hs-criterion
+criterion-measurement_port?= benchmarks/hs-criterion-measurement
Crypto_port?= security/hs-Crypto
crypto-api_port?= security/hs-crypto-api
crypto-cipher-types_port?= security/hs-crypto-cipher-types
@@ -198,6 +200,7 @@ datetime_port?= devel/hs-datetime
DAV_port?= www/hs-DAV # executable
dbus_port?= devel/hs-dbus
deepseq-generics_port?= devel/hs-deepseq-generics
+dense-linear-algebra_port?= math/hs-dense-linear-algebra
dia-base_port?= graphics/hs-dia-base
dia-functions_port?= graphics/hs-dia-functions
Diff_port?= textproc/hs-Diff
@@ -311,6 +314,7 @@ hslogger_port?= devel/hs-hslogger
hslua_port?= devel/hs-hslua
hslua-module-text_port?= devel/hs-hslua-module-text
HsOpenSSL_port?= security/hs-HsOpenSSL
+HsYAML_port?= textproc/hs-HsYAML
hspec_port?= devel/hs-hspec # executable
hspec-core_port?= devel/hs-hspec-core
hspec-discover_port?= devel/hs-hspec-discover # executable
@@ -355,6 +359,7 @@ lhs2tex_port?= textproc/hs-lhs2tex
libmpd_port?= audio/hs-libmpd
libxml_port?= textproc/hs-libxml
libxml-sax_port?= textproc/hs-libxml-sax # lib_depends
+libyaml_port?= textproc/hs-libyaml
lifted-async_port?= devel/hs-lifted-async
lifted-base_port?= devel/hs-lifted-base
List_port?= devel/hs-List
@@ -548,6 +553,7 @@ typed-process_port?= devel/hs-typed-process
unamb_port?= devel/hs-unamb
unexceptionalio_port?= devel/hs-unexceptionalio
unicode-show_port?= devel/hs-unicode-show
+unicode-transforms_port?= textproc/hs-unicode-transforms
uniplate_port?= devel/hs-uniplate
unix-compat_port?= devel/hs-unix-compat
unix-time_port?= devel/hs-unix-time
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 4ee3ee5c367f..c3a9a30b28a0 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1541010522
-SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2
-SIZE (ghc-8.4.4-src.tar.xz) = 11319500
+TIMESTAMP = 1541010523
+SHA256 (ghc-8.6.3-src.tar.xz) = 9f9e37b7971935d88ba80426c36af14b1e0b3ec1d9c860f44a4391771bc07f23
+SIZE (ghc-8.6.3-src.tar.xz) = 19138116
SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724
SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400
SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972
diff --git a/lang/ghc/files/extra-patch-aclocal.m4 b/lang/ghc/files/extra-patch-aclocal.m4
index 8adc3e28b4e3..5e674d2f9556 100644
--- a/lang/ghc/files/extra-patch-aclocal.m4
+++ b/lang/ghc/files/extra-patch-aclocal.m4
@@ -1,46 +1,8 @@
--- aclocal.m4.orig 2018-03-25 21:22:32 UTC
+++ aclocal.m4
-@@ -648,6 +648,14 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
- $3="$$3 -D_HPUX_SOURCE"
- $5="$$5 -D_HPUX_SOURCE"
- ;;
-+ arm*freebsd*)
-+ # On arm/freebsd, tell gcc to generate Arm
-+ # instructions (ie not Thumb) and to link using the gold linker.
-+ # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
-+ $2="$$2 -marm"
-+ $3="$$3 -Wl,-z,noexecstack"
-+ $4="$$4 -z noexecstack"
-+ ;;
- arm*linux*)
- # On arm/linux and arm/android, tell gcc to generate Arm
- # instructions (ie not Thumb).
-@@ -656,6 +664,11 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
- $4="$$4 -z noexecstack"
- ;;
-
-+ aarch64*freebsd*)
-+ $3="$$3 -Wl,-z,noexecstack"
-+ $4="$$4 -z noexecstack"
-+ ;;
-+
- aarch64*linux*)
- $3="$$3 -Wl,-z,noexecstack"
- $4="$$4 -z noexecstack"
-@@ -1917,6 +1930,10 @@ case "$1" in
- # converts the canonicalized target into someting llvm can understand
- AC_DEFUN([GHC_LLVM_TARGET], [
- case "$2-$3" in
-+ *-freebsd*-gnueabihf)
-+ llvm_target_vendor="unknown"
-+ llvm_target_os="freebsd-gnueabihf"
-+ ;;
- hardfloat-*eabi)
- llvm_target_vendor="unknown"
- llvm_target_os="$3""hf"
@@ -2361,13 +2378,6 @@ AC_DEFUN([FIND_LD],[
[enable_ld_override=yes])
-
+
find_ld() {
- # Make sure the user didn't specify LD manually.
- if test "z$LD" != "z"; then
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
deleted file mode 100644
index a3ff7aea111a..000000000000
--- a/lang/ghc/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig 2018-03-06 20:04:54 UTC
-+++ configure
-@@ -9108,6 +9108,19 @@ $as_echo_n "checking Setting up CFLAGS, LDFLAGS, IGNOR
- IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack"
- ;;
-
-+ arm*freebsd*)
-+ # On arm/freebsd, tell gcc to generate Arm
-+ # instructions (ie not Thumb).
-+ CFLAGS="$CFLAGS -marm"
-+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-+ IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack"
-+ ;;
-+
-+ aarch64*freebsd*)
-+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-+ IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -z noexecstack"
-+ ;;
-+
- powerpc-ibm-aix*)
- # We need `-D_THREAD_SAFE` to unlock the thread-local `errno`.
- CFLAGS="$CFLAGS -D_THREAD_SAFE"
diff --git a/lang/ghc/files/patch-fix-build-on-arm b/lang/ghc/files/patch-fix-build-on-arm
deleted file mode 100644
index 824d6bae07b5..000000000000
--- a/lang/ghc/files/patch-fix-build-on-arm
+++ /dev/null
@@ -1,231 +0,0 @@
-From d8495549ba9d194815c2d0eaee6797fc7c00756a Mon Sep 17 00:00:00 2001
-From: Kavon Farvardin <kavon@farvard.in>
-Date: Sun, 28 Oct 2018 12:11:49 -0400
-Subject: [PATCH] Fix for T14251 on ARM
-
-We now calculate the SSE register padding needed to fix the calling
-convention in LLVM in a robust way: grouping them by whether
-registers in that class overlap (with the same class overlapping
-itself).
-
-My prior patch assumed that no matter the platform, physical
-register Fx aliases with Dx, etc, for our calling convention.
-
-This is unfortunately not the case for any platform except x86-64.
-
-Test Plan:
-Only know how to test on x86-64, but it should be tested on ARM with:
-
-`make test WAYS=llvm && make test WAYS=optllvm`
-
-Reviewers: bgamari, angerman
-
-Reviewed By: bgamari
-
-Subscribers: rwbarton, carter
-
-GHC Trac Issues: #15780, #14251, #15747
-
-Differential Revision: https://phabricator.haskell.org/D5254
----
- compiler/llvmGen/LlvmCodeGen/Base.hs | 123 ++++++++++++++++++++++----------
- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 6 +-
- 2 files changed, 90 insertions(+), 39 deletions(-)
-
-diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs
-index ec91bac..0a40b73 100644
---- compiler/llvmGen/LlvmCodeGen/Base.hs
-+++ compiler/llvmGen/LlvmCodeGen/Base.hs
-@@ -26,7 +26,7 @@ module LlvmCodeGen.Base (
-
- cmmToLlvmType, widthToLlvmFloat, widthToLlvmInt, llvmFunTy,
- llvmFunSig, llvmFunArgs, llvmStdFunAttrs, llvmFunAlign, llvmInfAlign,
-- llvmPtrBits, tysToParams, llvmFunSection, padLiveArgs, isSSE,
-+ llvmPtrBits, tysToParams, llvmFunSection, padLiveArgs, isFPR,
-
- strCLabel_llvm, strDisplayName_llvm, strProcedureName_llvm,
- getGlobalPtr, generateExternDecls,
-@@ -47,6 +47,7 @@ import CodeGen.Platform ( activeStgRegs )
- import DynFlags
- import FastString
- import Cmm hiding ( succ )
-+import CmmUtils ( regsOverlap )
- import Outputable as Outp
- import Platform
- import UniqFM
-@@ -58,8 +59,7 @@ import ErrUtils
- import qualified Stream
-
- import Control.Monad (ap)
--import Data.List (sort)
--import Data.Maybe (mapMaybe)
-+import Data.List (sort, groupBy, head)
-
- -- ----------------------------------------------------------------------------
- -- * Some Data Types
-@@ -152,36 +152,91 @@ llvmFunArgs dflags live =
- map (lmGlobalRegArg dflags) (filter isPassed allRegs)
- where platform = targetPlatform dflags
- allRegs = activeStgRegs platform
-- paddedLive = map (\(_,r) -> r) $ padLiveArgs live
-+ paddedLive = map (\(_,r) -> r) $ padLiveArgs dflags live
- isLive r = r `elem` alwaysLive || r `elem` paddedLive
-- isPassed r = not (isSSE r) || isLive r
--
--
--isSSE :: GlobalReg -> Bool
--isSSE (FloatReg _) = True
--isSSE (DoubleReg _) = True
--isSSE (XmmReg _) = True
--isSSE (YmmReg _) = True
--isSSE (ZmmReg _) = True
--isSSE _ = False
--
--sseRegNum :: GlobalReg -> Maybe Int
--sseRegNum (FloatReg i) = Just i
--sseRegNum (DoubleReg i) = Just i
--sseRegNum (XmmReg i) = Just i
--sseRegNum (YmmReg i) = Just i
--sseRegNum (ZmmReg i) = Just i
--sseRegNum _ = Nothing
--
---- the bool indicates whether the global reg was added as padding.
---- the returned list is not sorted in any particular order,
---- but does indicate the set of live registers needed, with SSE padding.
--padLiveArgs :: LiveGlobalRegs -> [(Bool, GlobalReg)]
--padLiveArgs live = allRegs
-+ isPassed r = not (isFPR r) || isLive r
-+
-+
-+isFPR :: GlobalReg -> Bool
-+isFPR (FloatReg _) = True
-+isFPR (DoubleReg _) = True
-+isFPR (XmmReg _) = True
-+isFPR (YmmReg _) = True
-+isFPR (ZmmReg _) = True
-+isFPR _ = False
-+
-+sameFPRClass :: GlobalReg -> GlobalReg -> Bool
-+sameFPRClass (FloatReg _) (FloatReg _) = True
-+sameFPRClass (DoubleReg _) (DoubleReg _) = True
-+sameFPRClass (XmmReg _) (XmmReg _) = True
-+sameFPRClass (YmmReg _) (YmmReg _) = True
-+sameFPRClass (ZmmReg _) (ZmmReg _) = True
-+sameFPRClass _ _ = False
-+
-+normalizeFPRNum :: GlobalReg -> GlobalReg
-+normalizeFPRNum (FloatReg _) = FloatReg 1
-+normalizeFPRNum (DoubleReg _) = DoubleReg 1
-+normalizeFPRNum (XmmReg _) = XmmReg 1
-+normalizeFPRNum (YmmReg _) = YmmReg 1
-+normalizeFPRNum (ZmmReg _) = ZmmReg 1
-+normalizeFPRNum _ = error "normalizeFPRNum expected only FPR regs"
-+
-+getFPRCtor :: GlobalReg -> Int -> GlobalReg
-+getFPRCtor (FloatReg _) = FloatReg
-+getFPRCtor (DoubleReg _) = DoubleReg
-+getFPRCtor (XmmReg _) = XmmReg
-+getFPRCtor (YmmReg _) = YmmReg
-+getFPRCtor (ZmmReg _) = ZmmReg
-+getFPRCtor _ = error "getFPRCtor expected only FPR regs"
-+
-+fprRegNum :: GlobalReg -> Int
-+fprRegNum (FloatReg i) = i
-+fprRegNum (DoubleReg i) = i
-+fprRegNum (XmmReg i) = i
-+fprRegNum (YmmReg i) = i
-+fprRegNum (ZmmReg i) = i
-+fprRegNum _ = error "fprRegNum expected only FPR regs"
-+
-+-- | Input: dynflags, and the list of live registers
-+--
-+-- Output: An augmented list of live registers, where padding was
-+-- added to the list of registers to ensure the calling convention is
-+-- correctly used by LLVM.
-+--
-+-- Each global reg in the returned list is tagged with a bool, which
-+-- indicates whether the global reg was added as padding, or was an original
-+-- live register.
-+--
-+-- That is, True => padding, False => a real, live global register.
-+--
-+-- Also, the returned list is not sorted in any particular order.
-+--
-+padLiveArgs :: DynFlags -> LiveGlobalRegs -> [(Bool, GlobalReg)]
-+padLiveArgs dflags live =
-+ if platformUnregisterised plat
-+ then taggedLive -- not using GHC's register convention for platform.
-+ else padding ++ taggedLive
-+ where
-+ taggedLive = map (\x -> (False, x)) live
-+ plat = targetPlatform dflags
-+
-+ fprLive = filter isFPR live
-+ padding = concatMap calcPad $ groupBy sharesClass fprLive
-+
-+ sharesClass :: GlobalReg -> GlobalReg -> Bool
-+ sharesClass a b = sameFPRClass a b || overlappingClass
-+ where
-+ overlappingClass = regsOverlap dflags (norm a) (norm b)
-+ norm = CmmGlobal . normalizeFPRNum
-+
-+ calcPad :: [GlobalReg] -> [(Bool, GlobalReg)]
-+ calcPad rs = getFPRPadding (getFPRCtor $ head rs) rs
-+
-+getFPRPadding :: (Int -> GlobalReg) -> LiveGlobalRegs -> [(Bool, GlobalReg)]
-+getFPRPadding paddingCtor live = padding
- where
-- sseRegNums = sort $ mapMaybe sseRegNum live
-- (_, padding) = foldl assignSlots (1, []) $ sseRegNums
-- allRegs = padding ++ map (\r -> (False, r)) live
-+ fprRegNums = sort $ map fprRegNum live
-+ (_, padding) = foldl assignSlots (1, []) $ fprRegNums
-
- assignSlots (i, acc) regNum
- | i == regNum = -- don't need padding here
-@@ -195,11 +250,7 @@ padLiveArgs live = allRegs
-
- genPad start n =
- take n $ flip map (iterate (+1) start) (\i ->
-- (True, FloatReg i))
-- -- NOTE: Picking float should be fine for the following reasons:
-- -- (1) Float aliases with all the other SSE register types on
-- -- the given platform.
-- -- (2) The argument is not live anyways.
-+ (True, paddingCtor i))
-
-
- -- | Llvm standard fun attributes
-diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
-index 1873400..21abc65 100644
---- compiler/llvmGen/LlvmCodeGen/CodeGen.hs
-+++ compiler/llvmGen/LlvmCodeGen/CodeGen.hs
-@@ -1814,14 +1814,14 @@ funPrologue live cmmBlocks = do
- -- STG Liveness optimisation done here.
- funEpilogue :: LiveGlobalRegs -> LlvmM ([LlvmVar], LlvmStatements)
- funEpilogue live = do
-+ dflags <- getDynFlags
-
- -- the bool indicates whether the register is padding.
- let alwaysNeeded = map (\r -> (False, r)) alwaysLive
-- livePadded = alwaysNeeded ++ padLiveArgs live
-+ livePadded = alwaysNeeded ++ padLiveArgs dflags live
-
- -- Set to value or "undef" depending on whether the register is
- -- actually live
-- dflags <- getDynFlags
- let loadExpr r = do
- (v, _, s) <- getCmmRegVal (CmmGlobal r)
- return (Just $ v, s)
-@@ -1833,7 +1833,7 @@ funEpilogue live = do
- loads <- flip mapM allRegs $ \r -> case () of
- _ | (False, r) `elem` livePadded
- -> loadExpr r -- if r is not padding, load it
-- | not (isSSE r) || (True, r) `elem` livePadded
-+ | not (isFPR r) || (True, r) `elem` livePadded
- -> loadUndef r
- | otherwise -> return (Nothing, nilOL)
-
---
-1.9.1
-
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 8ab4d6e13130..25e8affef3f9 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,4 +1,4 @@
---- ghc.mk.orig 2017-01-03 15:59:18 UTC
+--- ghc.mk.orig 2018-09-16 20:53:54 UTC
+++ ghc.mk
@@ -96,6 +96,7 @@ endif
# Catch make if it runs away into an infinite loop
@@ -8,14 +8,13 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
endif
-@@ -459,10 +460,7 @@ PACKAGES_STAGE1 += ghc-boot-th
- PACKAGES_STAGE1 += ghc-boot
- PACKAGES_STAGE1 += template-haskell
+@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell
PACKAGES_STAGE1 += ghc-compact
--
+ PACKAGES_STAGE1 += ghc-heap
+
-ifeq "$(HADDOCK_DOCS)" "YES"
PACKAGES_STAGE1 += xhtml
-endif
-
+
ifeq "$(WITH_TERMINFO)" "YES"
PACKAGES_STAGE1 += terminfo
diff --git a/lang/ghc/files/patch-llvm-targets b/lang/ghc/files/patch-llvm-targets
deleted file mode 100644
index c66e44cda054..000000000000
--- a/lang/ghc/files/patch-llvm-targets
+++ /dev/null
@@ -1,12 +0,0 @@
---- llvm-targets.orig 2018-03-17 14:04:41 UTC
-+++ llvm-targets
-@@ -20,4 +20,9 @@
- ,("aarch64-apple-ios", ("e-m:o-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
- ,("i386-apple-ios", ("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128", "yonah", ""))
- ,("x86_64-apple-ios", ("e-m:o-i64:64-f80:128-n8:16:32:64-S128", "core2", ""))
-+,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
-+,("armv7-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align"))
-+,("aarch64-unknown-freebsd", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
-+,("amd64-portbld-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
-+,("i386-portbld-freebsd", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "i486", ""))
- ]
diff --git a/lang/ghc/files/patch-rts_posix_OSMem.c b/lang/ghc/files/patch-rts_posix_OSMem.c
deleted file mode 100644
index dce26edcfced..000000000000
--- a/lang/ghc/files/patch-rts_posix_OSMem.c
+++ /dev/null
@@ -1,250 +0,0 @@
---- rts/posix/OSMem.c.orig 2017-11-28 16:39:14 UTC
-+++ rts/posix/OSMem.c
-@@ -36,6 +36,10 @@
- #if defined(HAVE_NUMAIF_H)
- #include <numaif.h>
- #endif
-+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_SYS_TIME_H)
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#endif
-
- #include <errno.h>
-
-@@ -45,6 +49,29 @@
- #include <sys/sysctl.h>
- #endif
-
-+#ifndef MAP_FAILED
-+# define MAP_FAILED ((void *)-1)
-+#endif
-+
-+#if defined(hpux_HOST_OS)
-+# ifndef MAP_ANON
-+# define MAP_ANON MAP_ANONYMOUS
-+# endif
-+#endif
-+
-+#ifndef darwin_HOST_OS
-+# undef RESERVE_FLAGS
-+# if defined(MAP_GUARD)
-+# define RESERVE_FLAGS MAP_GUARD /* FreeBSD */
-+# elif defined(MAP_NORESERVE)
-+# define RESERVE_FLAGS MAP_NORESERVE | MAP_ANON | MAP_PRIVATE;
-+# else
-+# if defined(USE_LARGE_ADDRESS_SPACE)
-+# error USE_LARGE_ADDRESS_SPACE needs MAP_NORESERVE or MAP_GUARD
-+# endif
-+# endif
-+#endif
-+
- static void *next_request = 0;
-
- void osMemInit(void)
-@@ -98,8 +125,10 @@
- The naming is chosen from the Win32 API (VirtualAlloc) which does the
- same thing and has done so forever, while support for this in Unix systems
- has only been added recently and is hidden in the posix portability mess.
-- It is confusing because to get the reserve behavior we need MAP_NORESERVE
-- (which tells the kernel not to allocate backing space), but heh...
-+ The Linux manpage suggests that mmap must be passed MAP_NORESERVE in order
-+ to get reservation-only behavior. It is confusing because to get the reserve
-+ behavior we need MAP_NORESERVE (which tells the kernel not to allocate backing
-+ space), but heh...
- */
- enum
- {
-@@ -108,6 +137,44 @@
- MEM_RESERVE_AND_COMMIT = MEM_RESERVE | MEM_COMMIT
- };
-
-+#if defined(linux_HOST_OS)
-+static void *
-+linux_retry_mmap(int operation, W_ size, void *ret, void *addr, int prot, int flags)
-+{
-+ if (addr != 0 && (operation & MEM_RESERVE)) {
-+ // Try again with no hint address.
-+ // It's not clear that this can ever actually help,
-+ // but since our alternative is to abort, we may as well try.
-+ ret = mmap(0, size, prot, flags, -1, 0);
-+ }
-+ if (ret == MAP_FAILED && errno == EPERM) {
-+ // Linux is not willing to give us any mapping,
-+ // so treat this as an out-of-memory condition
-+ // (really out of virtual address space).
-+ errno = ENOMEM;
-+ }
-+ return ret;
-+}
-+#endif /* defined(linux_HOST_OS) */
-+
-+static void
-+post_mmap_madvise(int operation, W_ size, void *ret)
-+{
-+#if defined(MADV_WILLNEED)
-+ if (operation & MEM_COMMIT) {
-+ madvise(ret, size, MADV_WILLNEED);
-+# if defined(MADV_DODUMP)
-+ madvise(ret, size, MADV_DODUMP);
-+# endif
-+ } else {
-+ madvise(ret, size, MADV_DONTNEED);
-+# if defined(MADV_DONTDUMP)
-+ madvise(ret, size, MADV_DONTDUMP);
-+# endif
-+ }
-+#endif
-+}
-+
- /* Returns NULL on failure; errno set */
- static void *
- my_mmap (void *addr, W_ size, int operation)
-@@ -149,69 +216,44 @@
- VM_PROT_READ|VM_PROT_WRITE);
- }
-
--#else
-+#else /* defined(darwin_HOST_OS) */
-
- int prot, flags;
-- if (operation & MEM_COMMIT)
-+ if (operation & MEM_COMMIT) {
- prot = PROT_READ | PROT_WRITE;
-- else
-+ } else {
- prot = PROT_NONE;
-- if (operation == MEM_RESERVE)
--# if defined(MAP_NORESERVE)
-- flags = MAP_NORESERVE;
-+ }
-+
-+ if (operation == MEM_RESERVE) {
-+# if defined(RESERVE_FLAGS)
-+ flags = RESERVE_FLAGS;
- # else
--# if defined(USE_LARGE_ADDRESS_SPACE)
--# error USE_LARGE_ADDRESS_SPACE needs MAP_NORESERVE
--# endif
- errorBelch("my_mmap(,,MEM_RESERVE) not supported on this platform");
- # endif
-- else if (operation == MEM_COMMIT)
-- flags = MAP_FIXED;
-- else
-- flags = 0;
-+ } else if (operation == MEM_COMMIT) {
-+ flags = MAP_FIXED | MAP_ANON | MAP_PRIVATE;
-+ } else {
-+ flags = MAP_ANON | MAP_PRIVATE;
-+ }
-
--#if defined(hpux_HOST_OS)
-- ret = mmap(addr, size, prot, flags | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
--#elif defined(linux_HOST_OS)
-- ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0);
-- if (ret == (void *)-1 && errno == EPERM) {
-+ ret = mmap(addr, size, prot, flags, -1, 0);
-+# if defined(linux_HOST_OS)
-+ if (ret == MAP_FAILED && errno == EPERM) {
- // Linux may return EPERM if it tried to give us
- // a chunk of address space below mmap_min_addr,
- // See Trac #7500.
-- if (addr != 0 && (operation & MEM_RESERVE)) {
-- // Try again with no hint address.
-- // It's not clear that this can ever actually help,
-- // but since our alternative is to abort, we may as well try.
-- ret = mmap(0, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0);
-- }
-- if (ret == (void *)-1 && errno == EPERM) {
-- // Linux is not willing to give us any mapping,
-- // so treat this as an out-of-memory condition
-- // (really out of virtual address space).
-- errno = ENOMEM;
-- }
-+ ret = linux_retry_mmap(operation, size, ret, addr, prot, flags);
- }
--
-- if (operation & MEM_COMMIT) {
-- madvise(ret, size, MADV_WILLNEED);
--#if defined(MADV_DODUMP)
-- madvise(ret, size, MADV_DODUMP);
--#endif
-- } else {
-- madvise(ret, size, MADV_DONTNEED);
--#if defined(MADV_DONTDUMP)
-- madvise(ret, size, MADV_DONTDUMP);
--#endif
-- }
--
--#else
-- ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0);
--#endif
--#endif
--
-- if (ret == (void *)-1) {
-+# endif
-+ if (ret == MAP_FAILED) {
- return NULL;
- }
-+#endif /* defined(darwin_HOST_OS) */
-+
-+ // Map in committed pages rather than take a fault for each chunk.
-+ // Also arrange to include them in core-dump files.
-+ post_mmap_madvise(operation, size, ret);
-
- return ret;
- }
-@@ -435,6 +477,8 @@
- void *base, *top;
- void *start, *end;
-
-+ ASSERT((len & ~MBLOCK_MASK) == len);
-+
- /* We try to allocate len + MBLOCK_SIZE,
- because we need memory which is MBLOCK_SIZE aligned,
- and then we discard what we don't need */
-@@ -500,8 +544,19 @@
- (void*)startAddress, (void*)minimumAddress);
- }
-
-+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_SYS_TIME_H)
-+ struct rlimit limit;
-+ if (!getrlimit(RLIMIT_AS, &limit)
-+ && limit.rlim_cur > 0
-+ && *len > limit.rlim_cur) {
-+ *len = limit.rlim_cur;
-+ }
-+#endif
-+
- attempt = 0;
- while (1) {
-+ *len &= ~MBLOCK_MASK;
-+
- if (*len < MBLOCK_SIZE) {
- // Give up if the system won't even give us 16 blocks worth of heap
- barf("osReserveHeapMemory: Failed to allocate heap storage");
-@@ -512,9 +567,14 @@
- if (at == NULL) {
- // This means that mmap failed which we take to mean that we asked
- // for too much memory. This can happen due to POSIX resource
-- // limits. In this case we reduce our allocation request by a factor
-- // of two and try again.
-- *len /= 2;
-+ // limits. In this case we reduce our allocation request by a
-+ // fraction of the current size and try again.
-+ //
-+ // Note that the previously would instead decrease the request size
-+ // by a factor of two; however, this meant that significant amounts
-+ // of memory will be wasted (e.g. imagine a machine with 512GB of
-+ // physical memory but a 511GB ulimit). See #14492.
-+ *len -= *len / 8;
- } else if ((W_)at >= minimumAddress) {
- // Success! We were given a block of memory starting above the 8 GB
- // mark, which is what we were looking for.
-@@ -536,7 +596,7 @@
- {
- void *r = my_mmap(at, size, MEM_COMMIT);
- if (r == NULL) {
-- barf("Unable to commit %d bytes of memory", size);
-+ barf("Unable to commit %" FMT_Word " bytes of memory", size);
- }
- }
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index 3ae06efbe395..2aa9604fdcdf 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 5c659670612d..127981acef98 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 32b418fac585..6b407de60611 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 2.3.2.5
+PORTVERSION= 2.3.2.9
PORTREVISION= 1
CATEGORIES= mail haskell
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index 4a917ef8078b..edfad40602ca 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523785923
-SHA256 (cabal/email-validate-2.3.2.5.tar.gz) = 7b4ff4e89eccc073df2f51e9d20d507ba1a6d4f5746130c712844c7cf8674e4c
-SIZE (cabal/email-validate-2.3.2.5.tar.gz) = 9693
+TIMESTAMP = 1545833431
+SHA256 (cabal/email-validate-2.3.2.9.tar.gz) = aeac6eea61192683bbde6bb8bdcf2150a03f79fa2bf4a1deb5e838a0011a4e8b
+SIZE (cabal/email-validate-2.3.2.9.tar.gz) = 9678
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index d1c91a5bb2a0..0c2e361064f8 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mime-mail
PORTVERSION= 0.4.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index e73a328dda97..17974edc51a8 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mime-types
PORTVERSION= 0.1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index 22e29f24c2c1..e0d1eb3bf2bd 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mime
PORTVERSION= 0.4.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/Makefile b/math/Makefile
index 8c7ff64df79e..b485a1c5bfcf 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -270,6 +270,7 @@
SUBDIR += hs-contravariant
SUBDIR += hs-data-lens
SUBDIR += hs-data-lens-template
+ SUBDIR += hs-dense-algebra
SUBDIR += hs-distributive
SUBDIR += hs-erf
SUBDIR += hs-fixed
diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile
index c1016f495885..e8f3bc7648ac 100644
--- a/math/hs-Agda-stdlib/Makefile
+++ b/math/hs-Agda-stdlib/Makefile
@@ -4,6 +4,7 @@ PORTNAME= Agda-stdlib
DISTVERSION= 0.16
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 9c991387bc79..ceb1959b89f8 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,15 +2,18 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.5.4
+PORTVERSION= 2.5.4.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
+BROKEN= Doesn't build with recent GHC
+
USE_CABAL= async EdisonCore blaze-html boxes data-hash edit-distance \
- equivalence geniplate-mirror gitrev hashable hashtables ieee754 \
- mtl murmur-hash parallel regex-tdfa strict \
+ equivalence filemanip geniplate-mirror gitrev hashable \
+ hashtables ieee754 mtl murmur-hash parallel regex-tdfa strict \
unordered-containers uri-encode zlib
USE_ALEX= yes
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index a7288c16c642..687707bdb460 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531764592
-SHA256 (cabal/Agda-2.5.4.tar.gz) = b40971e3312461771e36a11aaf4002424178301cf315b21a679f527b79c09e09
-SIZE (cabal/Agda-2.5.4.tar.gz) = 1993562
+TIMESTAMP = 1545834764
+SHA256 (cabal/Agda-2.5.4.2.tar.gz) = f645add8a47a35da3f37757204fa9c80aeb0993d628fc2057fa343e92e579b1f
+SIZE (cabal/Agda-2.5.4.2.tar.gz) = 1988621
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 01a4f5992ce0..bd620a680aa8 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= NumInstances
PORTVERSION= 1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-adjunctions/Makefile b/math/hs-adjunctions/Makefile
index 48928a5788d1..3ee77a60b538 100644
--- a/math/hs-adjunctions/Makefile
+++ b/math/hs-adjunctions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= adjunctions
PORTVERSION= 4.4
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Adjunctions and representable functors
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 contravariant>=1.0 distributive>=0.4 free>=4.0 \
+USE_CABAL= comonad>=4 distributive>=0.4 free>=4.0 \
mtl>=2.0.1 profunctors>=4 semigroupoids>=4 semigroups>=0.11 \
tagged>=0.7 void>=0.5.5.1
diff --git a/math/hs-adjunctions/files/patch-adjunctions.cabal b/math/hs-adjunctions/files/patch-adjunctions.cabal
new file mode 100644
index 000000000000..421accd63b4b
--- /dev/null
+++ b/math/hs-adjunctions/files/patch-adjunctions.cabal
@@ -0,0 +1,12 @@
+--- adjunctions.cabal.orig 2018-01-28 14:49:01 UTC
++++ adjunctions.cabal
+@@ -49,8 +49,7 @@ library
+ array >= 0.3.0.2 && < 0.7,
+ base >= 4 && < 5,
+ comonad >= 4 && < 6,
+- containers >= 0.3 && < 0.6,
+- contravariant >= 1 && < 2,
++ containers >= 0.3 && < 0.7,
+ distributive >= 0.5.1 && < 1,
+ free >= 4 && < 6,
+ mtl >= 2.0.1 && < 2.3,
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index ad20b6e64875..1da44bc6453b 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -2,7 +2,7 @@
PORTNAME= categories
PORTVERSION= 1.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index c27d6d7102fc..cdd94231780f 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 5.0.3
+PORTVERSION= 5.0.4
PORTREVISION= 1
CATEGORIES= math haskell
@@ -10,8 +10,7 @@ COMMENT= Comonads
LICENSE= BSD3CLAUSE
-USE_CABAL= contravariant>=0.2.0.1 distributive>=0.2.2 semigroups>=0.8.3.1 \
- tagged>=0.1
+USE_CABAL= distributive>=0.2.2 semigroups>=0.8.3.1 tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index f17140d27fb3..a427e1637bc3 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523787141
-SHA256 (cabal/comonad-5.0.3.tar.gz) = a7f4584d634051123c547f0d10f88eaf23d99229dbd01dfdcd98cddd41e54df6
-SIZE (cabal/comonad-5.0.3.tar.gz) = 17430
+TIMESTAMP = 1545588743
+SHA256 (cabal/comonad-5.0.4.tar.gz) = 78a89d7f9f0975b40b3294adcb70885649572b687ac5f5dc98e452471838e825
+SIZE (cabal/comonad-5.0.4.tar.gz) = 17758
diff --git a/math/hs-comonad/files/patch-comonad.cabal b/math/hs-comonad/files/patch-comonad.cabal
new file mode 100644
index 000000000000..7dbf7bddc30c
--- /dev/null
+++ b/math/hs-comonad/files/patch-comonad.cabal
@@ -0,0 +1,11 @@
+--- comonad.cabal.orig 2018-07-01 21:24:59 UTC
++++ comonad.cabal
+@@ -89,7 +89,7 @@ library
+ build-depends: containers >= 0.3 && < 0.7
+
+ if flag(contravariant)
+- build-depends: contravariant >= 0.2.0.1 && < 2
++
+
+ if flag(distributive)
+ build-depends: distributive >= 0.2.2 && < 1
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 1f771b021b26..6dc8659474c1 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -2,7 +2,7 @@
PORTNAME= contravariant
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index d802c39eb60c..8174f9539de5 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens-template
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/files/patch-data-lens-template.cabal b/math/hs-data-lens-template/files/patch-data-lens-template.cabal
index 2fdee632b586..338cee942148 100644
--- a/math/hs-data-lens-template/files/patch-data-lens-template.cabal
+++ b/math/hs-data-lens-template/files/patch-data-lens-template.cabal
@@ -5,7 +5,7 @@
data-lens >= 2.0 && < 2.12,
base >= 1.0 && < 5,
- template-haskell >= 2.11 && < 2.12
-+ template-haskell >= 2.11 && < 2.14
++ template-haskell >= 2.11 && < 2.15
exposed-modules:
Data.Lens.Template
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 25f297f670d3..f64cc5fb66ad 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= data-lens
-PORTVERSION= 2.11.1
-PORTREVISION= 3
+PORTVERSION= 2.11.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/distinfo b/math/hs-data-lens/distinfo
index 0d95442ea5f2..9dd416533221 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623374
-SHA256 (cabal/data-lens-2.11.1.tar.gz) = fbbe0bb7d754fa9bced7c89a0629146618ab204cbe7a7ea26b1fa9746ac73c32
-SIZE (cabal/data-lens-2.11.1.tar.gz) = 6208
+TIMESTAMP = 1545835321
+SHA256 (cabal/data-lens-2.11.2.tar.gz) = 5d81364318876f83a4f096a4f9d22695e18042d14114f0f9cce0497cc6ed7988
+SIZE (cabal/data-lens-2.11.2.tar.gz) = 6244
diff --git a/math/hs-data-lens/files/patch-data-lens.cabal b/math/hs-data-lens/files/patch-data-lens.cabal
index 77e39858d90c..c87fd092c5b6 100644
--- a/math/hs-data-lens/files/patch-data-lens.cabal
+++ b/math/hs-data-lens/files/patch-data-lens.cabal
@@ -1,11 +1,13 @@
---- data-lens.cabal.orig 2017-07-10 16:11:36 UTC
+--- data-lens.cabal.orig 2018-01-01 04:21:32 UTC
+++ data-lens.cabal
-@@ -23,7 +23,7 @@ library
+@@ -22,8 +22,8 @@ library
+ build-depends:
base >= 4 && < 5,
comonad >= 4.0 && < 5.1,
- containers >= 0.3 && < 0.6,
-- semigroupoids >= 4.0 && < 5.2,
-+ semigroupoids >= 4.0 && < 5.3,
+- containers >= 0.3 && < 0.6,
+- semigroupoids >= 4.0 && < 5.3,
++ containers >= 0.3 && < 0.7,
++ semigroupoids >= 4.0 && < 5.4,
transformers >= 0.4 && < 0.6
extensions: CPP
diff --git a/math/hs-dense-linear-algebra/Makefile b/math/hs-dense-linear-algebra/Makefile
new file mode 100644
index 000000000000..847919999fc8
--- /dev/null
+++ b/math/hs-dense-linear-algebra/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= dense-linear-algebra
+PORTVERSION= 0.1.0.0
+PORTREVISION= 1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple and incomplete pure haskell implementation of linear algebra
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= math-functions vector-algorithms vector-binary-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-dense-linear-algebra/distinfo b/math/hs-dense-linear-algebra/distinfo
new file mode 100644
index 000000000000..c7752dbb86d4
--- /dev/null
+++ b/math/hs-dense-linear-algebra/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546093924
+SHA256 (cabal/dense-linear-algebra-0.1.0.0.tar.gz) = f7777a7931b40332ebbc716f64abb63697cbab0128e5c1228d47760c5597f2d4
+SIZE (cabal/dense-linear-algebra-0.1.0.0.tar.gz) = 6285
diff --git a/math/hs-dense-linear-algebra/pkg-descr b/math/hs-dense-linear-algebra/pkg-descr
new file mode 100644
index 000000000000..3bda7453e136
--- /dev/null
+++ b/math/hs-dense-linear-algebra/pkg-descr
@@ -0,0 +1,3 @@
+This library is simply collection of linear-algebra related modules split from statistics library.
+
+WWW: https://github.com/bos/statistics
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 01adba04a6cd..b31ccfdeb1b2 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -2,7 +2,7 @@
PORTNAME= distributive
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 078b526cde7d..a5faff83933b 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-fixed/Makefile b/math/hs-fixed/Makefile
index 60180cfb6038..99a83c22bafa 100644
--- a/math/hs-fixed/Makefile
+++ b/math/hs-fixed/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fixed
PORTVERSION= 0.2.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-half/Makefile b/math/hs-half/Makefile
index e9d07c880399..a9e28dc24176 100644
--- a/math/hs-half/Makefile
+++ b/math/hs-half/Makefile
@@ -2,7 +2,7 @@
PORTNAME= half
PORTVERSION= 0.2.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 4ebe56a2b90d..418f0bcef75d 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ieee754
PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-integer-logarithms/Makefile b/math/hs-integer-logarithms/Makefile
index 6f456c8c9579..aec0ad7e90b5 100644
--- a/math/hs-integer-logarithms/Makefile
+++ b/math/hs-integer-logarithms/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= integer-logarithms
-PORTVERSION= 1.0.2.1
+PORTVERSION= 1.0.2.2
PORTREVISION= 1
CATEGORIES= math haskell
diff --git a/math/hs-integer-logarithms/distinfo b/math/hs-integer-logarithms/distinfo
index 8d3b4ce80dff..4ee384a28de0 100644
--- a/math/hs-integer-logarithms/distinfo
+++ b/math/hs-integer-logarithms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523429156
-SHA256 (cabal/integer-logarithms-1.0.2.1.tar.gz) = 32ad4a482a60ec957d1af1268952e2a6b382b67438c14f74f6c2aef2e49b48f2
-SIZE (cabal/integer-logarithms-1.0.2.1.tar.gz) = 8781
+TIMESTAMP = 1545492748
+SHA256 (cabal/integer-logarithms-1.0.2.2.tar.gz) = ba86628d5c14f31fddccea86eeec122ed992af28d5b7ad964b2f5487605e7fc3
+SIZE (cabal/integer-logarithms-1.0.2.2.tar.gz) = 8855
diff --git a/math/hs-kan-extensions/Makefile b/math/hs-kan-extensions/Makefile
index 0d1aef36702e..a971c458f4ed 100644
--- a/math/hs-kan-extensions/Makefile
+++ b/math/hs-kan-extensions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kan-extensions
PORTVERSION= 5.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,7 @@ COMMENT= Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)d
LICENSE= BSD3CLAUSE
-USE_CABAL= adjunctions comonad contravariant distributive free mtl \
- semigroupoids tagged
+USE_CABAL= adjunctions comonad distributive free mtl semigroupoids tagged
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-kan-extensions/files/patch-kan-extensions.cabal b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
index 39598c6a6dce..01c4e16a2d9d 100644
--- a/math/hs-kan-extensions/files/patch-kan-extensions.cabal
+++ b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
@@ -1,8 +1,12 @@
---- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC
+--- kan-extensions.cabal.orig 2018-01-28 14:54:04 UTC
+++ kan-extensions.cabal
-@@ -57,7 +57,6 @@ library
- containers >= 0.4 && < 0.6,
- contravariant >= 1 && < 2,
+@@ -54,10 +54,8 @@ library
+ array >= 0.3.0.2 && < 0.6,
+ base >= 4.4 && < 5,
+ comonad >= 4 && < 6,
+- containers >= 0.4 && < 0.6,
+- contravariant >= 1 && < 2,
++ containers >= 0.4 && < 0.7,
distributive >= 0.2.2 && < 1,
- fail >= 4.9 && < 5,
free >= 4 && < 6,
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 3b6fcc4aa396..834416bf3f74 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= math-functions
-PORTVERSION= 0.2.1.0
-PORTREVISION= 3
+PORTVERSION= 0.3.1.0
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Special functions and Chebyshev polynomials
LICENSE= BSD3CLAUSE
-USE_CABAL= primitive vector vector-th-unbox
+USE_CABAL= data-default-class primitive vector vector-th-unbox
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-math-functions/distinfo b/math/hs-math-functions/distinfo
index cc2656d82b44..17dd7d7a6ef3 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499614804
-SHA256 (cabal/math-functions-0.2.1.0.tar.gz) = f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb
-SIZE (cabal/math-functions-0.2.1.0.tar.gz) = 40272
+TIMESTAMP = 1546104045
+SHA256 (cabal/math-functions-0.3.1.0.tar.gz) = 3340ebec0ab91444f86ce3f785db920b8acfd5fbad70d38abcb02b77ac0f6655
+SIZE (cabal/math-functions-0.3.1.0.tar.gz) = 41822
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index 1ce8c4ac41db..b750f9249edd 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mwc-random
PORTVERSION= 0.13.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 874feec56dab..097c8aa99497 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 5
-PORTREVISION= 3
+PORTVERSION= 5.0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 58d4c08e273e..e39ef0a9e441 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623377
-SHA256 (cabal/pointed-5.tar.gz) = 8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17
-SIZE (cabal/pointed-5.tar.gz) = 4873
+TIMESTAMP = 1545753017
+SHA256 (cabal/pointed-5.0.1.tar.gz) = b94635a5c8779238501a9156015422ce2fb4d5efd45d68999e8cbe2ecc5121dd
+SIZE (cabal/pointed-5.0.1.tar.gz) = 7020
diff --git a/math/hs-pointed/files/patch-git_55eab0 b/math/hs-pointed/files/patch-git_55eab0
deleted file mode 100644
index 3db41e66d335..000000000000
--- a/math/hs-pointed/files/patch-git_55eab0
+++ /dev/null
@@ -1,22 +0,0 @@
-From 55eab00abddefc8b0d9bb2b8c40940e8dfbb0391 Mon Sep 17 00:00:00 2001
-From: Oleg Grenrus <oleg.grenrus@iki.fi>
-Date: Sun, 29 May 2016 17:40:00 +0300
-Subject: [PATCH] Allow data-default-class-0.1.0
-
----
- pointed.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pointed.cabal b/pointed.cabal
-index 96abe75..9ec3f14 100644
---- pointed.cabal
-+++ pointed.cabal
-@@ -61,7 +61,7 @@ flag unordered-containers
-
- library
- build-depends: base >= 4 && < 5,
-- data-default-class >= 0.0.1 && < 0.1
-+ data-default-class >= 0.0.1 && < 0.2
-
- if flag(comonad)
- build-depends: comonad >= 5 && < 6
diff --git a/math/hs-pointed/files/patch-pointed.cabal b/math/hs-pointed/files/patch-pointed.cabal
new file mode 100644
index 000000000000..3720a03b55c8
--- /dev/null
+++ b/math/hs-pointed/files/patch-pointed.cabal
@@ -0,0 +1,19 @@
+--- pointed.cabal.orig 2018-01-22 16:20:10 UTC
++++ pointed.cabal
+@@ -80,7 +80,6 @@ library
+ build-depends: comonad >= 5 && < 6
+
+ if flag(containers)
+- build-depends: containers >= 0.4 && < 0.6
+
+ if flag(kan-extensions)
+ build-depends: kan-extensions >= 5 && < 6
+@@ -92,7 +91,7 @@ library
+ build-depends: semigroups >= 0.8.3.1 && < 1
+
+ if flag(stm)
+- build-depends: stm >= 2.1.2.1 && < 2.5
++ build-depends: stm >= 2.1.2.1 && < 2.6
+
+ if flag(tagged)
+ build-depends: tagged >= 0.5 && < 1
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 1dd886e09622..57df5167da35 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= probability
-PORTVERSION= 0.2.5.1
-PORTREVISION= 3
+PORTVERSION= 0.2.5.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-probability/distinfo b/math/hs-probability/distinfo
index 448e24f4f12f..b303abac658f 100644
--- a/math/hs-probability/distinfo
+++ b/math/hs-probability/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499450528
-SHA256 (cabal/probability-0.2.5.1.tar.gz) = d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d
-SIZE (cabal/probability-0.2.5.1.tar.gz) = 27278
+TIMESTAMP = 1545562979
+SHA256 (cabal/probability-0.2.5.2.tar.gz) = 0f2b8c734eca6b079109948a28d85733543d5cea1dea2d5a1369f52ffc4a3415
+SIZE (cabal/probability-0.2.5.2.tar.gz) = 27285
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index bb32ddba5b40..b59a1f4da4b9 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 5.2.2
+PORTVERSION= 5.3.1
PORTREVISION= 1
CATEGORIES= math haskell
@@ -11,8 +11,8 @@ COMMENT= Semigroupoids: Category sans id
LICENSE= BSD3CLAUSE
USE_CABAL= base-orphans>=0.3 bifunctors>=5.0 comonad>=4.2.6 \
- contravariant>=0.2.0.1 distributive>=0.2.2 \
- semigroups>=0.8.3.1 tagged>=0.7.3 transformers-compat>=0.3
+ distributive>=0.2.2 semigroups>=0.8.3.1 tagged>=0.7.3 \
+ transformers-compat>=0.3
FLAGS_ENABLE= containers contravariant distributive comonad tagged
FLAGS_DISABLE= doctests
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index f05279af5509..17167f46eeed 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523816690
-SHA256 (cabal/semigroupoids-5.2.2.tar.gz) = e4def54834cda65ac1e74e6f12a435410e19c1348e820434a30c491c8937299e
-SIZE (cabal/semigroupoids-5.2.2.tar.gz) = 23800
+TIMESTAMP = 1545676425
+SHA256 (cabal/semigroupoids-5.3.1.tar.gz) = cd89ec61f86260997c79c09bacb7d6c18031375bc3e5467b36f7cb812793388e
+SIZE (cabal/semigroupoids-5.3.1.tar.gz) = 25327
diff --git a/math/hs-semigroupoids/files/patch-semigroupoids.cabal b/math/hs-semigroupoids/files/patch-semigroupoids.cabal
new file mode 100644
index 000000000000..09293ce0c401
--- /dev/null
+++ b/math/hs-semigroupoids/files/patch-semigroupoids.cabal
@@ -0,0 +1,11 @@
+--- semigroupoids.cabal.orig 2018-07-02 18:08:27 UTC
++++ semigroupoids.cabal
+@@ -155,7 +155,7 @@ library
+ build-depends: containers >= 0.3 && < 0.7
+
+ if flag(contravariant)
+- build-depends: contravariant >= 0.2.0.1 && < 2
++
+
+ if flag(distributive)
+ build-depends: distributive >= 0.2.2 && < 1
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 8e86563788d4..cb4a5eeb4707 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -2,7 +2,7 @@
PORTNAME= semigroups
PORTVERSION= 0.18.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 8f03152d2b4f..c9f5e401ee6a 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.14.0.2
-PORTREVISION= 3
+PORTVERSION= 0.15.0.0
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,8 @@ COMMENT= Library of statistical types, data, and functions
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6.0.0 base-orphans erf math-functions>=0.1.5.2 monad-par>=0.3.4 \
+USE_CABAL= aeson>=0.6.0.0 base-orphans data-default-class dense-linear-algebra \
+ erf math-functions>=0.1.5.2 math-functions monad-par>=0.3.4 \
mwc-random>=0.13.0.0 primitive>=0.3 vector>=0.10 \
vector-algorithms>=0.4 vector-binary-instances>=0.2.1 vector-th-unbox
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 079fd9ed53b8..c379f0959f95 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499614825
-SHA256 (cabal/statistics-0.14.0.2.tar.gz) = 3495df2da42c9fcc5b594b97f16c02353bfd6616d6e134ac031dac389d7a4778
-SIZE (cabal/statistics-0.14.0.2.tar.gz) = 99683
+TIMESTAMP = 1545846937
+SHA256 (cabal/statistics-0.15.0.0.tar.gz) = 95e9c45c95e81a35c7bd7443e8d6626fd100505a567de47622185fe9c8be6472
+SIZE (cabal/statistics-0.15.0.0.tar.gz) = 97390
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 51d2619979eb..39ddf05bc240 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.13
+PORTVERSION= 0.15
PORTREVISION= 1
CATEGORIES= math haskell
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index 5d7611982ce9..81cee9f0e105 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524638503
-SHA256 (cabal/vector-space-0.13.tar.gz) = 0291d5778378acbbb1d6709ba57238f3d6ad551b8b2c6ca2b8177e68f748d617
-SIZE (cabal/vector-space-0.13.tar.gz) = 16121
+TIMESTAMP = 1545675645
+SHA256 (cabal/vector-space-0.15.tar.gz) = 6849b443dbb246fa39ac8dc645cc364ce63bd91fb0761ad759eea10eeca25c0f
+SIZE (cabal/vector-space-0.15.tar.gz) = 16078
diff --git a/net-p2p/hs-torrent/Makefile b/net-p2p/hs-torrent/Makefile
index 75d8be7c4bdd..707653202cf1 100644
--- a/net-p2p/hs-torrent/Makefile
+++ b/net-p2p/hs-torrent/Makefile
@@ -2,7 +2,7 @@
PORTNAME= torrent
PORTVERSION= 10000.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile
index 0666f84b4715..548506fac97a 100644
--- a/net/hs-aws/Makefile
+++ b/net/hs-aws/Makefile
@@ -2,6 +2,7 @@
PORTNAME= aws
PORTVERSION= 0.20
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-bsb-http-chunked/Makefile b/net/hs-bsb-http-chunked/Makefile
index 55dcca5f44f4..0548c2975fa0 100644
--- a/net/hs-bsb-http-chunked/Makefile
+++ b/net/hs-bsb-http-chunked/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bsb-http-chunked
-PORTVERSION= 0.0.0.2
+PORTVERSION= 0.0.0.4
PORTREVISION= 1
CATEGORIES= net haskell
diff --git a/net/hs-bsb-http-chunked/distinfo b/net/hs-bsb-http-chunked/distinfo
index 0ef011a0535b..5c8f04d8c17b 100644
--- a/net/hs-bsb-http-chunked/distinfo
+++ b/net/hs-bsb-http-chunked/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524928561
-SHA256 (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 28cb750979763c815fbf69a6dc510f837b7ccbe262adf0a28ad270966737d5f4
-SIZE (cabal/bsb-http-chunked-0.0.0.2.tar.gz) = 6503
+TIMESTAMP = 1545495255
+SHA256 (cabal/bsb-http-chunked-0.0.0.4.tar.gz) = 148309e23eb8b261c1de374712372d62d8c8dc8ee504c392809c7ec33c0a0e7c
+SIZE (cabal/bsb-http-chunked-0.0.0.4.tar.gz) = 6630
diff --git a/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal b/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal
deleted file mode 100644
index 4c3d7444036f..000000000000
--- a/net/hs-bsb-http-chunked/files/patch-bsb-http-chunked.cabal
+++ /dev/null
@@ -1,9 +0,0 @@
---- bsb-http-chunked.cabal.orig 2018-04-28 15:19:50 UTC
-+++ bsb-http-chunked.cabal
-@@ -43,5 +43,4 @@ Library
- Blaze.ByteString.Builder.Internal.Write
-
- build-depends: base >= 4.3 && < 4.12,
-- bytestring >= 0.9 && < 0.11,
-- bytestring-builder < 0.11
-+ bytestring >= 0.9 && < 0.11
diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile
index 1576479079f5..c247122b239f 100644
--- a/net/hs-connection/Makefile
+++ b/net/hs-connection/Makefile
@@ -2,7 +2,7 @@
PORTNAME= connection
PORTVERSION= 0.2.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
index 04aa6f834eef..1079d7c6b287 100644
--- a/net/hs-gsasl/Makefile
+++ b/net/hs-gsasl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gsasl
PORTVERSION= 0.3.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile
index 05df1bed48a0..cf223794473c 100644
--- a/net/hs-hoauth2/Makefile
+++ b/net/hs-hoauth2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hoauth2
PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index 6697122f8328..1fdeb18486f8 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile
index 66569e20a09d..f8939c576bd6 100644
--- a/net/hs-iproute/Makefile
+++ b/net/hs-iproute/Makefile
@@ -2,7 +2,7 @@
PORTNAME= iproute
PORTVERSION= 1.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index 02151aecb827..4d9dc6e27f1a 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index 6f46a10aed83..06ab44b123a5 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -2,6 +2,7 @@
PORTNAME= network-info
PORTVERSION= 0.2.0.10
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index 1d90e0433826..3cad3e6bb3b6 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-multicast
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile
index b9a662c7cbd9..8308c78ff7dd 100644
--- a/net/hs-network-protocol-xmpp/Makefile
+++ b/net/hs-network-protocol-xmpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-protocol-xmpp
PORTVERSION= 0.4.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-uri/Makefile b/net/hs-network-uri/Makefile
index 76b529c5ec89..24d85aa239b5 100644
--- a/net/hs-network-uri/Makefile
+++ b/net/hs-network-uri/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-uri
PORTVERSION= 2.6.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index d15ce6f489b8..a0df2e673a75 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network
PORTVERSION= 2.6.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index af88c3774da9..70adc968931a 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index c22c0738f3fd..33f0ce32918d 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= publicsuffixlist
PORTVERSION= 0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-resolv/Makefile b/net/hs-resolv/Makefile
index 6abb0a6cc712..f299ed5de0bd 100644
--- a/net/hs-resolv/Makefile
+++ b/net/hs-resolv/Makefile
@@ -2,7 +2,7 @@
PORTNAME= resolv
PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-resolv/files/patch-resolv.cabal b/net/hs-resolv/files/patch-resolv.cabal
index 7bf02d0ad6ac..e4b5d13960e6 100644
--- a/net/hs-resolv/files/patch-resolv.cabal
+++ b/net/hs-resolv/files/patch-resolv.cabal
@@ -1,11 +1,16 @@
---- resolv.cabal.orig 2018-04-09 19:24:44 UTC
+--- resolv.cabal.orig 2017-10-26 22:24:39 UTC
+++ resolv.cabal
-@@ -78,7 +78,7 @@ library
+@@ -78,11 +78,11 @@ library
Network.DNS.FFI
Compat
- build-depends: base >= 4.5 && <4.11
-+ build-depends: base >= 4.5 && <4.12
++ build-depends: base >= 4.5 && <4.13
, base16-bytestring == 0.1.*
, binary >= 0.7.3 && < 0.9
, bytestring >= 0.9.2 && < 0.11
+- , containers >= 0.4.2.1 && < 0.6
++ , containers >= 0.4.2.1 && < 0.7
+
+ ghc-options: -Wall
+ include-dirs: cbits
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 1176dcd63a69..e1e8bd251d41 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 1586c6fa5c3c..a42c2edff34b 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-sendfile
PORTVERSION= 0.2.25
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 278ecd027681..235767762805 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -2,7 +2,7 @@
PORTNAME= socks
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 16e73da12caf..408314c9f5cc 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
@@ -11,6 +11,10 @@ COMMENT= FreeBSD ports index search and statistical analysis tool
LICENSE= BSD3CLAUSE
+DEPRECATED= No updates since 2010
+BROKEN= Doesn't build with newest GHC
+EXPIRATION_DATE=31.01.2019
+
USE_CABAL= extensible-exceptions stringsearch
EXECUTABLE= porte
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 440d1cc2bdc4..3dd205427884 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hscolour
PORTVERSION= ${HSCOLOUR_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= print haskell
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 8b6ed3bb22f3..b061508ebce9 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile
index a29d0883318a..a2a68e310f7e 100644
--- a/security/hs-DRBG/Makefile
+++ b/security/hs-DRBG/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DRBG
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 22475ae749cf..895829b619f3 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HsOpenSSL
PORTVERSION= 0.11.4.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 1a046c5b22df..641686309b7b 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= RSA
PORTVERSION= 2.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index a31ce7503051..502ba8877c5b 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SHA
PORTVERSION= 1.6.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index d3bf292d6f75..ef9c857f33e1 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-aes
PORTVERSION= 0.2.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile
index cacbbe1e43bf..9b0676e14e89 100644
--- a/security/hs-cipher-aes128/Makefile
+++ b/security/hs-cipher-aes128/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= cipher-aes128
-PORTVERSION= 0.7.0.3
-PORTREVISION= 3
+PORTVERSION= 0.7.0.4
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes128/distinfo b/security/hs-cipher-aes128/distinfo
index 7a17b3ed108e..3933a852dc6d 100644
--- a/security/hs-cipher-aes128/distinfo
+++ b/security/hs-cipher-aes128/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624169
-SHA256 (cabal/cipher-aes128-0.7.0.3.tar.gz) = 6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a
-SIZE (cabal/cipher-aes128-0.7.0.3.tar.gz) = 25276
+TIMESTAMP = 1545659725
+SHA256 (cabal/cipher-aes128-0.7.0.4.tar.gz) = cd8d8987c1a1839f3c66e655277981083be85489d34b6b47f95d7e82d2d10285
+SIZE (cabal/cipher-aes128-0.7.0.4.tar.gz) = 26294
diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile
index 796c95a3d178..8cf143e319f5 100644
--- a/security/hs-cipher-blowfish/Makefile
+++ b/security/hs-cipher-blowfish/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-blowfish
PORTVERSION= 0.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile
index 5c1169f58571..9a91395d7eb2 100644
--- a/security/hs-cipher-camellia/Makefile
+++ b/security/hs-cipher-camellia/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-camellia
PORTVERSION= 0.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile
index c55756bd4617..bb1fbab54406 100644
--- a/security/hs-cipher-des/Makefile
+++ b/security/hs-cipher-des/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-des
PORTVERSION= 0.0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index dcbfba3dcc18..1fc0748de910 100644
--- a/security/hs-cipher-rc4/Makefile
+++ b/security/hs-cipher-rc4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-rc4
PORTVERSION= 0.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index 01597d08f87f..b95845815bd5 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clientsession
PORTVERSION= 0.9.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index fb1fadefcee3..1a9e887e90e3 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index eccba94a5229..d5d5558a846c 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-api
PORTVERSION= 0.13.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile
index 4a6586267afd..6ba0c4e9c74b 100644
--- a/security/hs-crypto-cipher-types/Makefile
+++ b/security/hs-crypto-cipher-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-cipher-types
PORTVERSION= 0.0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 0bf47f4e239e..cc3908e37f21 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-conduit
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index 964324dc3462..8c470b1bb856 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-numbers
PORTVERSION= 0.2.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index de6702c66598..3a0cda647122 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-pubkey-types
PORTVERSION= 0.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index b6dc12a5fd6b..7d53f804b843 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-pubkey
PORTVERSION= 0.2.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index cd70d9b2d5a7..d722b7e65f4b 100644
--- a/security/hs-crypto-random-api/Makefile
+++ b/security/hs-crypto-random-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-random-api
PORTVERSION= 0.2.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile
index a04401d438ec..f0e23b1aa46f 100644
--- a/security/hs-crypto-random/Makefile
+++ b/security/hs-crypto-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-random
PORTVERSION= 0.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 49f6268af203..0ce337628c52 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptocipher
PORTVERSION= 0.6.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile
index ca9955317184..b64bfc6e03b1 100644
--- a/security/hs-cryptohash-conduit/Makefile
+++ b/security/hs-cryptohash-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-conduit
PORTVERSION= 0.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile
index aeb09da07578..b2eb294cf8e1 100644
--- a/security/hs-cryptohash-cryptoapi/Makefile
+++ b/security/hs-cryptohash-cryptoapi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-cryptoapi
PORTVERSION= 0.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-md5/Makefile b/security/hs-cryptohash-md5/Makefile
index 9cc0273d89ed..2478f464ec51 100644
--- a/security/hs-cryptohash-md5/Makefile
+++ b/security/hs-cryptohash-md5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-md5
PORTVERSION= 0.11.100.1
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal
index 6281f57ac3e3..1f2350d8f926 100644
--- a/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal
+++ b/security/hs-cryptohash-md5/files/patch-cryptohash-md5.cabal
@@ -5,7 +5,7 @@
library
default-language: Haskell2010
- build-depends: base >= 4.5 && < 4.10
-+ build-depends: base >= 4.5 && < 4.12
++ build-depends: base >= 4.5 && < 4.13
, bytestring >= 0.9.2 && < 0.11
hs-source-dirs: src
diff --git a/security/hs-cryptohash-sha1/Makefile b/security/hs-cryptohash-sha1/Makefile
index 8a38296e8baf..e5c3fe5b347e 100644
--- a/security/hs-cryptohash-sha1/Makefile
+++ b/security/hs-cryptohash-sha1/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-sha1
PORTVERSION= 0.11.100.1
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal
index 20e21c23933a..938233fc05c6 100644
--- a/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal
+++ b/security/hs-cryptohash-sha1/files/patch-cryptohash-sha1.cabal
@@ -5,7 +5,7 @@
library
default-language: Haskell2010
- build-depends: base >= 4.5 && < 4.10
-+ build-depends: base >= 4.5 && < 4.12
++ build-depends: base >= 4.5 && < 4.13
, bytestring >= 0.9.2 && < 0.11
hs-source-dirs: src
diff --git a/security/hs-cryptohash-sha256/Makefile b/security/hs-cryptohash-sha256/Makefile
index 277495f003ad..8ee2e0d234ff 100644
--- a/security/hs-cryptohash-sha256/Makefile
+++ b/security/hs-cryptohash-sha256/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-sha256
PORTVERSION= 0.11.101.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal
index e5291aadd366..dcbcff7e6df8 100644
--- a/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal
+++ b/security/hs-cryptohash-sha256/files/patch-cryptohash-sha256.cabal
@@ -5,7 +5,7 @@
Unsafe
- build-depends: base >= 4.5 && < 4.11
-+ build-depends: base >= 4.5 && < 4.12
++ build-depends: base >= 4.5 && < 4.13
, bytestring >= 0.9.2 && < 0.11
ghc-options: -Wall
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 29e0e9918677..f81443137f79 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash
PORTVERSION= 0.11.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptonite-conduit/Makefile b/security/hs-cryptonite-conduit/Makefile
index c22c12d06a13..c89417144b2d 100644
--- a/security/hs-cryptonite-conduit/Makefile
+++ b/security/hs-cryptonite-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptonite-conduit
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile
index b1ad26075a25..8addff120ced 100644
--- a/security/hs-cryptonite/Makefile
+++ b/security/hs-cryptonite/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptonite
PORTVERSION= 0.24
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 240d0392e8d2..28cca4f41d11 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,7 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-ed25519/Makefile b/security/hs-ed25519/Makefile
index e075f20727a8..9dc7024add4c 100644
--- a/security/hs-ed25519/Makefile
+++ b/security/hs-ed25519/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ed25519
PORTVERSION= 0.0.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 68baea6c1d47..094a6e8db728 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= entropy
-PORTVERSION= 0.3.8
-PORTREVISION= 3
+PORTVERSION= 0.4.1.4
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/distinfo b/security/hs-entropy/distinfo
index be433e5a68d9..34b375559a9b 100644
--- a/security/hs-entropy/distinfo
+++ b/security/hs-entropy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538619
-SHA256 (cabal/entropy-0.3.8.tar.gz) = 743a49d5e17ae9d6118ff077f2cd2d5944c0ea6cff501efeec95b68d5f7474d0
-SIZE (cabal/entropy-0.3.8.tar.gz) = 6573
+TIMESTAMP = 1545494256
+SHA256 (cabal/entropy-0.4.1.4.tar.gz) = 2e3f6a65c8fde3551a8fb03b0a519b718762fc3278b1a5750f96d399e821eeb9
+SIZE (cabal/entropy-0.4.1.4.tar.gz) = 7361
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index 85a77edc534c..12601048d0a3 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnutls
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-hackage-security/Makefile b/security/hs-hackage-security/Makefile
index b7151e7a3975..aac6c69fc53f 100644
--- a/security/hs-hackage-security/Makefile
+++ b/security/hs-hackage-security/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hackage-security
PORTVERSION= 0.5.3.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-hackage-security/files/patch-hackage-security.cabal b/security/hs-hackage-security/files/patch-hackage-security.cabal
new file mode 100644
index 000000000000..579177039545
--- /dev/null
+++ b/security/hs-hackage-security/files/patch-hackage-security.cabal
@@ -0,0 +1,18 @@
+--- hackage-security.cabal.orig 2018-03-25 23:39:07 UTC
++++ hackage-security.cabal
+@@ -98,12 +98,12 @@ library
+ Hackage.Security.Util.TypedEmbedded
+ Prelude
+ -- We support ghc 7.4 (bundled with Cabal 1.14) and up
+- build-depends: base >= 4.5 && < 4.12,
++ build-depends: base >= 4.5 && < 4.13,
+ base16-bytestring >= 0.1.1 && < 0.2,
+ base64-bytestring >= 1.0 && < 1.1,
+ bytestring >= 0.9 && < 0.11,
+- Cabal >= 1.14 && < 2.4,
+- containers >= 0.4 && < 0.6,
++ Cabal >= 1.14 && < 2.6,
++ containers >= 0.4 && < 0.7,
+ ed25519 >= 0.0 && < 0.1,
+ filepath >= 1.2 && < 1.5,
+ mtl >= 2.2 && < 2.3,
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 8c76fcb1ccf7..1edd880a88d1 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monadcryptorandom
PORTVERSION= 0.7.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-nonce/Makefile b/security/hs-nonce/Makefile
index f532dafa83ee..a069b881bfc7 100644
--- a/security/hs-nonce/Makefile
+++ b/security/hs-nonce/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nonce
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 7c84ceec12dd..d14b31c596d8 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index d6eed7a2bba9..01e76bdc3ec3 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index eb3c9f246042..12d039d1ea6a 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.4.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 4033d650d2d9..45b3b131e291 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -2,7 +2,7 @@
PORTNAME= skein
PORTVERSION= 1.0.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls-session-manager/Makefile b/security/hs-tls-session-manager/Makefile
index 02755773e595..a385e264a73c 100644
--- a/security/hs-tls-session-manager/Makefile
+++ b/security/hs-tls-session-manager/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tls-session-manager
PORTVERSION= 0.0.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index a76d0558870e..f4747578edbd 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tls
PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile
index 59087786e2a1..1809cb4d8a63 100644
--- a/security/hs-x509-store/Makefile
+++ b/security/hs-x509-store/Makefile
@@ -2,7 +2,7 @@
PORTNAME= x509-store
PORTVERSION= 1.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile
index 5d25b0066a38..7f64e4916c85 100644
--- a/security/hs-x509-system/Makefile
+++ b/security/hs-x509-system/Makefile
@@ -2,7 +2,7 @@
PORTNAME= x509-system
PORTVERSION= 1.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile
index f528bc6fa71c..427e84dd3968 100644
--- a/security/hs-x509-validation/Makefile
+++ b/security/hs-x509-validation/Makefile
@@ -2,7 +2,7 @@
PORTNAME= x509-validation
PORTVERSION= 1.6.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile
index 281285a374df..b0ced0f0bb9c 100644
--- a/security/hs-x509/Makefile
+++ b/security/hs-x509/Makefile
@@ -2,7 +2,7 @@
PORTNAME= x509
PORTVERSION= 1.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/shells/hs-shelly/Makefile b/shells/hs-shelly/Makefile
index b84c4f33657f..6f94faa91516 100644
--- a/shells/hs-shelly/Makefile
+++ b/shells/hs-shelly/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shelly
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= shells haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 56c76fbe8ca4..d1118d768c0e 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= angel
PORTVERSION= 0.6.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +10,10 @@ COMMENT= Process management and supervision daemon
LICENSE= BSD3CLAUSE
+DEPRECATED= No releases since 2016
+BROKEN= Doesn't build with recent GHC
+EXPIRATION_DATE=31.01.2019
+
USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \
unordered-containers>=0.1.4
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 6a7969a5dc58..18b961ea24cf 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-disk-free-space/Makefile b/sysutils/hs-disk-free-space/Makefile
index 1f70bbd1b5be..24f007fbb2bb 100644
--- a/sysutils/hs-disk-free-space/Makefile
+++ b/sysutils/hs-disk-free-space/Makefile
@@ -2,7 +2,7 @@
PORTNAME= disk-free-space
PORTVERSION= 0.1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile
index 1d052ca05b6f..58e31c9064c8 100644
--- a/sysutils/hs-ekg-core/Makefile
+++ b/sysutils/hs-ekg-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ekg-core
-PORTVERSION= 0.1.1.4
+PORTVERSION= 0.1.1.6
PORTREVISION= 1
CATEGORIES= sysutils haskell
diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo
index c113e735dfad..89a7ca1b2b00 100644
--- a/sysutils/hs-ekg-core/distinfo
+++ b/sysutils/hs-ekg-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523637800
-SHA256 (cabal/ekg-core-0.1.1.4.tar.gz) = 66d89acca05c1c91dc57a9c4b3f62d25ccd0c04bb2bfd46d5947f9b8cd8ee937
-SIZE (cabal/ekg-core-0.1.1.4.tar.gz) = 13252
+TIMESTAMP = 1545657937
+SHA256 (cabal/ekg-core-0.1.1.6.tar.gz) = 66a8dd79ad27659052168f08dd41fabb8593e364de00fb857ef5cc943acd5742
+SIZE (cabal/ekg-core-0.1.1.6.tar.gz) = 13454
diff --git a/sysutils/hs-ekg-core/files/patch-ekg-core.cabal b/sysutils/hs-ekg-core/files/patch-ekg-core.cabal
deleted file mode 100644
index b59524573861..000000000000
--- a/sysutils/hs-ekg-core/files/patch-ekg-core.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ekg-core.cabal.orig 2018-04-13 16:45:53 UTC
-+++ ekg-core.cabal
-@@ -33,7 +33,7 @@ library
-
- build-depends:
- ghc-prim < 0.6,
-- base >= 4.5 && < 4.11,
-+ base >= 4.5 && < 4.12,
- containers >= 0.5 && < 0.6,
- text < 1.3,
- unordered-containers < 0.3
diff --git a/sysutils/hs-ekg-json/Makefile b/sysutils/hs-ekg-json/Makefile
index 96d8a914d3e0..c64aa0e67923 100644
--- a/sysutils/hs-ekg-json/Makefile
+++ b/sysutils/hs-ekg-json/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ekg-json
PORTVERSION= 0.1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +10,9 @@ COMMENT= JSON encoding of ekg metrics
LICENSE= BSD3CLAUSE
+BROKEN= Doesn't build with newest Haskell libraries
+EXPIRATION_DATE=31.01.2018
+
USE_CABAL= aeson ekg-core>=0.1 unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/sysutils/hs-ekg-json/files/patch-ekg-json.cabal b/sysutils/hs-ekg-json/files/patch-ekg-json.cabal
deleted file mode 100644
index d3ae028c1991..000000000000
--- a/sysutils/hs-ekg-json/files/patch-ekg-json.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- ekg-json.cabal.orig 2018-04-22 20:52:14 UTC
-+++ ekg-json.cabal
-@@ -20,8 +20,8 @@ library
- exposed-modules:
- System.Metrics.Json
- build-depends:
-- aeson >=0.4 && < 1.3,
-- base >= 4.5 && < 4.11,
-+ aeson >=0.4 && < 1.4,
-+ base >= 4.5 && < 4.12,
- ekg-core >= 0.1 && < 0.2,
- text < 1.3,
- unordered-containers < 0.3
diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile
index b0699638a0ea..dc314b8f9b60 100644
--- a/sysutils/hs-ekg/Makefile
+++ b/sysutils/hs-ekg/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ekg
PORTVERSION= 0.4.0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-mountpoints/Makefile b/sysutils/hs-mountpoints/Makefile
index e7d8cf0b563b..e484c189d102 100644
--- a/sysutils/hs-mountpoints/Makefile
+++ b/sysutils/hs-mountpoints/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mountpoints
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/Makefile b/textproc/Makefile
index c361bffd346f..0e981823d4d6 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -253,6 +253,7 @@
SUBDIR += hr-aspell
SUBDIR += hs-Diff
SUBDIR += hs-HStringTemplate
+ SUBDIR += hs-HsYAML
SUBDIR += hs-appar
SUBDIR += hs-attoparsec
SUBDIR += hs-attoparsec-iso8601
@@ -280,6 +281,7 @@
SUBDIR += hs-lhs2tex
SUBDIR += hs-libxml
SUBDIR += hs-libxml-sax
+ SUBDIR += hs-libyaml
SUBDIR += hs-magic
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-citeproc
@@ -303,6 +305,7 @@
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
SUBDIR += hs-texmath
+ SUBDIR += hs-unicode-transforms
SUBDIR += hs-uri
SUBDIR += hs-uri-bytestring
SUBDIR += hs-uri-bytestring-aeson
diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile
index caefab80d5c6..af9b62a7e721 100644
--- a/textproc/cgrep/Makefile
+++ b/textproc/cgrep/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cgrep
PORTVERSION= 6.6.25
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MAINTAINER= lwhsu@FreeBSD.org
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 74b61e8d0507..d651cf967078 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Diff
PORTVERSION= 0.3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 3089d10fc4db..0a61a6bbd0fa 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HStringTemplate
PORTVERSION= 0.8.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HsYAML/Makefile b/textproc/hs-HsYAML/Makefile
new file mode 100644
index 000000000000..7a80724477b8
--- /dev/null
+++ b/textproc/hs-HsYAML/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= HsYAML
+PORTVERSION= 0.1.1.2
+PORTREVISION= 1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Pure Haskell YAML 1.2 parser
+
+LICENSE= GPLv2
+
+USE_CABAL= dlist
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-HsYAML/distinfo b/textproc/hs-HsYAML/distinfo
new file mode 100644
index 000000000000..66ca6f10c124
--- /dev/null
+++ b/textproc/hs-HsYAML/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546098464
+SHA256 (cabal/HsYAML-0.1.1.2.tar.gz) = 5d429433df990bf9b93f9edb3b6d5778bdf0a1bdbfbe36302236eed5fdf70084
+SIZE (cabal/HsYAML-0.1.1.2.tar.gz) = 60789
diff --git a/textproc/hs-HsYAML/files/patch-HsYAML.cabal b/textproc/hs-HsYAML/files/patch-HsYAML.cabal
new file mode 100644
index 000000000000..e6c01d48b145
--- /dev/null
+++ b/textproc/hs-HsYAML/files/patch-HsYAML.cabal
@@ -0,0 +1,15 @@
+--- HsYAML.cabal.orig 2018-06-30 12:49:02 UTC
++++ HsYAML.cabal
+@@ -65,10 +65,10 @@ library
+ Trustworthy
+ TypeSynonymInstances
+
+- build-depends: base >=4.5 && <4.12
++ build-depends: base >=4.5 && <4.13
+ , bytestring >=0.9 && <0.11
+ , dlist >=0.8 && <0.9
+- , containers >=0.4.2 && <0.6
++ , containers >=0.4.2 && <0.7
+ , text >=1.2.3 && <1.3
+ , mtl >=2.2.1 && <2.3
+ , parsec >=3.1.13.0 && < 3.2
diff --git a/textproc/hs-HsYAML/pkg-descr b/textproc/hs-HsYAML/pkg-descr
new file mode 100644
index 000000000000..cb38fd3a623d
--- /dev/null
+++ b/textproc/hs-HsYAML/pkg-descr
@@ -0,0 +1,6 @@
+HsYAML is a YAML 1.2 parser implementation for Haskell. Features of HsYAML include
+pure Haskell implementation with small dependency footprint and emphasis on
+strict compliance with the YAML 1.2 specification; direct decoding to native
+Haskell types via (aeson-inspired) typeclass-based API.
+
+WWW: https://github.com/hvr/HsYAML
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index 1027bb1fe6c5..fd82852561fe 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile
index f4472eac8934..afd3af564d7f 100644
--- a/textproc/hs-attoparsec-iso8601/Makefile
+++ b/textproc/hs-attoparsec-iso8601/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= attoparsec-iso8601
-PORTVERSION= 1.0.0.0
-PORTREVISION= 3
+PORTVERSION= 1.0.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-iso8601/distinfo b/textproc/hs-attoparsec-iso8601/distinfo
index 7dc90ee0fb6d..987047df7b25 100644
--- a/textproc/hs-attoparsec-iso8601/distinfo
+++ b/textproc/hs-attoparsec-iso8601/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499622155
-SHA256 (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = aa6c6d87587383e386cb85e7ffcc4a6317aa8dafb8ba9a104ecac365ce2a858a
-SIZE (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = 4188
+TIMESTAMP = 1545832395
+SHA256 (cabal/attoparsec-iso8601-1.0.1.0.tar.gz) = 499ffbd2d39e79cc4fda5ad0129dbf94fdb72a84aa932dfe2a5f5c5c02074142
+SIZE (cabal/attoparsec-iso8601-1.0.1.0.tar.gz) = 4317
diff --git a/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal
deleted file mode 100644
index a8a48a468b50..000000000000
--- a/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- attoparsec-iso8601.cabal.orig 2018-04-29 20:25:05 UTC
-+++ attoparsec-iso8601.cabal
-@@ -37,7 +37,7 @@ library
- build-depends:
- attoparsec >= 0.13.0.1,
- base >= 4.5 && < 5,
-- base-compat >= 0.9.1 && < 0.10,
-+ base-compat >= 0.9.1 && < 0.11,
- text >= 1.1.1.0,
- time >= 1.1.1.4
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 3fc0e9bc0a2f..2f9ffc489404 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attoparsec
PORTVERSION= 0.13.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
index c39fbf187465..1531c245d859 100644
--- a/textproc/hs-bencode/Makefile
+++ b/textproc/hs-bencode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bencode
PORTVERSION= 0.6.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index d5c01297aa86..e70ba717c6b4 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-html
PORTVERSION= 0.9.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index acb70dd12717..57973a5f91c7 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.8.2.1
+PORTVERSION= 0.8.2.2
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index c4ac9329c379..2dc120118aca 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523696236
-SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146
-SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320
+TIMESTAMP = 1545494364
+SHA256 (cabal/blaze-markup-0.8.2.2.tar.gz) = c6f0cf8fd707ba8c0b700e0c5ad6a1212c8b57d46a9cbdfb904d8bf585ad82e1
+SIZE (cabal/blaze-markup-0.8.2.2.tar.gz) = 14458
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index d268e9655b0d..b690e1f00ee4 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 268aaae8840e..ae69a6bee557 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -2,7 +2,7 @@
PORTNAME= case-insensitive
PORTVERSION= 1.2.0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
index f9b34f1b4f07..26eab555abf0 100644
--- a/textproc/hs-cassava/Makefile
+++ b/textproc/hs-cassava/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cassava
PORTVERSION= 0.5.1.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-cassava/files/patch-cassava.cabal b/textproc/hs-cassava/files/patch-cassava.cabal
new file mode 100644
index 000000000000..c4a7f83de4e2
--- /dev/null
+++ b/textproc/hs-cassava/files/patch-cassava.cabal
@@ -0,0 +1,11 @@
+--- cassava.cabal.orig 2017-08-12 16:05:04 UTC
++++ cassava.cabal
+@@ -96,7 +96,7 @@ Library
+ attoparsec >= 0.11.3.0 && < 0.14,
+ base >= 4.5 && < 5,
+ bytestring >= 0.9.2 && < 0.11,
+- containers >= 0.4.2 && < 0.6,
++ containers >= 0.4.2 && < 0.7,
+ deepseq >= 1.1 && < 1.5,
+ hashable < 1.3,
+ scientific >= 0.3.4.7 && < 0.4,
diff --git a/textproc/hs-cmark-gfm/Makefile b/textproc/hs-cmark-gfm/Makefile
index 21cdfc94f063..e9ee4dcf4881 100644
--- a/textproc/hs-cmark-gfm/Makefile
+++ b/textproc/hs-cmark-gfm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cmark-gfm
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
index 977efeec5302..01ea78a1f3f6 100644
--- a/textproc/hs-cmark/Makefile
+++ b/textproc/hs-cmark/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cmark
PORTVERSION= 0.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 7e090904b885..86c1e513e754 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile
index acb28810656f..63bb3b155b95 100644
--- a/textproc/hs-doctemplates/Makefile
+++ b/textproc/hs-doctemplates/Makefile
@@ -2,7 +2,7 @@
PORTNAME= doctemplates
PORTVERSION= 0.2.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 7872eb53cee8..2f48b7711369 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= double-conversion
PORTVERSION= 2.0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index bd7bf8e11c58..3b858eb1e2d5 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 1.0.0.0
+PORTVERSION= 1.0.1.0
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index c1b4874b42f4..ce87036646bd 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523695585
-SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17
-SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936
+TIMESTAMP = 1545834803
+SHA256 (cabal/feed-1.0.1.0.tar.gz) = 87bd055b13c43f54e997f716a33d647c6bc1cdb78337c840d144c0b5fdccd31c
+SIZE (cabal/feed-1.0.1.0.tar.gz) = 105930
diff --git a/textproc/hs-feed/files/patch-feed.cabal b/textproc/hs-feed/files/patch-feed.cabal
deleted file mode 100644
index 981e7de9fb21..000000000000
--- a/textproc/hs-feed/files/patch-feed.cabal
+++ /dev/null
@@ -1,31 +0,0 @@
---- feed.cabal.orig 2017-08-26 23:55:46 UTC
-+++ feed.cabal
-@@ -71,8 +71,8 @@ library
- Data.Text.Util
- Data.XML.Compat
- build-depends:
-- base >= 4 && < 4.11
-- , base-compat == 0.9.*
-+ base >= 4 && < 4.12
-+ , base-compat == 0.10.*
- , bytestring >= 0.9 && < 0.11
- , old-locale == 1.0.*
- , old-time >= 1 && < 1.2
-@@ -82,7 +82,7 @@ library
- , time-locale-compat == 0.1.*
- , utf8-string < 1.1
- , xml-types >= 0.3.6 && < 0.4
-- , xml-conduit >= 1.3 && < 1.6
-+ , xml-conduit >= 1.3 && < 1.9
-
- test-suite tests
- ghc-options: -Wall
-@@ -104,7 +104,7 @@ test-suite tests
- build-depends:
- base >= 4 && < 4.11
- , HUnit >= 1.2 && < 1.7
-- , base-compat == 0.9.*
-+ , base-compat == 0.10.*
- , feed
- , old-locale == 1.0.*
- , old-time >= 1 && < 1.2
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index c6504a37b65d..a41e9920e52c 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hexpat
PORTVERSION= 0.20.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 93d7a7417bb8..0618c75fc575 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= highlighting-kate
PORTVERSION= 0.6.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 3b395520b59a..342d24098f39 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 6.2.0.1
+PORTVERSION= 6.7.0.0
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index d9e6052e77b4..d444c31e6d72 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525094674
-SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630
-SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725
+TIMESTAMP = 1546341547
+SHA256 (cabal/hs-bibutils-6.7.0.0.tar.gz) = c5d205294ff372306504b03c4334fd96215727087ee4ee1378a45273a8d6dee1
+SIZE (cabal/hs-bibutils-6.7.0.0.tar.gz) = 742250
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 27f808f386f2..a914d9ef100f 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html-conduit
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 70a9b578e56d..ee7034d5b132 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index a83fc1ca55ed..4ea294d01271 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.2.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 883a64468d24..e291c2d79feb 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.2.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 82de99820b68..f854773c025c 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index 5764c91d92a5..712d716061f7 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 58f757959550..af3592ed3985 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lhs2tex
-PORTVERSION= 1.20
+PORTVERSION= 1.22
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index 5a6272025550..b8463787bc15 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524639224
-SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a
-SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326
+TIMESTAMP = 1545563352
+SHA256 (cabal/lhs2tex-1.22.tar.gz) = 7eea3b5b4bae019aa9acb6036e6c2606c62a0d9969a081d4b9b9f04baa3129bd
+SIZE (cabal/lhs2tex-1.22.tar.gz) = 679988
diff --git a/textproc/hs-lhs2tex/files/patch-src_Document.lhs b/textproc/hs-lhs2tex/files/patch-src_Document.lhs
deleted file mode 100644
index fdbeead0aa32..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_Document.lhs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Document.lhs.orig 2018-04-25 07:05:53 UTC
-+++ src/Document.lhs
-@@ -9,6 +9,7 @@
-
- %endif
-
-+> import Prelude hiding ((<>))
- > infixr 5 {-"\enskip"-} <> -- same fixity as `|++|'
-
- The pretty printer generate documents of type |Doc|.
diff --git a/textproc/hs-lhs2tex/files/patch-src_Main.lhs b/textproc/hs-lhs2tex/files/patch-src_Main.lhs
deleted file mode 100644
index dcc2df875b0f..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_Main.lhs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Main.lhs.orig 2018-04-25 07:41:09 UTC
-+++ src/Main.lhs
-@@ -21,7 +21,7 @@
- > import Control.Monad.Error
- > import Control.Monad.State ( MonadState(..), modify )
- > import Control.Monad.Trans
--> import Prelude hiding ( getContents )
-+> import Prelude hiding ( getContents, (<>) )
- >
- > import Version
- > import TeXCommands
diff --git a/textproc/hs-lhs2tex/files/patch-src_Math.lhs b/textproc/hs-lhs2tex/files/patch-src_Math.lhs
deleted file mode 100644
index 942016c7ab32..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_Math.lhs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Math.lhs.orig 2018-04-25 07:40:44 UTC
-+++ src/Math.lhs
-@@ -7,7 +7,7 @@
- > module Math ( module Math, substitute, number )
- > where
- >
--> import Prelude hiding ( lines )
-+> import Prelude hiding ( lines, (<>) )
- > import Data.List ( partition )
- > import Numeric ( showFFloat )
- > import Control.Applicative ( many )
diff --git a/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs
deleted file mode 100644
index 21728d3ffa0e..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/MathPoly.lhs.orig 2018-04-25 07:08:26 UTC
-+++ src/MathPoly.lhs
-@@ -13,7 +13,7 @@ are subtle differences, and they will grow over time \
- > module MathPoly ( module MathPoly, substitute, number )
- > where
- >
--> import Prelude hiding ( lines )
-+> import Prelude hiding ( lines, (<>) )
- > import Data.List ( partition, nub, insert, sort, transpose )
- > import Numeric ( showFFloat )
- > import Control.Applicative ( many )
diff --git a/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs
deleted file mode 100644
index f9f22a8c93a4..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/NewCode.lhs.orig 2018-04-25 07:08:55 UTC
-+++ src/NewCode.lhs
-@@ -13,6 +13,7 @@ way that is compatible with the @poly@ or @math@ forma
- > module NewCode ( module NewCode )
- > where
- >
-+> import Prelude hiding ((<>))
- > import Control.Monad ( (>=>) )
- > import Data.List ( partition )
- >
diff --git a/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs
deleted file mode 100644
index 3b8ca4785939..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Typewriter.lhs.orig 2018-04-25 07:07:53 UTC
-+++ src/Typewriter.lhs
-@@ -7,6 +7,7 @@
- > module Typewriter ( module Typewriter )
- > where
- >
-+> import Prelude hiding ((<>))
- > import Control.Monad
- >
- > import Verbatim ( trim, expand )
diff --git a/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs
deleted file mode 100644
index c7130dd0541c..000000000000
--- a/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Verbatim.lhs.orig 2018-04-25 07:07:15 UTC
-+++ src/Verbatim.lhs
-@@ -7,6 +7,7 @@
- > module Verbatim ( module Verbatim )
- > where
- >
-+> import Prelude hiding ((<>))
- > import Control.Arrow ( (>>>) )
- > import Data.Char
- > import Data.List ( intersperse )
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index 1202e7149e0d..19ed7fa6f839 100644
--- a/textproc/hs-libxml-sax/Makefile
+++ b/textproc/hs-libxml-sax/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml-sax
PORTVERSION= 0.7.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index df4a67559187..24bbad392335 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libyaml/Makefile b/textproc/hs-libyaml/Makefile
new file mode 100644
index 000000000000..adb927d1222c
--- /dev/null
+++ b/textproc/hs-libyaml/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= libyaml
+PORTVERSION= 0.1.0.0
+PORTREVISION= 1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Low-level, streaming YAML interface
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit resourcet
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-libyaml/distinfo b/textproc/hs-libyaml/distinfo
new file mode 100644
index 000000000000..575e284062ff
--- /dev/null
+++ b/textproc/hs-libyaml/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546195286
+SHA256 (cabal/libyaml-0.1.0.0.tar.gz) = 9cd688e316938d8a80536cb1b329c4b651c845e34e045b0c443b345580fb6f07
+SIZE (cabal/libyaml-0.1.0.0.tar.gz) = 62557
diff --git a/textproc/hs-libyaml/pkg-descr b/textproc/hs-libyaml/pkg-descr
new file mode 100644
index 000000000000..6c5963a219f7
--- /dev/null
+++ b/textproc/hs-libyaml/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a haskell wrapper over the libyaml C library
+version 0.2.1 by Kirill Simonov. It contains the C source so you don’t need to
+worry about any non-Haskell dependencies.
+
+WWW: https://github.com/snoyberg/yaml
diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile
index a1574550d59e..8ce743660116 100644
--- a/textproc/hs-magic/Makefile
+++ b/textproc/hs-magic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= magic
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
index e41128eb39f7..8c6761224235 100644
--- a/textproc/hs-pandoc-citeproc/Makefile
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-citeproc
-PORTVERSION= 0.14.3.1
+PORTVERSION= 0.15.0.1
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
index d9f8e7435e12..1b7f72bcf62a 100644
--- a/textproc/hs-pandoc-citeproc/distinfo
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525014746
-SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a
-SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846
+TIMESTAMP = 1546182397
+SHA256 (cabal/pandoc-citeproc-0.15.0.1.tar.gz) = 29db5f2aad3225859727271855461724574f3695ab3856ceac33b24a55ae92f8
+SIZE (cabal/pandoc-citeproc-0.15.0.1.tar.gz) = 325491
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index ab4ac66325ab..a9483a56af63 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.17.4.2
+PORTVERSION= 1.17.5.4
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 0515e7419fe4..9491e1a1943f 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524405363
-SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca
-SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035
+TIMESTAMP = 1546097979
+SHA256 (cabal/pandoc-types-1.17.5.4.tar.gz) = 32aca86c510bd23c6bd54ce1a37ca005f4b84f077ab8e835a522833cf5179327
+SIZE (cabal/pandoc-types-1.17.5.4.tar.gz) = 26080
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index f0643bdfa6cd..7907f2b88cab 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 2.2
+PORTVERSION= 2.5
PORTREVISION= 1
CATEGORIES= textproc haskell
@@ -11,14 +11,14 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \
+USE_CABAL= aeson aeson-pretty base64-bytestring blaze-html \
blaze-markup cmark cmark-gfm data-default \
deepseq-generics doctemplates extensible-exceptions \
- filemanip haddock-library \
- hslua hslua-module-text HTTP JuicyPixels mtl \
+ filemanip Glob haddock-library \
+ hslua hslua-module-text HsYAML HTTP JuicyPixels mtl \
network network-uri pandoc-types \
random scientific SHA skylighting syb tagsoup\
- temporary texmath \
+ temporary texmath unicode-transforms \
unordered-containers vector xml \
yaml zip-archive zlib
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 8ed8d343faca..653e510ee85f 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524940319
-SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569
-SIZE (cabal/pandoc-2.2.tar.gz) = 8995928
+TIMESTAMP = 1546095746
+SHA256 (cabal/pandoc-2.5.tar.gz) = d57dc5db78a0a304de70436fe59a7599ab0c6d0fb2ab6704eeae498a4536222e
+SIZE (cabal/pandoc-2.5.tar.gz) = 9550372
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
new file mode 100644
index 000000000000..672868542b9f
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -0,0 +1,32 @@
+--- pandoc.cabal.orig 2018-11-27 17:33:51 UTC
++++ pandoc.cabal
+@@ -364,7 +364,7 @@ library
+ text >= 1.1.1.0 && < 1.3,
+ time >= 1.5 && < 1.10,
+ safe >= 0.3 && < 0.4,
+- zip-archive >= 0.2.3.4 && < 0.4,
++ zip-archive >= 0.2.3.4 && < 0.5,
+ HTTP >= 4000.0.5 && < 4000.4,
+ texmath >= 0.11 && < 0.12,
+ xml >= 1.3.12 && < 1.4,
+@@ -389,7 +389,7 @@ library
+ haddock-library >= 1.7 && < 1.8,
+ deepseq >= 1.3 && < 1.5,
+ JuicyPixels >= 3.1.6.1 && < 3.4,
+- Glob >= 0.7 && < 0.10,
++ Glob >= 0.7 && < 0.11,
+ cmark-gfm >= 0.1.1 && < 0.2,
+ doctemplates >= 0.2.1 && < 0.3,
+ network-uri >= 2.6 && < 2.7,
+@@ -658,9 +658,9 @@ test-suite test-pandoc
+ QuickCheck >= 2.4 && < 2.13,
+ containers >= 0.4.2.1 && < 0.7,
+ executable-path >= 0.0 && < 0.1,
+- zip-archive >= 0.2.3.4 && < 0.4,
++ zip-archive >= 0.2.3.4 && < 0.5,
+ xml >= 1.3.12 && < 1.4,
+- Glob >= 0.7 && < 0.10
++ Glob >= 0.7 && < 0.11
+ if impl(ghc < 8.0)
+ build-depends: semigroups == 0.18.*
+ if impl(ghc < 8.4)
diff --git a/textproc/hs-parsec-numbers/Makefile b/textproc/hs-parsec-numbers/Makefile
index 6a17fcd39da9..36d54bb979cb 100644
--- a/textproc/hs-parsec-numbers/Makefile
+++ b/textproc/hs-parsec-numbers/Makefile
@@ -2,6 +2,7 @@
PORTNAME= parsec-numbers
PORTVERSION= 0.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 2ba238eacbd1..78bcad7eafa7 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.12
-PORTREVISION= 3
+PORTVERSION= 1.12.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index e088304f8c8d..a82f344cce2d 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543355
-SHA256 (cabal/polyparse-1.12.tar.gz) = f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15
-SIZE (cabal/polyparse-1.12.tar.gz) = 32625
+TIMESTAMP = 1545492975
+SHA256 (cabal/polyparse-1.12.1.tar.gz) = dd8d34e05853ea0ab9b9fee1cbaa51ae33095f7c0c09ff539dcd6d771e0adaa5
+SIZE (cabal/polyparse-1.12.1.tar.gz) = 33060
diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile
index 4d5f24c68e20..9dd671fecba7 100644
--- a/textproc/hs-pretty-show/Makefile
+++ b/textproc/hs-pretty-show/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pretty-show
PORTVERSION= 1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
index 5f4b31f41195..48f66820f25f 100644
--- a/textproc/hs-regex-applicative/Makefile
+++ b/textproc/hs-regex-applicative/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-applicative
PORTVERSION= 0.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 75d21a0825fb..c9e3cb5373f8 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
index 837d81e27833..c156c640c881 100644
--- a/textproc/hs-regex-compat-tdfa/Makefile
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat-tdfa
PORTVERSION= 0.95.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 7ba950875643..d8f538e18715 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 0316aa7993ec..0902ed11e537 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.8.8.35
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile
index 82c1959006b5..b3d16aea3f92 100644
--- a/textproc/hs-regex-pcre/Makefile
+++ b/textproc/hs-regex-pcre/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre
PORTVERSION= 0.94.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 5e0d38b2131e..4074409f7c34 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index da9a509eee00..e2580245b1ea 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.3.1
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 81eec5bfb16b..c800434f06ac 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523955154
-SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9
-SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268
+TIMESTAMP = 1545554836
+SHA256 (cabal/regex-tdfa-1.2.3.1.tar.gz) = 8aaaeeecf050807c7c514d4dd1763ac63bd121782de5a0847bef5d48a095ea50
+SIZE (cabal/regex-tdfa-1.2.3.1.tar.gz) = 66397
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
index ea01a29ee9b1..cf17a8087158 100644
--- a/textproc/hs-rfc5051/Makefile
+++ b/textproc/hs-rfc5051/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= rfc5051
-PORTVERSION= 0.1.0.3
-PORTREVISION= 4
+PORTVERSION= 0.1.0.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-rfc5051/distinfo b/textproc/hs-rfc5051/distinfo
index 306f3d784f9f..ba8441321aae 100644
--- a/textproc/hs-rfc5051/distinfo
+++ b/textproc/hs-rfc5051/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624838
-SHA256 (cabal/rfc5051-0.1.0.3.tar.gz) = e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b
-SIZE (cabal/rfc5051-0.1.0.3.tar.gz) = 217935
+TIMESTAMP = 1545561512
+SHA256 (cabal/rfc5051-0.1.0.4.tar.gz) = 615daa230eabc781eff1d3ce94c42fc5ba6188dbeb115a233328454b02c1b3d3
+SIZE (cabal/rfc5051-0.1.0.4.tar.gz) = 218105
diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile
index 88bd21ce63c1..b35f1c16ce04 100644
--- a/textproc/hs-scanner/Makefile
+++ b/textproc/hs-scanner/Makefile
@@ -2,7 +2,7 @@
PORTNAME= scanner
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-skylighting-core/Makefile b/textproc/hs-skylighting-core/Makefile
index c9d83ca4bb9e..73680b0e1e89 100644
--- a/textproc/hs-skylighting-core/Makefile
+++ b/textproc/hs-skylighting-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skylighting-core
-PORTVERSION= 0.7.1
+PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-skylighting-core/distinfo b/textproc/hs-skylighting-core/distinfo
index 667b1ae4b182..e7f0561f09dc 100644
--- a/textproc/hs-skylighting-core/distinfo
+++ b/textproc/hs-skylighting-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524848800
-SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e
-SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965
+TIMESTAMP = 1546103880
+SHA256 (cabal/skylighting-core-0.7.5.tar.gz) = f706a2eb5d37d1323525d9c4944da2ad8d29c1ccf7d0ae7b433695d981413889
+SIZE (cabal/skylighting-core-0.7.5.tar.gz) = 599065
diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile
index 44f26b53ae8c..8b2e1b2da832 100644
--- a/textproc/hs-skylighting/Makefile
+++ b/textproc/hs-skylighting/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skylighting
-PORTVERSION= 0.7.1
+PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo
index be12b27301af..76a2a823a29e 100644
--- a/textproc/hs-skylighting/distinfo
+++ b/textproc/hs-skylighting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524846475
-SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574
-SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234
+TIMESTAMP = 1546098040
+SHA256 (cabal/skylighting-0.7.5.tar.gz) = 7de100e42e7dac3687372f85225a6d905d534f75990c5a25c6e640acf0ad1320
+SIZE (cabal/skylighting-0.7.5.tar.gz) = 555533
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 82860cfaee4f..470fef37c192 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.6
-PORTREVISION= 4
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/files/patch-stringsearch.cabal b/textproc/hs-stringsearch/files/patch-stringsearch.cabal
new file mode 100644
index 000000000000..c58220803be7
--- /dev/null
+++ b/textproc/hs-stringsearch/files/patch-stringsearch.cabal
@@ -0,0 +1,11 @@
+--- stringsearch.cabal.orig 2015-03-28 23:03:58 UTC
++++ stringsearch.cabal
+@@ -83,7 +83,7 @@ Library
+ -- Packages needed in order to build this package.
+ if flag(base4)
+ Build-depends: base >= 4 && < 5, array >= 0.3 && < 0.6,
+- bytestring >= 0.9 && < 1, containers >= 0.3 && < 0.6
++ bytestring >= 0.9 && < 1, containers >= 0.3 && < 0.7
+ else
+ if flag(base3)
+ Build-depends: base >= 3 && < 4, array >= 0.1 && < 0.4,
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a497d9d88bf1..ab3f4129fc39 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tagsoup
PORTVERSION= 0.14.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index ce029b3554bd..d5642849c945 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.5.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 0188275b197b..a84530ac51c7 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.10.1.2
+PORTVERSION= 0.11.1.2
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 4aacb04c0c4b..44b497348bf5 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524845873
-SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821
-SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634
+TIMESTAMP = 1545834044
+SHA256 (cabal/texmath-0.11.1.2.tar.gz) = 373f1281832c0f397976eec8f94117d2e298443ae2591f64a92e734631224cf1
+SIZE (cabal/texmath-0.11.1.2.tar.gz) = 1707310
diff --git a/textproc/hs-unicode-transforms/Makefile b/textproc/hs-unicode-transforms/Makefile
new file mode 100644
index 000000000000..9610afff36ab
--- /dev/null
+++ b/textproc/hs-unicode-transforms/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= unicode-transforms
+PORTVERSION= 0.3.5
+PORTREVISION= 1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Unicode normalization
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= bitarray
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-unicode-transforms/distinfo b/textproc/hs-unicode-transforms/distinfo
new file mode 100644
index 000000000000..1bf94de6bfdd
--- /dev/null
+++ b/textproc/hs-unicode-transforms/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546101707
+SHA256 (cabal/unicode-transforms-0.3.5.tar.gz) = c9f7d138ab43ed2e11de5973b0bd771c8f5c14cc0d87d3fbd1c6980c176fa03e
+SIZE (cabal/unicode-transforms-0.3.5.tar.gz) = 718750
diff --git a/textproc/hs-unicode-transforms/pkg-descr b/textproc/hs-unicode-transforms/pkg-descr
new file mode 100644
index 000000000000..62e88d412824
--- /dev/null
+++ b/textproc/hs-unicode-transforms/pkg-descr
@@ -0,0 +1,3 @@
+Fast Unicode 9.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
+
+WWW: https://github.com/harendra-kumar/unicode-transforms
diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile
index 06fca37a7b99..4b5df25fc642 100644
--- a/textproc/hs-uri-bytestring-aeson/Makefile
+++ b/textproc/hs-uri-bytestring-aeson/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uri-bytestring-aeson
-PORTVERSION= 0.1.0.6
+PORTVERSION= 0.1.0.7
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo
index f7346fcf4d6b..c816260405b9 100644
--- a/textproc/hs-uri-bytestring-aeson/distinfo
+++ b/textproc/hs-uri-bytestring-aeson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525011968
-SHA256 (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = d8bd5f0772e8f45a7530b8b4422102ab24a896ac75611a3c36a02a56dffcef0a
-SIZE (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = 2003
+TIMESTAMP = 1545835914
+SHA256 (cabal/uri-bytestring-aeson-0.1.0.7.tar.gz) = 7e90b5eb1c65a83461e127a27ce635f2f8279eb0d0cb14823831b6dfb503ef9b
+SIZE (cabal/uri-bytestring-aeson-0.1.0.7.tar.gz) = 2034
diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile
index f4ad7226be2b..b5a3ea11ab82 100644
--- a/textproc/hs-uri-bytestring/Makefile
+++ b/textproc/hs-uri-bytestring/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uri-bytestring
-PORTVERSION= 0.3.1.1
+PORTVERSION= 0.3.2.1
PORTREVISION= 1
CATEGORIES= textproc haskell
diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo
index d057dc82b946..c9273f5a31c2 100644
--- a/textproc/hs-uri-bytestring/distinfo
+++ b/textproc/hs-uri-bytestring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524253203
-SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb
-SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241
+TIMESTAMP = 1545680924
+SHA256 (cabal/uri-bytestring-0.3.2.1.tar.gz) = 64bd16bed1eca66d844cbc9dfb90a7ffda5b24572066765cf61b3d8d28a1c1fc
+SIZE (cabal/uri-bytestring-0.3.2.1.tar.gz) = 22280
diff --git a/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal
deleted file mode 100644
index 2f8bf5512c2f..000000000000
--- a/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- uri-bytestring.cabal.orig 2018-04-20 19:43:36 UTC
-+++ uri-bytestring.cabal
-@@ -41,7 +41,6 @@ library
-
- attoparsec >= 0.13.1.0 && < 0.14
- , base >= 4.6 && < 5
-- , fail >= 4.9 && < 5
- , bytestring >= 0.9.1 && < 0.11
- , blaze-builder >= 0.3.0.0 && < 0.5
- , template-haskell >= 2.9 && < 2.14
diff --git a/textproc/hs-uri-encode/Makefile b/textproc/hs-uri-encode/Makefile
index d0f21137ffc8..9693f8a6abe4 100644
--- a/textproc/hs-uri-encode/Makefile
+++ b/textproc/hs-uri-encode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uri-encode
PORTVERSION= 1.5.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index 0247b4a9f092..cc473acb5486 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uri
PORTVERSION= 0.1.6.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index c75e2ccf3c0a..c3c63eb6eb95 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xml-conduit
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index bd99964e50ba..850ca0e05fff 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xml-hamlet
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 013c85ff22e3..0e58df316124 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xml-types
PORTVERSION= 0.3.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 570040d1774a..f28fe0acc934 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xml
PORTVERSION= 1.3.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 22b3a4aacfa5..88ed9cdc81aa 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmlhtml
PORTVERSION= 0.2.5.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
index 73eb6bd5a8d2..c83c3b3c5c8e 100644
--- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -1,10 +1,12 @@
---- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC
+--- xmlhtml.cabal.orig 2017-11-24 19:17:43 UTC
+++ xmlhtml.cabal
-@@ -826,7 +826,6 @@ Library
+@@ -826,8 +826,7 @@ Library
blaze-html >= 0.9 && < 0.10,
blaze-markup >= 0.8 && < 0.9,
bytestring >= 0.9 && < 0.11,
- bytestring-builder >= 0.10.4.0.2 && < 0.11,
- containers >= 0.3 && < 0.6,
+- containers >= 0.3 && < 0.6,
++ containers >= 0.3 && < 0.7,
parsec >= 3.1.2 && < 3.2,
text >= 0.11 && < 1.3,
+ unordered-containers >= 0.1.4 && < 0.3
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 81127b4f8c10..df1d440f23d3 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.29
+PORTVERSION= 0.11.0.0
PORTREVISION= 1
CATEGORIES= textproc haskell
@@ -11,7 +11,7 @@ COMMENT= Support for parsing and rendering YAML documents
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \
- resourcet>=0.3 scientific unordered-containers vector
+ libyaml resourcet>=0.3 scientific unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 6729b43625e5..012d0e2e042a 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524402297
-SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74
-SIZE (cabal/yaml-0.8.29.tar.gz) = 82660
+TIMESTAMP = 1546184008
+SHA256 (cabal/yaml-0.11.0.0.tar.gz) = e66466cd29a4d256c3dd4dd4ab366033dbc5fa1fb67fdc6f7ac7aa3f161527bf
+SIZE (cabal/yaml-0.11.0.0.tar.gz) = 26529
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index 98da184bc5d9..ba0d6b4a15dc 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DAV
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 45b73828df78..446b57b9ba4e 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.3.11
+PORTVERSION= 4000.3.12
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 3c79a7260ff7..3ea99e54af9b 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523302416
-SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645
-SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747
+TIMESTAMP = 1545834704
+SHA256 (cabal/HTTP-4000.3.12.tar.gz) = a3ff6a9c93771079121083f1691188fe45f84380118e0f76bc4578153c361990
+SIZE (cabal/HTTP-4000.3.12.tar.gz) = 71800
diff --git a/www/hs-HTTP/files/patch-HTTP.cabal b/www/hs-HTTP/files/patch-HTTP.cabal
new file mode 100644
index 000000000000..6bc94f4441a2
--- /dev/null
+++ b/www/hs-HTTP/files/patch-HTTP.cabal
@@ -0,0 +1,20 @@
+--- HTTP.cabal.orig 2018-06-09 15:12:09 UTC
++++ HTTP.cabal
+@@ -109,7 +109,7 @@ Library
+
+ -- note the test harness constraints should be kept in sync with these
+ -- where dependencies are shared
+- Build-depends: base >= 4.3.0.0 && < 4.12, parsec >= 2.0 && < 3.2
++ Build-depends: base >= 4.3.0.0 && < 4.13, parsec >= 2.0 && < 3.2
+ Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.11
+ Build-depends: time >= 1.1.2.3 && < 1.10
+
+@@ -151,7 +151,7 @@ Test-Suite test
+ bytestring >= 0.9.1.5 && < 0.11,
+ deepseq >= 1.3.0.0 && < 1.5,
+ pureMD5 >= 0.2.4 && < 2.2,
+- base >= 4.3.0.0 && < 4.12,
++ base >= 4.3.0.0 && < 4.13,
+ split >= 0.1.3 && < 0.3,
+ test-framework >= 0.2.0 && < 0.9,
+ test-framework-hunit >= 0.3.0 && <0.4
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 5bbb8fbb928a..5706661da8b2 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= authenticate
PORTVERSION= 1.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 0ba24108357b..83c8df708f85 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.3.0.2
-PORTREVISION= 3
+PORTVERSION= 3001.3.0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www haskell
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index 50f93cd61858..13aefc0f10d2 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625371
-SHA256 (cabal/cgi-3001.3.0.2.tar.gz) = 92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1
-SIZE (cabal/cgi-3001.3.0.2.tar.gz) = 18008
+TIMESTAMP = 1545835086
+SHA256 (cabal/cgi-3001.3.0.3.tar.gz) = eb8144d7d0b74643c43b73c63e4d9fa88a110c4be719b9436917ca7d0d32b4e6
+SIZE (cabal/cgi-3001.3.0.3.tar.gz) = 18988
diff --git a/www/hs-cgi/files/patch-cgi.cabal b/www/hs-cgi/files/patch-cgi.cabal
deleted file mode 100644
index 77c886321dbf..000000000000
--- a/www/hs-cgi/files/patch-cgi.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
---- cgi.cabal.orig 2018-04-22 18:05:14 UTC
-+++ cgi.cabal
-@@ -44,11 +44,11 @@ Library
-
- Build-depends:
- parsec >= 2.0 && < 3.2,
-- exceptions < 0.9,
-+ exceptions < 0.11,
- xhtml >= 3000.0.0 && < 3000.3,
- bytestring < 0.11,
- base >= 4.5 && < 5,
-- time >= 1.5 && < 1.7,
-+ time >= 1.5 && < 1.9,
- containers < 0.6,
- multipart >= 0.1.2 && < 0.2
- If flag(network-uri)
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index 71c3fba41e34..5b48302a4553 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cookie
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index d6ee73649996..b7ce02c9cbbe 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 310b3781f125..fddf80d7aa25 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 877c2038acc0..c39fd8dc65bb 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.5.1
+PORTVERSION= 7.5.1.1
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 51096e975054..2723282b8d89 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524594391
-SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1
-SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810
+TIMESTAMP = 1545837312
+SHA256 (cabal/happstack-server-7.5.1.1.tar.gz) = 614a65dd721bfa74ff4e0090e70c4b5c7dfb1fdb6485218b4ce1c5d50509fd61
+SIZE (cabal/happstack-server-7.5.1.1.tar.gz) = 81814
diff --git a/www/hs-happstack-server/files/patch-happstack-server.cabal b/www/hs-happstack-server/files/patch-happstack-server.cabal
new file mode 100644
index 000000000000..164f15536b7f
--- /dev/null
+++ b/www/hs-happstack-server/files/patch-happstack-server.cabal
@@ -0,0 +1,11 @@
+--- happstack-server.cabal.orig 2018-06-26 15:51:43 UTC
++++ happstack-server.cabal
+@@ -95,7 +95,7 @@ Library
+ system-filepath >= 0.3.1,
+ syb,
+ text >= 0.10 && < 1.3,
+- template-haskell < 2.14,
++ template-haskell < 2.15,
+ time,
+ time-compat,
+ threads >= 0.5,
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 66e4c4500e40..0e99595877ce 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 1.1
+PORTVERSION= 1.1.0.1
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 58a49974dbf6..4da32d6cf073 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524939588
-SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96
-SIZE (cabal/heist-1.1.tar.gz) = 71239
+TIMESTAMP = 1545835019
+SHA256 (cabal/heist-1.1.0.1.tar.gz) = 185778ba87642685b8c4ca5608963b05a4bae929a2e9474b1514126fb94b90c8
+SIZE (cabal/heist-1.1.0.1.tar.gz) = 71359
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 83c602035bde..ec9272afa1bc 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hjsmin
PORTVERSION= 0.2.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-api-data/Makefile b/www/hs-http-api-data/Makefile
index 1dfdd697880e..5726a841579d 100644
--- a/www/hs-http-api-data/Makefile
+++ b/www/hs-http-api-data/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-api-data
-PORTVERSION= 0.3.8.1
+PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= www haskell
@@ -10,9 +10,9 @@ COMMENT= Convert Haskell data types to and from HTTP API data
LICENSE= GPLv3
-USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \
- time-locale-compat unordered-containers uri-bytestring \
- uuid-types
+USE_CABAL= attoparsec attoparsec-iso8601 base-compat cookie hashable \
+ http-types tagged time-locale-compat unordered-containers \
+ uri-bytestring uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-api-data/distinfo b/www/hs-http-api-data/distinfo
index f3da4d21c498..fd9c4a1f1124 100644
--- a/www/hs-http-api-data/distinfo
+++ b/www/hs-http-api-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524685052
-SHA256 (cabal/http-api-data-0.3.8.1.tar.gz) = 6eeaba4b29a00407cb20b865825b17b8d884c26b09c5bbe7b6e673b4522106b3
-SIZE (cabal/http-api-data-0.3.8.1.tar.gz) = 19427
+TIMESTAMP = 1545757436
+SHA256 (cabal/http-api-data-0.4.tar.gz) = 837e3f39f23df2caa23d75a4608f4a0505a1ab23f7290006976a37a373164a8a
+SIZE (cabal/http-api-data-0.4.tar.gz) = 20498
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
index a5a0da8c1c9e..74364f1096a5 100644
--- a/www/hs-http-client-tls/Makefile
+++ b/www/hs-http-client-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-client-tls
PORTVERSION= 0.3.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
index 4b3dedcb84aa..65cb6a6001cc 100644
--- a/www/hs-http-client/Makefile
+++ b/www/hs-http-client/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-client
PORTVERSION= 0.5.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index b957edc9784d..e63dfc316061 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-conduit
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 5f41c27474a1..6f091adc142e 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index ec9d28754ef2..788f257a4cf6 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-reverse-proxy
PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 75686d1eb63d..1e1ae4a1c367 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 06ea55c076dd..24edf9155c49 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.12.1
+PORTVERSION= 0.12.2
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index 46fc0b089092..7e0dc7231479 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523783338
-SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3
-SIZE (cabal/http-types-0.12.1.tar.gz) = 13189
+TIMESTAMP = 1545832873
+SHA256 (cabal/http-types-0.12.2.tar.gz) = 523102d7ba8923e1b399cfd2a1c821e858146ecd934fc147c3acd0fd2b2f9305
+SIZE (cabal/http-types-0.12.2.tar.gz) = 13552
diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile
index fc3108d25de2..a75c9b81674a 100644
--- a/www/hs-http2/Makefile
+++ b/www/hs-http2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http2
PORTVERSION= 1.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile
index 2d8d197fd486..748bc9aac470 100644
--- a/www/hs-multipart/Makefile
+++ b/www/hs-multipart/Makefile
@@ -2,7 +2,7 @@
PORTNAME= multipart
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 069d134ad792..ca1706df84c4 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= oeis
PORTVERSION= 0.3.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index cd7987bb1a6b..f56ef7d5b27f 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,7 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index e4d7acaeb672..a507cc1da81c 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index be678bcb83f4..891738880ede 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shakespeare
PORTVERSION= 2.0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 44682b806d05..fe7a3991c2c2 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= snap-core
PORTVERSION= 1.0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 0475e5f43c9e..4ecc96f0357a 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -2,7 +2,7 @@
PORTNAME= snap-server
PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap-server/files/patch-snap-server.cabal b/www/hs-snap-server/files/patch-snap-server.cabal
index 3dbb6ed54f4e..3371a5616e91 100644
--- a/www/hs-snap-server/files/patch-snap-server.cabal
+++ b/www/hs-snap-server/files/patch-snap-server.cabal
@@ -1,10 +1,18 @@
---- snap-server.cabal.orig 2017-05-15 21:28:21 UTC
+--- snap-server.cabal.orig 2018-03-20 13:04:01 UTC
+++ snap-server.cabal
-@@ -89,7 +89,6 @@ Library
- base >= 4 && < 5,
+@@ -95,13 +95,12 @@ Library
+
+ build-depends:
+ attoparsec >= 0.12 && < 0.14,
+- base >= 4.6 && < 4.12,
++ base >= 4.6 && < 4.13,
blaze-builder >= 0.4 && < 0.5,
bytestring >= 0.9.1 && < 0.11,
- bytestring-builder >= 0.10.4 && < 0.11,
case-insensitive >= 1.1 && < 1.3,
clock >= 0.7.1 && < 0.8,
- containers >= 0.3 && < 0.6,
+- containers >= 0.3 && < 0.6,
++ containers >= 0.3 && < 0.7,
+ filepath >= 1.1 && < 2.0,
+ io-streams >= 1.3 && < 1.6,
+ io-streams-haproxy >= 1.0 && < 1.1,
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index dae2fbf023ff..89ae715d87d4 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap
PORTVERSION= 1.1.1.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 631a6fe654ef..ae8ba1cb8bc2 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 8442798b84a2..87b5f51dfb09 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wai-app-static
PORTVERSION= 3.1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index da04c6dfe6b9..5caed44c9d1f 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wai-extra
PORTVERSION= 3.0.22.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 0cf6219d7792..9fac432b35c9 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wai-logger
PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 7bac405564f9..4d8ae86d08cb 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wai
PORTVERSION= 3.2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
index f579833cb52e..3309509297bc 100644
--- a/www/hs-warp-tls/Makefile
+++ b/www/hs-warp-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= warp-tls
PORTVERSION= 3.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index a1f04b63a2e3..8a447c027e60 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= warp
PORTVERSION= 3.2.22
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index d0f3ca3001d5..5a496f7acbb5 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
PORTVERSION= 0.14.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 15d8883f602b..40b106115a4b 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.5.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
index 7678c0918222..1a7df90f67e5 100644
--- a/www/hs-yesod-auth-hashdb/Makefile
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth-hashdb
-PORTVERSION= 1.7
+PORTVERSION= 1.7.1
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
index 2d8e795dfb6d..6e350d82c054 100644
--- a/www/hs-yesod-auth-hashdb/distinfo
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525187444
-SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c
-SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493
+TIMESTAMP = 1546182489
+SHA256 (cabal/yesod-auth-hashdb-1.7.1.tar.gz) = 0d6f27a49aa862af8f4d1a84f8fe540300e42f9208728fba03a7996a5517dfe5
+SIZE (cabal/yesod-auth-hashdb-1.7.1.tar.gz) = 15545
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index d0a7e889c0c1..2e9d7bc96bce 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.6.3
+PORTVERSION= 1.6.5
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index 63c4a97f60a6..342c27e5bef3 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525183168
-SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8
-SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951
+TIMESTAMP = 1546179997
+SHA256 (cabal/yesod-auth-1.6.5.tar.gz) = b9dd963473a4d18d6a6921c0c321d86c77f264d8be2849b4aadcfa8f3ac337b3
+SIZE (cabal/yesod-auth-1.6.5.tar.gz) = 51828
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index 5dd1f02ce0cf..b318964b9596 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= yesod-bin
PORTVERSION= 1.6.0.3
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
new file mode 100644
index 000000000000..013dc826119b
--- /dev/null
+++ b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
@@ -0,0 +1,11 @@
+--- yesod-bin.cabal.orig 2018-05-13 12:13:32 UTC
++++ yesod-bin.cabal
+@@ -43,7 +43,7 @@ executable yesod
+ , zlib >= 0.5
+ , tar >= 0.4 && < 0.6
+ , unordered-containers
+- , yaml >= 0.8 && < 0.9
++ , yaml >= 0.8 && < 0.12
+ , optparse-applicative >= 0.11
+ , fsnotify >= 0.0 && < 0.3
+ , split >= 0.2 && < 0.3
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 291d14f681ca..5d79c8f54129 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-core
PORTVERSION= 1.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 842d58e66f47..7fdc9c61436b 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-form
PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 04e202b079ee..9c41e450a5d1 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.0.1
PORTREVISION= 1
CATEGORIES= www haskell
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 21afddd170b4..c70cc441bb33 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525180776
-SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd
-SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935
+TIMESTAMP = 1546104685
+SHA256 (cabal/yesod-persistent-1.6.0.1.tar.gz) = 748acc0a08e371548920a1b5e2e8b2c95b95014becd63acf259712d306a9bd4f
+SIZE (cabal/yesod-persistent-1.6.0.1.tar.gz) = 5028
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 85c8dbd99152..c5355498ab32 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-static
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index f8ccbdf7e07d..ce507b889d41 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-test
PORTVERSION= 1.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index d1be67565336..c635bebfa828 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index f988424c2ee7..3602327072d9 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -2,7 +2,7 @@
PORTNAME= GLURaw
PORTVERSION= 2.0.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index f9458cece2ea..aeac1eb5b04f 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= GLUT
-PORTVERSION= 2.7.0.12
-PORTREVISION= 3
+PORTVERSION= 2.7.0.14
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index 03e662322272..1e060f403b0a 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625638
-SHA256 (cabal/GLUT-2.7.0.12.tar.gz) = 66f516bd9f836e5252fe0186e447b68a61b594d9247466c502b74994d3e9f1b5
-SIZE (cabal/GLUT-2.7.0.12.tar.gz) = 656592
+TIMESTAMP = 1545837059
+SHA256 (cabal/GLUT-2.7.0.14.tar.gz) = 5cf8f7700a6b6ac33e39b2d7bd300679a245ff7c1498eb423901134f9d302106
+SIZE (cabal/GLUT-2.7.0.14.tar.gz) = 655029
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index a2e9d118db54..dcac891214a0 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 3.0.2.1
+PORTVERSION= 3.0.2.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 8729dbecbcb5..286163ef85f0 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524406154
-SHA256 (cabal/OpenGL-3.0.2.1.tar.gz) = 7acb891b911de8bb6933afeaa7f8c5291cc986da5557c922c0fc1717c5a559bf
-SIZE (cabal/OpenGL-3.0.2.1.tar.gz) = 130703
+TIMESTAMP = 1545656184
+SHA256 (cabal/OpenGL-3.0.2.2.tar.gz) = 4cba40fe8eecee67c8251556b4c05d9e98256c11d49c20e914f8232bfae67da7
+SIZE (cabal/OpenGL-3.0.2.2.tar.gz) = 130711
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index 5b2e3d89a6a4..e3f2f4e07eb2 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= OpenGLRaw
-PORTVERSION= 3.3.0.0
+PORTVERSION= 3.3.1.0
PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
index 9b6fbe5fc058..a7b484b80ea5 100644
--- a/x11-toolkits/hs-OpenGLRaw/distinfo
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523444916
-SHA256 (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 17889867ae2bd67b98bc7d74f5df3b82abc4f01807c4d24d2efde84d9423b290
-SIZE (cabal/OpenGLRaw-3.3.0.0.tar.gz) = 857906
+TIMESTAMP = 1545561651
+SHA256 (cabal/OpenGLRaw-3.3.1.0.tar.gz) = 6b0745f6d421f658b57c13bfdbae014c0aa6871a98e11e98908d4a04461f1cf5
+SIZE (cabal/OpenGLRaw-3.3.1.0.tar.gz) = 858858
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index f90348b2b67e..3acfe47729f1 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtk
PORTVERSION= 0.14.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 5ee01f5c3819..b4ddfe359da1 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk2hs
PORTVERSION= 0.13.2.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 17d66f20aaee..16824906eac2 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.13.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 7a3fc55cbc43..4120d70e2bf6 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pango
PORTVERSION= 0.13.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 736e056a6697..300ac821fb8d 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vte
PORTVERSION= 0.13.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index b545c0c15c5c..af299e648992 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxdirect
PORTVERSION= 0.92.3.0
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
index b09a9129e57c..c66c2152b359 100644
--- a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
+++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
@@ -1,6 +1,6 @@
---- wxdirect.cabal.orig 2018-04-16 18:38:04 UTC
+--- wxdirect.cabal.orig 2018-12-23 10:54:50 UTC
+++ wxdirect.cabal
-@@ -53,7 +53,7 @@ executable wxdirect
+@@ -53,12 +53,12 @@ executable wxdirect
strict,
time >= 1.0,
filepath < 1.5,
@@ -9,3 +9,9 @@
if flag(splitBase)
build-depends:
+ base >= 4 && < 5,
+- containers >= 0.2 && < 0.6
++ containers >= 0.2 && < 0.7
+ else
+ build-depends:
+ base >= 3 && < 4,
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index ac427f06582c..f4973d079bb6 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 7e2e74054b64..65f3a3a1fd56 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 9c62a493b8a1..c052fa934a89 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 1289c8b89524..adfa9aa8d288 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 53920919cd31..836327e40e96 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.28
+PORTVERSION= 0.29.4
+PORTREVISION= 1
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +11,8 @@ COMMENT= Minimalistic text-based status bar
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 regex-compat X11>=1.6.1 parsec-numbers
+USE_CABAL= HTTP>=4000.2.4 async extensible-exceptions mtl>=2.1 regex-compat\
+ X11>=1.6.1 parsec-numbers
USE_XORG= xpm
EXECUTABLE= xmobar
@@ -19,7 +21,7 @@ STANDALONE= yes
OPTIONS_DEFINE= EXAMPLES
-INSTALL_PORTEXAMPLES= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config \
+INSTALL_PORTEXAMPLES= ${INSTALL_DATA} ${WRKSRC}/examples/xmobar.config \
${STAGEDIR}${EXAMPLESDIR}
FLAGS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED
@@ -51,5 +53,9 @@ THREADED_FLAG_ENABLE= with_threaded
# Disable unsupported options
FLAGS_DISABLE= with_mpris with_dbus with_iwlib with_alsa
+post-extract:
+ ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs
+ ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 08ec2fdbe3ca..63eb2c0186ec 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538849019
-SHA256 (cabal/xmobar-0.28.tar.gz) = ed1338bed8f8a2fafeeb30462a44e0bacf45bcf76fb47377d66578f4b43a08f6
-SIZE (cabal/xmobar-0.28.tar.gz) = 102694
+TIMESTAMP = 1546020535
+SHA256 (cabal/xmobar-0.29.4.tar.gz) = 59378f117d41dbf5312bd1eaaf7b2d82d09e95652c6d777b64e300de2fd17122
+SIZE (cabal/xmobar-0.29.4.tar.gz) = 115342