aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED5
-rw-r--r--Mk/Scripts/check_leftovers.sh6
-rw-r--r--UPDATING25
-rw-r--r--archivers/hs-tar/Makefile2
-rw-r--r--archivers/hs-tar/distinfo5
-rw-r--r--archivers/hs-zip-archive/Makefile2
-rw-r--r--archivers/hs-zip-archive/distinfo5
-rw-r--r--archivers/hs-zlib-bindings/Makefile1
-rw-r--r--archivers/hs-zlib-enum/Makefile2
-rw-r--r--archivers/hs-zlib-enum/files/patch-zlib-enum.cabal44
-rw-r--r--archivers/hs-zlib/Makefile2
-rw-r--r--archivers/hs-zlib/distinfo5
-rw-r--r--audio/hs-ALUT/Makefile3
-rw-r--r--audio/hs-ALUT/distinfo5
-rw-r--r--audio/hs-OpenAL/Makefile2
-rw-r--r--audio/hs-OpenAL/distinfo5
-rw-r--r--audio/hs-libmpd/Makefile2
-rw-r--r--audio/hs-libmpd/distinfo5
-rw-r--r--benchmarks/hs-criterion/Makefile12
-rw-r--r--benchmarks/hs-criterion/distinfo5
-rw-r--r--converters/Makefile1
-rw-r--r--converters/hs-aeson-compat/Makefile17
-rw-r--r--converters/hs-aeson-compat/distinfo3
-rw-r--r--converters/hs-aeson-compat/files/patch-aeson-compat.cabal18
-rw-r--r--converters/hs-aeson-compat/pkg-descr3
-rw-r--r--converters/hs-aeson-pretty/Makefile7
-rw-r--r--converters/hs-aeson-pretty/distinfo5
-rw-r--r--converters/hs-aeson/Makefile8
-rw-r--r--converters/hs-aeson/distinfo5
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-dataenc/files/patch-dataenc.cabal4
-rw-r--r--converters/hs-json/Makefile3
-rw-r--r--converters/hs-sandi/Makefile4
-rw-r--r--converters/hs-sandi/distinfo5
-rw-r--r--databases/hs-esqueleto/Makefile6
-rw-r--r--databases/hs-esqueleto/distinfo5
-rw-r--r--databases/hs-hedis/Makefile6
-rw-r--r--databases/hs-hedis/distinfo5
-rw-r--r--databases/hs-mysql/Makefile2
-rw-r--r--databases/hs-mysql/distinfo5
-rw-r--r--databases/hs-persistent-sqlite/Makefile8
-rw-r--r--databases/hs-persistent-sqlite/distinfo5
-rw-r--r--databases/hs-persistent-template/Makefile6
-rw-r--r--databases/hs-persistent-template/distinfo5
-rw-r--r--databases/hs-persistent-template/files/patch-persistent-template.cabal11
-rw-r--r--databases/hs-persistent/Makefile6
-rw-r--r--databases/hs-persistent/distinfo5
-rw-r--r--deskutils/Makefile1
-rw-r--r--deskutils/hs-fdo-notify/Makefile15
-rw-r--r--deskutils/hs-fdo-notify/distinfo3
-rw-r--r--deskutils/hs-fdo-notify/pkg-descr7
-rw-r--r--devel/Makefile43
-rw-r--r--devel/hs-BNFC/Makefile2
-rw-r--r--devel/hs-BNFC/distinfo5
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-Boolean/distinfo5
-rw-r--r--devel/hs-BoundedChan/Makefile2
-rw-r--r--devel/hs-BoundedChan/distinfo1
-rw-r--r--devel/hs-ConfigFile/Makefile1
-rw-r--r--devel/hs-ConfigFile/distinfo1
-rw-r--r--devel/hs-DrIFT/Makefile2
-rw-r--r--devel/hs-DrIFT/distinfo1
-rw-r--r--devel/hs-EdisonAPI/Makefile15
-rw-r--r--devel/hs-EdisonAPI/distinfo3
-rw-r--r--devel/hs-EdisonAPI/pkg-descr11
-rw-r--r--devel/hs-EdisonCore/Makefile13
-rw-r--r--devel/hs-EdisonCore/distinfo3
-rw-r--r--devel/hs-EdisonCore/pkg-descr7
-rw-r--r--devel/hs-Glob/Makefile5
-rw-r--r--devel/hs-Glob/distinfo5
-rw-r--r--devel/hs-Glob/files/patch-Glob.cabal11
-rw-r--r--devel/hs-HUnit/Makefile5
-rw-r--r--devel/hs-HUnit/distinfo5
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-IfElse/distinfo1
-rw-r--r--devel/hs-List/Makefile2
-rw-r--r--devel/hs-List/distinfo5
-rw-r--r--devel/hs-ListLike/Makefile (renamed from devel/hs-MonadCatchIO-transformers/Makefile)8
-rw-r--r--devel/hs-ListLike/distinfo3
-rw-r--r--devel/hs-ListLike/pkg-descr12
-rw-r--r--devel/hs-MemoTrie/Makefile5
-rw-r--r--devel/hs-MemoTrie/distinfo5
-rw-r--r--devel/hs-MissingH/Makefile2
-rw-r--r--devel/hs-MissingH/distinfo5
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile17
-rw-r--r--devel/hs-MonadCatchIO-mtl/distinfo2
-rw-r--r--devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal11
-rw-r--r--devel/hs-MonadCatchIO-mtl/pkg-descr6
-rw-r--r--devel/hs-MonadCatchIO-transformers/distinfo2
-rw-r--r--devel/hs-MonadCatchIO-transformers/pkg-descr7
-rw-r--r--devel/hs-MonadRandom/Makefile4
-rw-r--r--devel/hs-MonadRandom/distinfo5
-rw-r--r--devel/hs-MonadRandom/files/patch-MonadRandom.cabal10
-rw-r--r--devel/hs-ObjectName/Makefile2
-rw-r--r--devel/hs-ObjectName/distinfo5
-rw-r--r--devel/hs-Only/Makefile (renamed from devel/hs-directory/Makefile)6
-rw-r--r--devel/hs-Only/distinfo3
-rw-r--r--devel/hs-Only/pkg-descr11
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-PSQueue/distinfo1
-rw-r--r--devel/hs-QuickCheck/Makefile2
-rw-r--r--devel/hs-QuickCheck/distinfo5
-rw-r--r--devel/hs-ReadArgs/Makefile2
-rw-r--r--devel/hs-ReadArgs/distinfo5
-rw-r--r--devel/hs-STMonadTrans/Makefile2
-rw-r--r--devel/hs-STMonadTrans/distinfo5
-rw-r--r--devel/hs-SafeSemaphore/Makefile2
-rw-r--r--devel/hs-SafeSemaphore/distinfo1
-rw-r--r--devel/hs-ShellCheck/Makefile2
-rw-r--r--devel/hs-ShellCheck/distinfo6
-rw-r--r--devel/hs-StateVar/Makefile4
-rw-r--r--devel/hs-StateVar/distinfo5
-rw-r--r--devel/hs-Stream/Makefile1
-rw-r--r--devel/hs-Stream/distinfo1
-rw-r--r--devel/hs-TypeCompose/Makefile5
-rw-r--r--devel/hs-TypeCompose/distinfo5
-rw-r--r--devel/hs-abstract-deque/Makefile2
-rw-r--r--devel/hs-abstract-deque/distinfo1
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-abstract-par/distinfo1
-rw-r--r--devel/hs-activehs-base/Makefile3
-rw-r--r--devel/hs-activehs-base/distinfo5
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal12
-rw-r--r--devel/hs-alex/Makefile2
-rw-r--r--devel/hs-alex/distinfo5
-rw-r--r--devel/hs-ansi-terminal/Makefile2
-rw-r--r--devel/hs-ansi-terminal/distinfo5
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile1
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo1
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-arrows/distinfo1
-rw-r--r--devel/hs-asn1-data/Makefile3
-rw-r--r--devel/hs-asn1-data/distinfo5
-rw-r--r--devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs11
-rw-r--r--devel/hs-asn1-encoding/Makefile2
-rw-r--r--devel/hs-asn1-encoding/distinfo5
-rw-r--r--devel/hs-asn1-parse/Makefile2
-rw-r--r--devel/hs-asn1-parse/distinfo5
-rw-r--r--devel/hs-asn1-types/Makefile4
-rw-r--r--devel/hs-asn1-types/distinfo5
-rw-r--r--devel/hs-async/Makefile2
-rw-r--r--devel/hs-async/distinfo5
-rw-r--r--devel/hs-atomic-primops/Makefile2
-rw-r--r--devel/hs-atomic-primops/distinfo5
-rw-r--r--devel/hs-auto-update/Makefile2
-rw-r--r--devel/hs-auto-update/distinfo5
-rw-r--r--devel/hs-base-compat/Makefile13
-rw-r--r--devel/hs-base-compat/distinfo3
-rw-r--r--devel/hs-base-compat/pkg-descr11
-rw-r--r--devel/hs-base-orphans/Makefile2
-rw-r--r--devel/hs-base-orphans/distinfo5
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-base-unicode-symbols/distinfo1
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base16-bytestring/distinfo1
-rw-r--r--devel/hs-base64-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/distinfo1
-rw-r--r--devel/hs-basic-prelude/Makefile2
-rw-r--r--devel/hs-basic-prelude/distinfo5
-rw-r--r--devel/hs-bifunctors/Makefile4
-rw-r--r--devel/hs-bifunctors/distinfo5
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-bits-atomic/distinfo1
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile4
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo1
-rw-r--r--devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal9
-rw-r--r--devel/hs-blaze-builder/Makefile2
-rw-r--r--devel/hs-blaze-builder/distinfo5
-rw-r--r--devel/hs-blaze-textual/Makefile1
-rw-r--r--devel/hs-blaze-textual/distinfo1
-rw-r--r--devel/hs-bloomfilter/Makefile1
-rw-r--r--devel/hs-bloomfilter/distinfo1
-rw-r--r--devel/hs-boxes/Makefile1
-rw-r--r--devel/hs-boxes/distinfo1
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-bsd-sysctl/distinfo1
-rw-r--r--devel/hs-byteable/Makefile2
-rw-r--r--devel/hs-byteable/distinfo1
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-byteorder/distinfo1
-rw-r--r--devel/hs-bytestring-lexing/Makefile1
-rw-r--r--devel/hs-bytestring-lexing/distinfo1
-rw-r--r--devel/hs-bytestring-mmap/Makefile1
-rw-r--r--devel/hs-bytestring-mmap/distinfo1
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-bytestring-nums/distinfo1
-rw-r--r--devel/hs-bytestring-show/Makefile2
-rw-r--r--devel/hs-bytestring-show/distinfo1
-rw-r--r--devel/hs-bytestring-show/files/patch-bytestring-show.cabal11
-rw-r--r--devel/hs-c2hs/Makefile2
-rw-r--r--devel/hs-c2hs/distinfo6
-rw-r--r--devel/hs-cabal-install/Makefile7
-rw-r--r--devel/hs-cabal-install/distinfo5
-rw-r--r--devel/hs-call-stack/Makefile13
-rw-r--r--devel/hs-call-stack/distinfo3
-rw-r--r--devel/hs-call-stack/pkg-descr3
-rw-r--r--devel/hs-cereal/Makefile2
-rw-r--r--devel/hs-cereal/distinfo5
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-checkers/distinfo5
-rw-r--r--devel/hs-chunked-data/Makefile2
-rw-r--r--devel/hs-chunked-data/distinfo5
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile2
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo5
-rw-r--r--devel/hs-classy-prelude/Makefile13
-rw-r--r--devel/hs-classy-prelude/distinfo5
-rw-r--r--devel/hs-clock/Makefile13
-rw-r--r--devel/hs-clock/distinfo3
-rw-r--r--devel/hs-clock/pkg-descr4
-rw-r--r--devel/hs-cmdargs/Makefile2
-rw-r--r--devel/hs-cmdargs/distinfo5
-rw-r--r--devel/hs-code-page/Makefile13
-rw-r--r--devel/hs-code-page/distinfo3
-rw-r--r--devel/hs-code-page/pkg-descr10
-rw-r--r--devel/hs-colour/Makefile13
-rw-r--r--devel/hs-colour/distinfo3
-rw-r--r--devel/hs-colour/pkg-descr5
-rw-r--r--devel/hs-concurrent-output/Makefile15
-rw-r--r--devel/hs-concurrent-output/distinfo3
-rw-r--r--devel/hs-concurrent-output/files/patch-concurrent-output.cabal11
-rw-r--r--devel/hs-concurrent-output/pkg-descr9
-rw-r--r--devel/hs-conduit-combinators/Makefile2
-rw-r--r--devel/hs-conduit-combinators/distinfo5
-rw-r--r--devel/hs-conduit-extra/Makefile2
-rw-r--r--devel/hs-conduit-extra/distinfo5
-rw-r--r--devel/hs-conduit/Makefile2
-rw-r--r--devel/hs-conduit/distinfo5
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-configurator/distinfo1
-rw-r--r--devel/hs-constraints/Makefile4
-rw-r--r--devel/hs-constraints/distinfo5
-rw-r--r--devel/hs-convertible/Makefile1
-rw-r--r--devel/hs-convertible/distinfo1
-rw-r--r--devel/hs-cpphs/Makefile2
-rw-r--r--devel/hs-cpphs/distinfo5
-rw-r--r--devel/hs-darcs/Makefile14
-rw-r--r--devel/hs-darcs/distinfo5
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs10
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal11
-rw-r--r--devel/hs-data-default-class/Makefile3
-rw-r--r--devel/hs-data-default-class/distinfo5
-rw-r--r--devel/hs-data-default-instances-base/Makefile3
-rw-r--r--devel/hs-data-default-instances-base/distinfo5
-rw-r--r--devel/hs-data-default-instances-containers/Makefile2
-rw-r--r--devel/hs-data-default-instances-containers/distinfo1
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile2
-rw-r--r--devel/hs-data-default-instances-dlist/distinfo1
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile2
-rw-r--r--devel/hs-data-default-instances-old-locale/distinfo1
-rw-r--r--devel/hs-data-default/Makefile3
-rw-r--r--devel/hs-data-default/distinfo5
-rw-r--r--devel/hs-data-endian/Makefile13
-rw-r--r--devel/hs-data-endian/distinfo3
-rw-r--r--devel/hs-data-endian/pkg-descr3
-rw-r--r--devel/hs-data-hash/Makefile1
-rw-r--r--devel/hs-data-hash/distinfo1
-rw-r--r--devel/hs-data-ordlist/Makefile1
-rw-r--r--devel/hs-data-ordlist/distinfo1
-rw-r--r--devel/hs-data-pprint/Makefile4
-rw-r--r--devel/hs-data-pprint/distinfo5
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal10
-rw-r--r--devel/hs-date-cache/Makefile2
-rw-r--r--devel/hs-date-cache/distinfo1
-rw-r--r--devel/hs-datetime/Makefile1
-rw-r--r--devel/hs-datetime/distinfo1
-rw-r--r--devel/hs-dbus/Makefile15
-rw-r--r--devel/hs-dbus/distinfo3
-rw-r--r--devel/hs-dbus/pkg-descr13
-rw-r--r--devel/hs-deepseq-generics/Makefile2
-rw-r--r--devel/hs-deepseq-generics/distinfo5
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal11
-rw-r--r--devel/hs-directory-tree/Makefile3
-rw-r--r--devel/hs-directory-tree/distinfo5
-rw-r--r--devel/hs-directory/distinfo3
-rw-r--r--devel/hs-directory/pkg-descr4
-rw-r--r--devel/hs-dlist-instances/Makefile3
-rw-r--r--devel/hs-dlist-instances/distinfo5
-rw-r--r--devel/hs-dlist/Makefile2
-rw-r--r--devel/hs-dlist/distinfo5
-rw-r--r--devel/hs-easy-file/Makefile1
-rw-r--r--devel/hs-easy-file/distinfo1
-rw-r--r--devel/hs-edit-distance/Makefile1
-rw-r--r--devel/hs-edit-distance/distinfo1
-rw-r--r--devel/hs-either/Makefile8
-rw-r--r--devel/hs-either/distinfo5
-rw-r--r--devel/hs-either/files/patch-either.cabal14
-rw-r--r--devel/hs-enclosed-exceptions/Makefile2
-rw-r--r--devel/hs-enclosed-exceptions/distinfo5
-rw-r--r--devel/hs-enumerator/Makefile2
-rw-r--r--devel/hs-enumerator/distinfo1
-rw-r--r--devel/hs-equivalence/Makefile2
-rw-r--r--devel/hs-equivalence/distinfo5
-rw-r--r--devel/hs-errors/Makefile4
-rw-r--r--devel/hs-errors/distinfo5
-rw-r--r--devel/hs-exceptions/Makefile4
-rw-r--r--devel/hs-exceptions/distinfo5
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extensible-exceptions/distinfo1
-rw-r--r--devel/hs-extra/Makefile4
-rw-r--r--devel/hs-extra/distinfo5
-rw-r--r--devel/hs-fast-logger/Makefile4
-rw-r--r--devel/hs-fast-logger/distinfo5
-rw-r--r--devel/hs-fast-logger/files/patch-fast-logger.cabal10
-rw-r--r--devel/hs-fgl/Makefile2
-rw-r--r--devel/hs-fgl/distinfo5
-rw-r--r--devel/hs-file-embed/Makefile2
-rw-r--r--devel/hs-file-embed/distinfo5
-rw-r--r--devel/hs-filemanip/Makefile1
-rw-r--r--devel/hs-filemanip/distinfo1
-rw-r--r--devel/hs-filestore/Makefile2
-rw-r--r--devel/hs-filestore/distinfo5
-rw-r--r--devel/hs-fmlist/Makefile13
-rw-r--r--devel/hs-fmlist/distinfo3
-rw-r--r--devel/hs-fmlist/pkg-descr6
-rw-r--r--devel/hs-foundation/Makefile13
-rw-r--r--devel/hs-foundation/distinfo3
-rw-r--r--devel/hs-foundation/pkg-descr12
-rw-r--r--devel/hs-free/Makefile2
-rw-r--r--devel/hs-free/distinfo5
-rw-r--r--devel/hs-fsnotify/Makefile1
-rw-r--r--devel/hs-fsnotify/distinfo1
-rw-r--r--devel/hs-gconf/Makefile2
-rw-r--r--devel/hs-gconf/distinfo5
-rw-r--r--devel/hs-generic-deriving/Makefile2
-rw-r--r--devel/hs-generic-deriving/distinfo5
-rw-r--r--devel/hs-geniplate-mirror/Makefile2
-rw-r--r--devel/hs-geniplate-mirror/distinfo5
-rw-r--r--devel/hs-ghc-events/Makefile2
-rw-r--r--devel/hs-ghc-events/distinfo5
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-mtl/distinfo1
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-ghc-paths/distinfo1
-rw-r--r--devel/hs-gio/Makefile2
-rw-r--r--devel/hs-gio/distinfo5
-rw-r--r--devel/hs-git-annex/Makefile133
-rw-r--r--devel/hs-git-annex/distinfo5
-rw-r--r--devel/hs-git-annex/files/patch-Build__Configure.hs6
-rw-r--r--devel/hs-git-annex/files/patch-Build__DesktopFile.hs12
-rw-r--r--devel/hs-git-annex/files/patch-Setup.hs44
-rw-r--r--devel/hs-git-annex/files/patch-Utility_QuickCheck.hs12
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal7
-rw-r--r--devel/hs-git-annex/pkg-plist4
-rw-r--r--devel/hs-gitrev/Makefile15
-rw-r--r--devel/hs-gitrev/distinfo3
-rw-r--r--devel/hs-gitrev/pkg-descr6
-rw-r--r--devel/hs-glib/Makefile2
-rw-r--r--devel/hs-glib/distinfo5
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo5
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs2
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs15
-rw-r--r--devel/hs-haddock-api/Makefile2
-rw-r--r--devel/hs-haddock-api/distinfo5
-rw-r--r--devel/hs-haddock-library/Makefile2
-rw-r--r--devel/hs-haddock-library/distinfo5
-rw-r--r--devel/hs-haddock/Makefile2
-rw-r--r--devel/hs-haddock/distinfo5
-rw-r--r--devel/hs-haddock/pkg-plist4
-rw-r--r--devel/hs-happy/Makefile1
-rw-r--r--devel/hs-happy/distinfo1
-rw-r--r--devel/hs-hashable/Makefile4
-rw-r--r--devel/hs-hashable/distinfo5
-rw-r--r--devel/hs-hashed-storage/Makefile2
-rw-r--r--devel/hs-hashed-storage/distinfo1
-rw-r--r--devel/hs-hashtables/Makefile2
-rw-r--r--devel/hs-hashtables/distinfo5
-rw-r--r--devel/hs-haskell-lexer/Makefile13
-rw-r--r--devel/hs-haskell-lexer/distinfo3
-rw-r--r--devel/hs-haskell-lexer/pkg-descr3
-rw-r--r--devel/hs-haskell-src-exts/Makefile4
-rw-r--r--devel/hs-haskell-src-exts/distinfo5
-rw-r--r--devel/hs-haskell-src/Makefile1
-rw-r--r--devel/hs-haskell-src/distinfo1
-rw-r--r--devel/hs-hasktags/Makefile2
-rw-r--r--devel/hs-hasktags/distinfo5
-rw-r--r--devel/hs-hastache/Makefile1
-rw-r--r--devel/hs-hastache/distinfo1
-rw-r--r--devel/hs-hastache/files/patch-hastache.cabal29
-rw-r--r--devel/hs-hex/Makefile1
-rw-r--r--devel/hs-hex/distinfo1
-rw-r--r--devel/hs-hinotify/Makefile4
-rw-r--r--devel/hs-hinotify/distinfo5
-rw-r--r--devel/hs-hint/Makefile10
-rw-r--r--devel/hs-hint/distinfo5
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlibev/distinfo1
-rw-r--r--devel/hs-hlint/Makefile4
-rw-r--r--devel/hs-hlint/distinfo5
-rw-r--r--devel/hs-hoogle/Makefile12
-rw-r--r--devel/hs-hoogle/distinfo5
-rw-r--r--devel/hs-hourglass/Makefile2
-rw-r--r--devel/hs-hourglass/distinfo5
-rw-r--r--devel/hs-hsb2hs/Makefile1
-rw-r--r--devel/hs-hsb2hs/distinfo1
-rw-r--r--devel/hs-hslogger/Makefile2
-rw-r--r--devel/hs-hslogger/distinfo5
-rw-r--r--devel/hs-hslua/Makefile2
-rw-r--r--devel/hs-hslua/distinfo5
-rw-r--r--devel/hs-hspec-core/Makefile2
-rw-r--r--devel/hs-hspec-core/distinfo5
-rw-r--r--devel/hs-hspec-discover/Makefile2
-rw-r--r--devel/hs-hspec-discover/distinfo5
-rw-r--r--devel/hs-hspec-expectations/Makefile4
-rw-r--r--devel/hs-hspec-expectations/distinfo5
-rw-r--r--devel/hs-hspec/Makefile2
-rw-r--r--devel/hs-hspec/distinfo5
-rw-r--r--devel/hs-io-streams-haproxy/Makefile15
-rw-r--r--devel/hs-io-streams-haproxy/distinfo3
-rw-r--r--devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal11
-rw-r--r--devel/hs-io-streams-haproxy/pkg-descr7
-rw-r--r--devel/hs-io-streams/Makefile15
-rw-r--r--devel/hs-io-streams/distinfo3
-rw-r--r--devel/hs-io-streams/files/patch-io-streams.cabal18
-rw-r--r--devel/hs-io-streams/pkg-descr4
-rw-r--r--devel/hs-js-flot/Makefile1
-rw-r--r--devel/hs-js-flot/distinfo1
-rw-r--r--devel/hs-js-jquery/Makefile2
-rw-r--r--devel/hs-js-jquery/distinfo5
-rw-r--r--devel/hs-keys/Makefile2
-rw-r--r--devel/hs-keys/distinfo5
-rw-r--r--devel/hs-kqueue/Makefile3
-rw-r--r--devel/hs-kqueue/distinfo5
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal17
-rw-r--r--devel/hs-kqueue/files/patch-src__System__KQueue.chs22
-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-language-javascript/distinfo5
-rw-r--r--devel/hs-largeword/Makefile3
-rw-r--r--devel/hs-largeword/distinfo5
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/distinfo1
-rw-r--r--devel/hs-lens/Makefile4
-rw-r--r--devel/hs-lens/distinfo5
-rw-r--r--devel/hs-lifted-async/Makefile2
-rw-r--r--devel/hs-lifted-async/distinfo5
-rw-r--r--devel/hs-lifted-base/Makefile2
-rw-r--r--devel/hs-lifted-base/distinfo5
-rw-r--r--devel/hs-logict/Makefile2
-rw-r--r--devel/hs-logict/distinfo1
-rw-r--r--devel/hs-map-syntax/Makefile2
-rw-r--r--devel/hs-map-syntax/distinfo5
-rw-r--r--devel/hs-memory/Makefile4
-rw-r--r--devel/hs-memory/distinfo5
-rw-r--r--devel/hs-microlens-th/Makefile15
-rw-r--r--devel/hs-microlens-th/distinfo3
-rw-r--r--devel/hs-microlens-th/pkg-descr6
-rw-r--r--devel/hs-microlens/Makefile13
-rw-r--r--devel/hs-microlens/distinfo3
-rw-r--r--devel/hs-microlens/pkg-descr6
-rw-r--r--devel/hs-microstache/Makefile15
-rw-r--r--devel/hs-microstache/distinfo3
-rw-r--r--devel/hs-microstache/pkg-descr6
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-mmap/distinfo1
-rw-r--r--devel/hs-mmorph/Makefile4
-rw-r--r--devel/hs-mmorph/distinfo5
-rw-r--r--devel/hs-monad-control/Makefile2
-rw-r--r--devel/hs-monad-control/distinfo5
-rw-r--r--devel/hs-monad-logger/Makefile2
-rw-r--r--devel/hs-monad-logger/distinfo5
-rw-r--r--devel/hs-monad-loops/Makefile1
-rw-r--r--devel/hs-monad-loops/distinfo1
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par-extras/distinfo1
-rw-r--r--devel/hs-monad-par/Makefile2
-rw-r--r--devel/hs-monad-par/distinfo5
-rw-r--r--devel/hs-monad-unlift/Makefile15
-rw-r--r--devel/hs-monad-unlift/distinfo3
-rw-r--r--devel/hs-monad-unlift/pkg-descr3
-rw-r--r--devel/hs-monadplus/Makefile11
-rw-r--r--devel/hs-monadplus/distinfo3
-rw-r--r--devel/hs-monadplus/pkg-descr5
-rw-r--r--devel/hs-monads-tf/Makefile3
-rw-r--r--devel/hs-monads-tf/distinfo5
-rw-r--r--devel/hs-mono-traversable-instances/Makefile16
-rw-r--r--devel/hs-mono-traversable-instances/distinfo3
-rw-r--r--devel/hs-mono-traversable-instances/pkg-descr3
-rw-r--r--devel/hs-mono-traversable/Makefile4
-rw-r--r--devel/hs-mono-traversable/distinfo5
-rw-r--r--devel/hs-mtl/Makefile1
-rw-r--r--devel/hs-mtl/distinfo1
-rw-r--r--devel/hs-mtl/files/patch-git_594984022
-rw-r--r--devel/hs-mueval/Makefile2
-rw-r--r--devel/hs-mueval/distinfo5
-rw-r--r--devel/hs-murmur-hash/Makefile2
-rw-r--r--devel/hs-murmur-hash/distinfo5
-rw-r--r--devel/hs-mutable-containers/Makefile2
-rw-r--r--devel/hs-mutable-containers/distinfo5
-rw-r--r--devel/hs-ncurses/Makefile5
-rw-r--r--devel/hs-newtype-generics/Makefile13
-rw-r--r--devel/hs-newtype-generics/distinfo3
-rw-r--r--devel/hs-newtype-generics/pkg-descr7
-rw-r--r--devel/hs-newtype/Makefile1
-rw-r--r--devel/hs-newtype/distinfo1
-rw-r--r--devel/hs-old-locale/Makefile1
-rw-r--r--devel/hs-old-locale/distinfo1
-rw-r--r--devel/hs-old-locale/files/patch-git_15fea2d21
-rw-r--r--devel/hs-old-time/Makefile1
-rw-r--r--devel/hs-old-time/distinfo1
-rw-r--r--devel/hs-old-time/files/patch-git_82790af23
-rw-r--r--devel/hs-optparse-applicative/Makefile2
-rw-r--r--devel/hs-optparse-applicative/distinfo5
-rw-r--r--devel/hs-parallel/Makefile2
-rw-r--r--devel/hs-parallel/distinfo5
-rw-r--r--devel/hs-pcre-light/Makefile3
-rw-r--r--devel/hs-pcre-light/distinfo5
-rw-r--r--devel/hs-prelude-extras/Makefile3
-rw-r--r--devel/hs-prelude-extras/distinfo5
-rw-r--r--devel/hs-preprocessor-tools/Makefile1
-rw-r--r--devel/hs-preprocessor-tools/distinfo1
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-prettyclass/distinfo1
-rw-r--r--devel/hs-primitive/Makefile2
-rw-r--r--devel/hs-primitive/distinfo5
-rw-r--r--devel/hs-process-extras/Makefile15
-rw-r--r--devel/hs-process-extras/distinfo3
-rw-r--r--devel/hs-process-extras/pkg-descr7
-rw-r--r--devel/hs-profunctors/Makefile5
-rw-r--r--devel/hs-profunctors/distinfo5
-rw-r--r--devel/hs-profunctors/files/patch-git_c0574c22
-rw-r--r--devel/hs-project-template/Makefile1
-rw-r--r--devel/hs-project-template/distinfo1
-rw-r--r--devel/hs-psqueues/Makefile15
-rw-r--r--devel/hs-psqueues/distinfo3
-rw-r--r--devel/hs-psqueues/pkg-descr21
-rw-r--r--devel/hs-quickcheck-io/Makefile3
-rw-r--r--devel/hs-quickcheck-io/distinfo5
-rw-r--r--devel/hs-random/Makefile1
-rw-r--r--devel/hs-random/distinfo1
-rw-r--r--devel/hs-readable/Makefile15
-rw-r--r--devel/hs-readable/distinfo3
-rw-r--r--devel/hs-readable/pkg-descr4
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-readline/distinfo1
-rw-r--r--devel/hs-refact/Makefile13
-rw-r--r--devel/hs-refact/distinfo3
-rw-r--r--devel/hs-refact/pkg-descr5
-rw-r--r--devel/hs-reflection/Makefile2
-rw-r--r--devel/hs-reflection/distinfo5
-rw-r--r--devel/hs-resource-pool/Makefile1
-rw-r--r--devel/hs-resource-pool/distinfo1
-rw-r--r--devel/hs-resourcet/Makefile6
-rw-r--r--devel/hs-resourcet/distinfo5
-rw-r--r--devel/hs-safe-exceptions/Makefile15
-rw-r--r--devel/hs-safe-exceptions/distinfo3
-rw-r--r--devel/hs-safe-exceptions/pkg-descr3
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-safe/distinfo5
-rw-r--r--devel/hs-say/Makefile15
-rw-r--r--devel/hs-say/distinfo3
-rw-r--r--devel/hs-say/pkg-descr3
-rw-r--r--devel/hs-scientific/Makefile4
-rw-r--r--devel/hs-scientific/distinfo5
-rw-r--r--devel/hs-securemem/Makefile1
-rw-r--r--devel/hs-securemem/distinfo1
-rw-r--r--devel/hs-setenv/Makefile1
-rw-r--r--devel/hs-setenv/distinfo1
-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-shake/distinfo5
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-show/distinfo1
-rw-r--r--devel/hs-silently/Makefile1
-rw-r--r--devel/hs-silently/distinfo1
-rw-r--r--devel/hs-simple-reflect/Makefile2
-rw-r--r--devel/hs-simple-reflect/distinfo1
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-smallcheck/distinfo1
-rw-r--r--devel/hs-split/Makefile3
-rw-r--r--devel/hs-split/distinfo5
-rw-r--r--devel/hs-split/files/patch-split.cabal11
-rw-r--r--devel/hs-stm-chans/Makefile1
-rw-r--r--devel/hs-stm-chans/distinfo1
-rw-r--r--devel/hs-stm/Makefile2
-rw-r--r--devel/hs-stm/distinfo5
-rw-r--r--devel/hs-streaming-commons/Makefile4
-rw-r--r--devel/hs-streaming-commons/distinfo5
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-strict/distinfo1
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile16
-rw-r--r--devel/hs-syb-with-class-instances-text/distinfo2
-rw-r--r--devel/hs-syb-with-class-instances-text/pkg-descr3
-rw-r--r--devel/hs-syb-with-class/Makefile2
-rw-r--r--devel/hs-syb-with-class/distinfo5
-rw-r--r--devel/hs-syb/Makefile2
-rw-r--r--devel/hs-syb/distinfo5
-rw-r--r--devel/hs-system-fileio/Makefile1
-rw-r--r--devel/hs-system-fileio/distinfo1
-rw-r--r--devel/hs-system-filepath/Makefile1
-rw-r--r--devel/hs-system-filepath/distinfo1
-rw-r--r--devel/hs-tagged/Makefile4
-rw-r--r--devel/hs-tagged/distinfo5
-rw-r--r--devel/hs-tagged/files/patch-tagged.cabal11
-rw-r--r--devel/hs-temporary/Makefile3
-rw-r--r--devel/hs-temporary/distinfo5
-rw-r--r--devel/hs-terminal-size/Makefile13
-rw-r--r--devel/hs-terminal-size/distinfo3
-rw-r--r--devel/hs-terminal-size/pkg-descr3
-rw-r--r--devel/hs-test-framework-hunit/Makefile5
-rw-r--r--devel/hs-test-framework-hunit/distinfo5
-rw-r--r--devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal16
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile3
-rw-r--r--devel/hs-test-framework-quickcheck2/distinfo5
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework/Makefile1
-rw-r--r--devel/hs-test-framework/distinfo1
-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-icu/distinfo1
-rw-r--r--devel/hs-text-short/Makefile15
-rw-r--r--devel/hs-text-short/distinfo3
-rw-r--r--devel/hs-text-short/pkg-descr11
-rw-r--r--devel/hs-text/Makefile2
-rw-r--r--devel/hs-text/distinfo5
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-tf-random/distinfo1
-rw-r--r--devel/hs-th-abstraction/Makefile13
-rw-r--r--devel/hs-th-abstraction/distinfo3
-rw-r--r--devel/hs-th-abstraction/pkg-descr5
-rw-r--r--devel/hs-th-lift-instances/Makefile15
-rw-r--r--devel/hs-th-lift-instances/distinfo3
-rw-r--r--devel/hs-th-lift-instances/pkg-descr3
-rw-r--r--devel/hs-th-lift/Makefile13
-rw-r--r--devel/hs-th-lift/distinfo3
-rw-r--r--devel/hs-th-lift/pkg-descr3
-rw-r--r--devel/hs-threads/Makefile2
-rw-r--r--devel/hs-threads/distinfo5
-rw-r--r--devel/hs-threadscope/Makefile5
-rw-r--r--devel/hs-threadscope/distinfo5
-rw-r--r--devel/hs-time-compat/Makefile2
-rw-r--r--devel/hs-time-compat/distinfo1
-rw-r--r--devel/hs-time-locale-compat/Makefile4
-rw-r--r--devel/hs-time-locale-compat/distinfo5
-rw-r--r--devel/hs-timezone-olson/Makefile2
-rw-r--r--devel/hs-timezone-olson/distinfo5
-rw-r--r--devel/hs-timezone-series/Makefile2
-rw-r--r--devel/hs-timezone-series/distinfo5
-rw-r--r--devel/hs-transformers-base/Makefile1
-rw-r--r--devel/hs-transformers-base/distinfo1
-rw-r--r--devel/hs-transformers-compat/Makefile2
-rw-r--r--devel/hs-transformers-compat/distinfo5
-rw-r--r--devel/hs-typed-process/Makefile15
-rw-r--r--devel/hs-typed-process/distinfo3
-rw-r--r--devel/hs-typed-process/pkg-descr3
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-unamb/distinfo1
-rw-r--r--devel/hs-unexceptionalio/Makefile13
-rw-r--r--devel/hs-unexceptionalio/distinfo3
-rw-r--r--devel/hs-unexceptionalio/pkg-descr7
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-uniplate/distinfo1
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-compat/distinfo5
-rw-r--r--devel/hs-unix-time/Makefile2
-rw-r--r--devel/hs-unix-time/distinfo5
-rw-r--r--devel/hs-unordered-containers/Makefile2
-rw-r--r--devel/hs-unordered-containers/distinfo5
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-light/distinfo1
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utf8-string/distinfo5
-rw-r--r--devel/hs-utf8-string/files/patch-git_6b70ee716
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-utility-ht/distinfo5
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/distinfo1
-rw-r--r--devel/hs-uuagc-cabal/Makefile1
-rw-r--r--devel/hs-uuagc-cabal/distinfo1
-rw-r--r--devel/hs-uuagc/Makefile1
-rw-r--r--devel/hs-uuagc/distinfo1
-rw-r--r--devel/hs-uuid-types/Makefile2
-rw-r--r--devel/hs-uuid-types/distinfo5
-rw-r--r--devel/hs-uuid/Makefile6
-rw-r--r--devel/hs-uuid/distinfo5
-rw-r--r--devel/hs-uulib/Makefile2
-rw-r--r--devel/hs-uulib/distinfo5
-rw-r--r--devel/hs-vault/Makefile2
-rw-r--r--devel/hs-vault/distinfo5
-rw-r--r--devel/hs-vector-algorithms/Makefile1
-rw-r--r--devel/hs-vector-algorithms/distinfo1
-rw-r--r--devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal11
-rw-r--r--devel/hs-vector-binary-instances/Makefile3
-rw-r--r--devel/hs-vector-binary-instances/distinfo5
-rw-r--r--devel/hs-vector-instances/Makefile2
-rw-r--r--devel/hs-vector-instances/distinfo5
-rw-r--r--devel/hs-vector-th-unbox/Makefile4
-rw-r--r--devel/hs-vector-th-unbox/distinfo5
-rw-r--r--devel/hs-vector/Makefile2
-rw-r--r--devel/hs-vector/distinfo5
-rw-r--r--devel/hs-void/Makefile2
-rw-r--r--devel/hs-void/distinfo5
-rw-r--r--devel/hs-wl-pprint-text/Makefile15
-rw-r--r--devel/hs-wl-pprint-text/distinfo3
-rw-r--r--devel/hs-wl-pprint-text/pkg-descr3
-rw-r--r--devel/hs-word8/Makefile1
-rw-r--r--devel/hs-word8/distinfo1
-rw-r--r--devel/stack/Makefile12
-rw-r--r--devel/stack/distinfo6
-rw-r--r--dns/hs-dns/Makefile4
-rw-r--r--dns/hs-dns/distinfo5
-rw-r--r--dns/hs-dns/files/patch-dns.cabal34
-rw-r--r--dns/hs-gnuidn/Makefile3
-rw-r--r--dns/hs-gnuidn/distinfo5
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--games/hs-scroll/Makefile2
-rw-r--r--games/hs-scroll/distinfo5
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/hs-HGL/Makefile2
-rw-r--r--graphics/hs-JuicyPixels/Makefile2
-rw-r--r--graphics/hs-JuicyPixels/distinfo5
-rw-r--r--graphics/hs-cairo/Makefile4
-rw-r--r--graphics/hs-cairo/distinfo5
-rw-r--r--graphics/hs-dia-base/Makefile2
-rw-r--r--graphics/hs-dia-base/distinfo5
-rw-r--r--graphics/hs-dia-functions/Makefile3
-rw-r--r--graphics/hs-dia-functions/files/patch-dia-functions.cabal11
-rw-r--r--graphics/hs-graphviz/Makefile18
-rw-r--r--graphics/hs-graphviz/distinfo3
-rw-r--r--graphics/hs-graphviz/pkg-descr5
-rw-r--r--graphics/hs-svgcairo/Makefile4
-rw-r--r--graphics/hs-svgcairo/distinfo5
-rw-r--r--lang/ghc/Makefile277
-rw-r--r--lang/ghc/bsd.cabal.mk226
-rw-r--r--lang/ghc/bsd.cabal.options.mk16
-rw-r--r--lang/ghc/bsd.hackage.mk1081
-rw-r--r--lang/ghc/distinfo9
-rw-r--r--lang/ghc/files/build.boot.mk.in8
-rw-r--r--lang/ghc/files/build.mk.in19
-rw-r--r--lang/ghc/files/patch-aclocal.m439
-rw-r--r--lang/ghc/files/patch-configure.ac18
-rw-r--r--lang/ghc/files/patch-ghc.mk17
-rw-r--r--lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs4
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs29
-rw-r--r--lang/ghc/pkg-plist9
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-brainfuck/distinfo5
-rw-r--r--lang/hs-unlambda/Makefile2
-rw-r--r--lang/hs-unlambda/distinfo5
-rw-r--r--mail/hs-email-validate/Makefile2
-rw-r--r--mail/hs-email-validate/distinfo5
-rw-r--r--mail/hs-mime-mail/Makefile2
-rw-r--r--mail/hs-mime-mail/distinfo5
-rw-r--r--mail/hs-mime-types/Makefile2
-rw-r--r--mail/hs-mime-types/distinfo5
-rw-r--r--mail/hs-mime/Makefile1
-rw-r--r--mail/hs-mime/distinfo1
-rw-r--r--math/Makefile3
-rw-r--r--math/hs-Agda-stdlib/Makefile3
-rw-r--r--math/hs-Agda-stdlib/distinfo5
-rw-r--r--math/hs-Agda-stdlib/files/patch-lib.cabal18
-rw-r--r--math/hs-Agda-stdlib/files/patch-src_Size.agda21
-rw-r--r--math/hs-Agda/Makefile26
-rw-r--r--math/hs-Agda/distinfo7
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal26
-rw-r--r--math/hs-Agda/files/pkg-deinstall.in9
-rw-r--r--math/hs-Agda/files/pkg-install.in9
-rw-r--r--math/hs-NumInstances/Makefile1
-rw-r--r--math/hs-NumInstances/distinfo1
-rw-r--r--math/hs-adjunctions/Makefile2
-rw-r--r--math/hs-adjunctions/distinfo5
-rw-r--r--math/hs-categories/Makefile1
-rw-r--r--math/hs-categories/distinfo1
-rw-r--r--math/hs-comonad/Makefile2
-rw-r--r--math/hs-comonad/distinfo5
-rw-r--r--math/hs-contravariant/Makefile5
-rw-r--r--math/hs-contravariant/distinfo5
-rw-r--r--math/hs-data-lens-template/Makefile2
-rw-r--r--math/hs-data-lens-template/distinfo5
-rw-r--r--math/hs-data-lens/Makefile4
-rw-r--r--math/hs-data-lens/distinfo5
-rw-r--r--math/hs-data-lens/files/patch-data-lens.cabal11
-rw-r--r--math/hs-distributive/Makefile5
-rw-r--r--math/hs-distributive/distinfo5
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-erf/distinfo1
-rw-r--r--math/hs-fixed/Makefile13
-rw-r--r--math/hs-fixed/distinfo3
-rw-r--r--math/hs-fixed/pkg-descr3
-rw-r--r--math/hs-half/Makefile13
-rw-r--r--math/hs-half/distinfo3
-rw-r--r--math/hs-half/pkg-descr3
-rw-r--r--math/hs-ieee754/Makefile2
-rw-r--r--math/hs-ieee754/distinfo5
-rw-r--r--math/hs-integer-logarithms/Makefile13
-rw-r--r--math/hs-integer-logarithms/distinfo3
-rw-r--r--math/hs-integer-logarithms/pkg-descr7
-rw-r--r--math/hs-kan-extensions/Makefile7
-rw-r--r--math/hs-kan-extensions/distinfo5
-rw-r--r--math/hs-kan-extensions/files/patch-kan-extensions.cabal10
-rw-r--r--math/hs-math-functions/Makefile5
-rw-r--r--math/hs-math-functions/distinfo5
-rw-r--r--math/hs-mwc-random/Makefile4
-rw-r--r--math/hs-mwc-random/distinfo5
-rw-r--r--math/hs-pointed/Makefile8
-rw-r--r--math/hs-pointed/distinfo5
-rw-r--r--math/hs-pointed/files/patch-git_55eab022
-rw-r--r--math/hs-probability/Makefile3
-rw-r--r--math/hs-probability/distinfo5
-rw-r--r--math/hs-probability/files/patch-probability.cabal11
-rw-r--r--math/hs-semigroupoids/Makefile2
-rw-r--r--math/hs-semigroupoids/distinfo5
-rw-r--r--math/hs-semigroups/Makefile4
-rw-r--r--math/hs-semigroups/distinfo5
-rw-r--r--math/hs-semigroups/files/patch-semigroups.cabal12
-rw-r--r--math/hs-statistics/Makefile6
-rw-r--r--math/hs-statistics/distinfo5
-rw-r--r--math/hs-vector-space/Makefile2
-rw-r--r--math/hs-vector-space/distinfo5
-rw-r--r--net-im/hs-haskell-xmpp/Makefile2
-rw-r--r--net-p2p/hs-torrent/Makefile2
-rw-r--r--net-p2p/hs-torrent/distinfo5
-rw-r--r--net/hs-aws/Makefile2
-rw-r--r--net/hs-aws/distinfo5
-rw-r--r--net/hs-aws/files/patch-aws.cabal11
-rw-r--r--net/hs-connection/Makefile2
-rw-r--r--net/hs-connection/distinfo5
-rw-r--r--net/hs-gsasl/Makefile1
-rw-r--r--net/hs-gsasl/distinfo1
-rw-r--r--net/hs-hoauth2/Makefile5
-rw-r--r--net/hs-hoauth2/distinfo5
-rw-r--r--net/hs-hoauth2/files/patch-hoauth2.cabal83
-rw-r--r--net/hs-hoauth2/pkg-descr2
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-hostname/distinfo1
-rw-r--r--net/hs-iproute/Makefile2
-rw-r--r--net/hs-iproute/distinfo5
-rw-r--r--net/hs-maccatcher/Makefile2
-rw-r--r--net/hs-maccatcher/distinfo1
-rw-r--r--net/hs-network-info/Makefile2
-rw-r--r--net/hs-network-info/distinfo5
-rw-r--r--net/hs-network-multicast/Makefile2
-rw-r--r--net/hs-network-multicast/distinfo5
-rw-r--r--net/hs-network-protocol-xmpp/Makefile2
-rw-r--r--net/hs-network-protocol-xmpp/distinfo1
-rw-r--r--net/hs-network-uri/Makefile2
-rw-r--r--net/hs-network-uri/distinfo5
-rw-r--r--net/hs-network/Makefile2
-rw-r--r--net/hs-network/distinfo5
-rw-r--r--net/hs-pcap/Makefile2
-rw-r--r--net/hs-pcap/distinfo1
-rw-r--r--net/hs-publicsuffixlist/Makefile2
-rw-r--r--net/hs-publicsuffixlist/distinfo1
-rw-r--r--net/hs-sendfile/Makefile2
-rw-r--r--net/hs-sendfile/distinfo1
-rw-r--r--net/hs-simple-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/distinfo5
-rw-r--r--net/hs-socks/Makefile3
-rw-r--r--net/hs-socks/distinfo5
-rw-r--r--ports-mgmt/hs-porte/Makefile2
-rw-r--r--print/hs-hscolour/distinfo5
-rw-r--r--science/hs-bio/Makefile2
-rw-r--r--security/Makefile6
-rw-r--r--security/hs-Crypto/Makefile2
-rw-r--r--security/hs-Crypto/distinfo1
-rw-r--r--security/hs-DRBG/Makefile2
-rw-r--r--security/hs-DRBG/distinfo5
-rw-r--r--security/hs-HsOpenSSL/Makefile2
-rw-r--r--security/hs-HsOpenSSL/distinfo5
-rw-r--r--security/hs-RSA/Makefile2
-rw-r--r--security/hs-RSA/distinfo5
-rw-r--r--security/hs-SHA/Makefile1
-rw-r--r--security/hs-SHA/distinfo1
-rw-r--r--security/hs-certificate/Makefile2
-rw-r--r--security/hs-certificate/distinfo1
-rw-r--r--security/hs-cipher-aes/Makefile1
-rw-r--r--security/hs-cipher-aes/distinfo1
-rw-r--r--security/hs-cipher-aes128/Makefile2
-rw-r--r--security/hs-cipher-aes128/distinfo5
-rw-r--r--security/hs-cipher-blowfish/Makefile2
-rw-r--r--security/hs-cipher-blowfish/distinfo1
-rw-r--r--security/hs-cipher-camellia/Makefile2
-rw-r--r--security/hs-cipher-camellia/distinfo1
-rw-r--r--security/hs-cipher-des/Makefile2
-rw-r--r--security/hs-cipher-des/distinfo1
-rw-r--r--security/hs-cipher-rc4/Makefile2
-rw-r--r--security/hs-cipher-rc4/distinfo1
-rw-r--r--security/hs-clientsession/Makefile2
-rw-r--r--security/hs-clientsession/distinfo5
-rw-r--r--security/hs-cprng-aes/Makefile1
-rw-r--r--security/hs-cprng-aes/distinfo1
-rw-r--r--security/hs-crypto-api/Makefile1
-rw-r--r--security/hs-crypto-api/distinfo1
-rw-r--r--security/hs-crypto-cipher-types/Makefile2
-rw-r--r--security/hs-crypto-cipher-types/distinfo1
-rw-r--r--security/hs-crypto-conduit/Makefile4
-rw-r--r--security/hs-crypto-conduit/distinfo1
-rw-r--r--security/hs-crypto-conduit/files/patch-crypto-conduit.cabal14
-rw-r--r--security/hs-crypto-numbers/Makefile1
-rw-r--r--security/hs-crypto-numbers/distinfo1
-rw-r--r--security/hs-crypto-pubkey-types/Makefile1
-rw-r--r--security/hs-crypto-pubkey-types/distinfo1
-rw-r--r--security/hs-crypto-pubkey/Makefile1
-rw-r--r--security/hs-crypto-pubkey/distinfo1
-rw-r--r--security/hs-crypto-random-api/Makefile2
-rw-r--r--security/hs-crypto-random-api/distinfo1
-rw-r--r--security/hs-crypto-random/Makefile1
-rw-r--r--security/hs-crypto-random/distinfo1
-rw-r--r--security/hs-cryptocipher/Makefile2
-rw-r--r--security/hs-cryptocipher/distinfo1
-rw-r--r--security/hs-cryptohash-conduit/Makefile2
-rw-r--r--security/hs-cryptohash-conduit/distinfo1
-rw-r--r--security/hs-cryptohash-cryptoapi/Makefile3
-rw-r--r--security/hs-cryptohash-cryptoapi/distinfo5
-rw-r--r--security/hs-cryptohash-md5/Makefile13
-rw-r--r--security/hs-cryptohash-md5/distinfo3
-rw-r--r--security/hs-cryptohash-md5/pkg-descr16
-rw-r--r--security/hs-cryptohash-sha1/Makefile13
-rw-r--r--security/hs-cryptohash-sha1/distinfo3
-rw-r--r--security/hs-cryptohash-sha1/pkg-descr16
-rw-r--r--security/hs-cryptohash-sha256/Makefile13
-rw-r--r--security/hs-cryptohash-sha256/distinfo3
-rw-r--r--security/hs-cryptohash-sha256/pkg-descr16
-rw-r--r--security/hs-cryptohash/Makefile5
-rw-r--r--security/hs-cryptohash/distinfo5
-rw-r--r--security/hs-cryptonite/Makefile2
-rw-r--r--security/hs-cryptonite/distinfo5
-rw-r--r--security/hs-digest/Makefile2
-rw-r--r--security/hs-digest/distinfo1
-rw-r--r--security/hs-ed25519/Makefile13
-rw-r--r--security/hs-ed25519/distinfo3
-rw-r--r--security/hs-ed25519/files/patch-ed25519.cabal11
-rw-r--r--security/hs-ed25519/pkg-descr6
-rw-r--r--security/hs-entropy/Makefile2
-rw-r--r--security/hs-entropy/distinfo5
-rw-r--r--security/hs-gnutls/Makefile2
-rw-r--r--security/hs-gnutls/distinfo1
-rw-r--r--security/hs-hackage-security/Makefile16
-rw-r--r--security/hs-hackage-security/distinfo3
-rw-r--r--security/hs-hackage-security/files/patch-hackage-security.cabal10
-rw-r--r--security/hs-hackage-security/pkg-descr15
-rw-r--r--security/hs-monadcryptorandom/Makefile5
-rw-r--r--security/hs-monadcryptorandom/distinfo5
-rw-r--r--security/hs-nonce/Makefile4
-rw-r--r--security/hs-nonce/distinfo5
-rw-r--r--security/hs-pem/Makefile2
-rw-r--r--security/hs-pem/distinfo1
-rw-r--r--security/hs-pureMD5/Makefile3
-rw-r--r--security/hs-pureMD5/distinfo5
-rw-r--r--security/hs-pwstore-fast/Makefile1
-rw-r--r--security/hs-pwstore-fast/distinfo1
-rw-r--r--security/hs-skein/Makefile2
-rw-r--r--security/hs-skein/distinfo5
-rw-r--r--security/hs-tls-session-manager/Makefile15
-rw-r--r--security/hs-tls-session-manager/distinfo3
-rw-r--r--security/hs-tls-session-manager/pkg-descr3
-rw-r--r--security/hs-tls/Makefile2
-rw-r--r--security/hs-tls/distinfo5
-rw-r--r--security/hs-x509-store/Makefile2
-rw-r--r--security/hs-x509-store/distinfo5
-rw-r--r--security/hs-x509-system/Makefile2
-rw-r--r--security/hs-x509-system/distinfo5
-rw-r--r--security/hs-x509-validation/Makefile2
-rw-r--r--security/hs-x509-validation/distinfo5
-rw-r--r--security/hs-x509/Makefile2
-rw-r--r--security/hs-x509/distinfo5
-rw-r--r--shells/hs-shelly/Makefile2
-rw-r--r--shells/hs-shelly/distinfo5
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/hs-angel/Makefile1
-rw-r--r--sysutils/hs-angel/distinfo1
-rw-r--r--sysutils/hs-angel/files/patch-src_Angel_Main.hs10
-rw-r--r--sysutils/hs-cpu/Makefile2
-rw-r--r--sysutils/hs-cpu/distinfo1
-rw-r--r--sysutils/hs-disk-free-space/Makefile13
-rw-r--r--sysutils/hs-disk-free-space/distinfo3
-rw-r--r--sysutils/hs-disk-free-space/pkg-descr4
-rw-r--r--sysutils/hs-ekg-core/Makefile2
-rw-r--r--sysutils/hs-ekg-core/distinfo5
-rw-r--r--sysutils/hs-ekg-json/Makefile2
-rw-r--r--sysutils/hs-ekg-json/distinfo5
-rw-r--r--sysutils/hs-ekg/Makefile2
-rw-r--r--sysutils/hs-ekg/distinfo5
-rw-r--r--sysutils/hs-mountpoints/Makefile13
-rw-r--r--sysutils/hs-mountpoints/distinfo3
-rw-r--r--sysutils/hs-mountpoints/pkg-descr5
-rw-r--r--textproc/Makefile10
-rw-r--r--textproc/hs-Diff/Makefile2
-rw-r--r--textproc/hs-Diff/distinfo5
-rw-r--r--textproc/hs-HStringTemplate/Makefile2
-rw-r--r--textproc/hs-HStringTemplate/distinfo5
-rw-r--r--textproc/hs-HaXml/Makefile2
-rw-r--r--textproc/hs-HaXml/distinfo5
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-appar/distinfo1
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile1
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo1
-rw-r--r--textproc/hs-attoparsec-iso8601/Makefile15
-rw-r--r--textproc/hs-attoparsec-iso8601/distinfo3
-rw-r--r--textproc/hs-attoparsec-iso8601/pkg-descr3
-rw-r--r--textproc/hs-attoparsec/Makefile4
-rw-r--r--textproc/hs-attoparsec/distinfo5
-rw-r--r--textproc/hs-bencode/Makefile1
-rw-r--r--textproc/hs-bencode/distinfo1
-rw-r--r--textproc/hs-blaze-html/Makefile2
-rw-r--r--textproc/hs-blaze-html/distinfo5
-rw-r--r--textproc/hs-blaze-markup/Makefile2
-rw-r--r--textproc/hs-blaze-markup/distinfo5
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-bytestring-csv/distinfo1
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-case-insensitive/distinfo5
-rw-r--r--textproc/hs-cassava/Makefile4
-rw-r--r--textproc/hs-cassava/distinfo5
-rw-r--r--textproc/hs-citeproc-hs/Makefile38
-rw-r--r--textproc/hs-citeproc-hs/distinfo2
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs10
-rw-r--r--textproc/hs-citeproc-hs/pkg-descr7
-rw-r--r--textproc/hs-cmark/Makefile2
-rw-r--r--textproc/hs-cmark/distinfo5
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-csv/distinfo1
-rw-r--r--textproc/hs-doctemplates/Makefile16
-rw-r--r--textproc/hs-doctemplates/distinfo3
-rw-r--r--textproc/hs-doctemplates/pkg-descr3
-rw-r--r--textproc/hs-double-conversion/Makefile2
-rw-r--r--textproc/hs-double-conversion/distinfo5
-rw-r--r--textproc/hs-feed/Makefile2
-rw-r--r--textproc/hs-feed/distinfo5
-rw-r--r--textproc/hs-hexpat/Makefile4
-rw-r--r--textproc/hs-hexpat/distinfo5
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo5
-rw-r--r--textproc/hs-hs-bibutils/Makefile1
-rw-r--r--textproc/hs-hs-bibutils/distinfo1
-rw-r--r--textproc/hs-html-conduit/Makefile2
-rw-r--r--textproc/hs-html-conduit/distinfo5
-rw-r--r--textproc/hs-html-conduit/files/patch-html-conduit.cabal11
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-html/distinfo1
-rw-r--r--textproc/hs-hxt-charproperties/Makefile1
-rw-r--r--textproc/hs-hxt-charproperties/distinfo1
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/distinfo5
-rw-r--r--textproc/hs-hxt-unicode/Makefile1
-rw-r--r--textproc/hs-hxt-unicode/distinfo1
-rw-r--r--textproc/hs-hxt/Makefile2
-rw-r--r--textproc/hs-hxt/distinfo5
-rw-r--r--textproc/hs-lhs2tex/Makefile1
-rw-r--r--textproc/hs-lhs2tex/distinfo1
-rw-r--r--textproc/hs-libxml-sax/Makefile2
-rw-r--r--textproc/hs-libxml-sax/distinfo1
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-libxml/distinfo1
-rw-r--r--textproc/hs-magic/Makefile13
-rw-r--r--textproc/hs-magic/distinfo3
-rw-r--r--textproc/hs-magic/pkg-descr5
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo5
-rw-r--r--textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal38
-rw-r--r--textproc/hs-pandoc-types/Makefile4
-rw-r--r--textproc/hs-pandoc-types/distinfo5
-rw-r--r--textproc/hs-pandoc-types/files/patch-pandoc-types.cabal24
-rw-r--r--textproc/hs-pandoc/Makefile23
-rw-r--r--textproc/hs-pandoc/distinfo5
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal83
-rw-r--r--textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs14
-rw-r--r--textproc/hs-parsec/Makefile2
-rw-r--r--textproc/hs-parsec/distinfo5
-rw-r--r--textproc/hs-polyparse/Makefile2
-rw-r--r--textproc/hs-polyparse/distinfo5
-rw-r--r--textproc/hs-pretty-show/Makefile16
-rw-r--r--textproc/hs-pretty-show/distinfo3
-rw-r--r--textproc/hs-pretty-show/pkg-descr8
-rw-r--r--textproc/hs-regex-applicative/Makefile2
-rw-r--r--textproc/hs-regex-applicative/distinfo5
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-base/distinfo1
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile1
-rw-r--r--textproc/hs-regex-compat-tdfa/distinfo1
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-compat/distinfo1
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo1
-rw-r--r--textproc/hs-regex-pcre/Makefile17
-rw-r--r--textproc/hs-regex-pcre/distinfo3
-rw-r--r--textproc/hs-regex-pcre/pkg-descr3
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-posix/distinfo1
-rw-r--r--textproc/hs-regex-tdfa/Makefile3
-rw-r--r--textproc/hs-regex-tdfa/distinfo5
-rw-r--r--textproc/hs-rfc5051/Makefile1
-rw-r--r--textproc/hs-rfc5051/distinfo1
-rw-r--r--textproc/hs-scanner/Makefile13
-rw-r--r--textproc/hs-scanner/distinfo3
-rw-r--r--textproc/hs-scanner/pkg-descr3
-rw-r--r--textproc/hs-skylighting/Makefile16
-rw-r--r--textproc/hs-skylighting/distinfo3
-rw-r--r--textproc/hs-skylighting/pkg-descr7
-rw-r--r--textproc/hs-stringsearch/Makefile1
-rw-r--r--textproc/hs-stringsearch/distinfo1
-rw-r--r--textproc/hs-tagsoup/Makefile2
-rw-r--r--textproc/hs-tagsoup/distinfo5
-rw-r--r--textproc/hs-tagstream-conduit/Makefile1
-rw-r--r--textproc/hs-tagstream-conduit/distinfo1
-rw-r--r--textproc/hs-texmath/Makefile6
-rw-r--r--textproc/hs-texmath/distinfo5
-rw-r--r--textproc/hs-texmath/files/patch-texmath.cabal20
-rw-r--r--textproc/hs-uri-bytestring-aeson/Makefile15
-rw-r--r--textproc/hs-uri-bytestring-aeson/distinfo3
-rw-r--r--textproc/hs-uri-bytestring-aeson/pkg-descr4
-rw-r--r--textproc/hs-uri-bytestring/Makefile15
-rw-r--r--textproc/hs-uri-bytestring/distinfo3
-rw-r--r--textproc/hs-uri-bytestring/pkg-descr4
-rw-r--r--textproc/hs-uri/Makefile2
-rw-r--r--textproc/hs-uri/distinfo5
-rw-r--r--textproc/hs-xml-conduit/Makefile2
-rw-r--r--textproc/hs-xml-conduit/distinfo5
-rw-r--r--textproc/hs-xml-hamlet/Makefile2
-rw-r--r--textproc/hs-xml-hamlet/distinfo5
-rw-r--r--textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal11
-rw-r--r--textproc/hs-xml-types/Makefile1
-rw-r--r--textproc/hs-xml-types/distinfo1
-rw-r--r--textproc/hs-xml/Makefile1
-rw-r--r--textproc/hs-xml/distinfo1
-rw-r--r--textproc/hs-xmlhtml/Makefile6
-rw-r--r--textproc/hs-xmlhtml/distinfo5
-rw-r--r--textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs30
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal14
-rw-r--r--textproc/hs-yaml/Makefile2
-rw-r--r--textproc/hs-yaml/distinfo5
-rw-r--r--www/Makefile1
-rw-r--r--www/hs-DAV/Makefile2
-rw-r--r--www/hs-DAV/distinfo5
-rw-r--r--www/hs-HTTP/Makefile2
-rw-r--r--www/hs-HTTP/distinfo5
-rw-r--r--www/hs-activehs/Makefile15
-rw-r--r--www/hs-activehs/distinfo5
-rw-r--r--www/hs-activehs/files/patch-Converter.hs87
-rw-r--r--www/hs-activehs/files/patch-Main.hs12
-rw-r--r--www/hs-activehs/files/patch-Parse.hs94
-rw-r--r--www/hs-activehs/files/patch-Qualify.hs76
-rw-r--r--www/hs-activehs/files/patch-QuickCheck.hs50
-rw-r--r--www/hs-activehs/files/patch-Simple.hs38
-rw-r--r--www/hs-activehs/files/patch-Specialize.hs55
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal77
-rw-r--r--www/hs-authenticate/Makefile2
-rw-r--r--www/hs-authenticate/distinfo5
-rw-r--r--www/hs-cgi/Makefile2
-rw-r--r--www/hs-cgi/distinfo5
-rw-r--r--www/hs-cookie/Makefile4
-rw-r--r--www/hs-cookie/distinfo5
-rw-r--r--www/hs-css-text/Makefile3
-rw-r--r--www/hs-css-text/distinfo5
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-fastcgi/distinfo1
-rw-r--r--www/hs-gitit/Makefile18
-rw-r--r--www/hs-gitit/distinfo5
-rw-r--r--www/hs-gitit/files/patch-gitit.cabal20
-rw-r--r--www/hs-hS3/Makefile1
-rw-r--r--www/hs-hS3/distinfo1
-rw-r--r--www/hs-happstack-server/Makefile2
-rw-r--r--www/hs-happstack-server/distinfo5
-rw-r--r--www/hs-happstack/Makefile2
-rw-r--r--www/hs-happstack/distinfo1
-rw-r--r--www/hs-heist/Makefile12
-rw-r--r--www/hs-heist/distinfo5
-rw-r--r--www/hs-heist/files/patch-heist.cabal29
-rw-r--r--www/hs-hjsmin/Makefile2
-rw-r--r--www/hs-hjsmin/distinfo5
-rw-r--r--www/hs-http-api-data/Makefile17
-rw-r--r--www/hs-http-api-data/distinfo3
-rw-r--r--www/hs-http-api-data/pkg-descr4
-rw-r--r--www/hs-http-client-tls/Makefile3
-rw-r--r--www/hs-http-client-tls/distinfo5
-rw-r--r--www/hs-http-client/Makefile2
-rw-r--r--www/hs-http-client/distinfo5
-rw-r--r--www/hs-http-conduit/Makefile7
-rw-r--r--www/hs-http-conduit/distinfo5
-rw-r--r--www/hs-http-date/Makefile1
-rw-r--r--www/hs-http-date/distinfo1
-rw-r--r--www/hs-http-reverse-proxy/Makefile2
-rw-r--r--www/hs-http-reverse-proxy/distinfo5
-rw-r--r--www/hs-http-server/Makefile1
-rw-r--r--www/hs-http-server/distinfo1
-rw-r--r--www/hs-http-types/Makefile2
-rw-r--r--www/hs-http-types/distinfo5
-rw-r--r--www/hs-http2/Makefile6
-rw-r--r--www/hs-http2/distinfo5
-rw-r--r--www/hs-http2/files/patch-http2.cabal28
-rw-r--r--www/hs-multipart/Makefile1
-rw-r--r--www/hs-multipart/distinfo1
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-oeis/distinfo5
-rw-r--r--www/hs-path-pieces/Makefile2
-rw-r--r--www/hs-path-pieces/distinfo5
-rw-r--r--www/hs-recaptcha/Makefile1
-rw-r--r--www/hs-recaptcha/distinfo1
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo5
-rw-r--r--www/hs-snap-core/Makefile15
-rw-r--r--www/hs-snap-core/distinfo5
-rw-r--r--www/hs-snap-core/files/patch-snap-core.cabal18
-rw-r--r--www/hs-snap-server/Makefile10
-rw-r--r--www/hs-snap-server/distinfo5
-rw-r--r--www/hs-snap-server/files/patch-snap-server.cabal10
-rw-r--r--www/hs-snap/Makefile18
-rw-r--r--www/hs-snap/distinfo5
-rw-r--r--www/hs-snap/files/patch-snap.cabal35
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-url/distinfo1
-rw-r--r--www/hs-wai-app-static/Makefile2
-rw-r--r--www/hs-wai-app-static/distinfo5
-rw-r--r--www/hs-wai-extra/Makefile14
-rw-r--r--www/hs-wai-extra/distinfo5
-rw-r--r--www/hs-wai-logger/Makefile7
-rw-r--r--www/hs-wai-logger/distinfo5
-rw-r--r--www/hs-wai/Makefile2
-rw-r--r--www/hs-wai/distinfo5
-rw-r--r--www/hs-wai/files/patch-wai.cabal10
-rw-r--r--www/hs-warp-tls/Makefile4
-rw-r--r--www/hs-warp-tls/distinfo5
-rw-r--r--www/hs-warp/Makefile2
-rw-r--r--www/hs-warp/distinfo5
-rw-r--r--www/hs-webkit/Makefile2
-rw-r--r--www/hs-webkit/distinfo5
-rw-r--r--www/hs-xss-sanitize/Makefile2
-rw-r--r--www/hs-xss-sanitize/distinfo5
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile2
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo5
-rw-r--r--www/hs-yesod-auth/Makefile2
-rw-r--r--www/hs-yesod-auth/distinfo5
-rw-r--r--www/hs-yesod-bin/Makefile8
-rw-r--r--www/hs-yesod-bin/distinfo5
-rw-r--r--www/hs-yesod-core/Makefile4
-rw-r--r--www/hs-yesod-core/distinfo5
-rw-r--r--www/hs-yesod-form/Makefile2
-rw-r--r--www/hs-yesod-form/distinfo5
-rw-r--r--www/hs-yesod-persistent/Makefile6
-rw-r--r--www/hs-yesod-persistent/distinfo5
-rw-r--r--www/hs-yesod-persistent/files/patch-yesod-persistent.cabal13
-rw-r--r--www/hs-yesod-static/Makefile2
-rw-r--r--www/hs-yesod-static/distinfo5
-rw-r--r--www/hs-yesod-test/Makefile4
-rw-r--r--www/hs-yesod-test/distinfo5
-rw-r--r--www/hs-yesod/Makefile2
-rw-r--r--www/hs-yesod/distinfo5
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile2
-rw-r--r--x11-toolkits/hs-GLURaw/distinfo5
-rw-r--r--x11-toolkits/hs-GLUT/Makefile3
-rw-r--r--x11-toolkits/hs-GLUT/distinfo5
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo5
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile4
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo5
-rw-r--r--x11-toolkits/hs-gtk/Makefile2
-rw-r--r--x11-toolkits/hs-gtk/distinfo5
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/distinfo5
-rw-r--r--x11-toolkits/hs-pango/Makefile2
-rw-r--r--x11-toolkits/hs-pango/distinfo5
-rw-r--r--x11-toolkits/hs-vte/Makefile2
-rw-r--r--x11-toolkits/hs-vte/distinfo5
-rw-r--r--x11-toolkits/hs-wx/Makefile2
-rw-r--r--x11-toolkits/hs-wx/distinfo5
-rw-r--r--x11-toolkits/hs-wxc/Makefile8
-rw-r--r--x11-toolkits/hs-wxc/distinfo5
-rw-r--r--x11-toolkits/hs-wxc/files/patch-Setup.hs33
-rw-r--r--x11-toolkits/hs-wxc/files/patch-wxc.cabal11
-rw-r--r--x11-toolkits/hs-wxcore/Makefile4
-rw-r--r--x11-toolkits/hs-wxcore/distinfo5
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-Setup.hs14
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile2
-rw-r--r--x11-toolkits/hs-wxdirect/distinfo5
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal13
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile3
-rw-r--r--x11-wm/hs-xmonad/Makefile3
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11-xft/distinfo1
-rw-r--r--x11/hs-X11/Makefile1
-rw-r--r--x11/hs-xmobar/Makefile2
-rw-r--r--x11/hs-xmobar/distinfo6
1277 files changed, 5705 insertions, 2906 deletions
diff --git a/MOVED b/MOVED
index a1388c295cdb..c1b5ec8c6db0 100644
--- a/MOVED
+++ b/MOVED
@@ -9497,3 +9497,8 @@ security/greenbone-security-assistant|security/greenbone-security-assistant8|201
sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project
mail/dovecot2|mail/dovecot|2017-08-07|Renamed to mail/dovecot
mail/dovecot2-pigeonhole|mail/dovecot-pigeonhole|2017-08-07|Renamed to mail/dovecot-pigeonhole
+devel/hs-MonadCatchIO-mtl||2017-08-08|Deprecated in favor of the exceptions package
+devel/hs-MonadCatchIO-transformers||2017-08-08|Deprecated in favor of the exceptions package
+devel/hs-directory||2017-08-08|Part of the bundled packages in ghc
+devel/hs-syb-with-class-instances-text||2017-08-08|Upstream is unmaintained
+textproc/hs-citeproc-hs||2017-08-08|Upstream is unmaintained, use pandoc-citeproc instead
diff --git a/Mk/Scripts/check_leftovers.sh b/Mk/Scripts/check_leftovers.sh
index 3233e23f25e4..c7d00121006e 100644
--- a/Mk/Scripts/check_leftovers.sh
+++ b/Mk/Scripts/check_leftovers.sh
@@ -150,6 +150,12 @@ while read modtype path extra; do
# xmlcatmgr is constantly updating catalog.ports ignore
# modification to that file
share/xml/catalog.ports) ;;
+ # Ignore ghc's doc index
+ share/doc/ghc-%%GHC_VERSION%%/*) ;;
+ share/doc/ghc-%%GHC_VERSION%%/html/libraries/%%PORTNAME%%-%%PORTVERSION%%/html) ;;
+ # Ignore ghc's package conf
+ lib/ghc-%%GHC_VERSION%%/package.conf.d/*) ;;
+ lib/ghc-%%GHC_VERSION%%/package.conf.d/%%PORTNAME%%-%%PORTVERSION%%.conf) ;;
# Ignore common system config files
/etc/group|\
/etc/make.conf|\
diff --git a/UPDATING b/UPDATING
index 89d78de2a850..fc595b1f36ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,31 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170808:
+ AFFECTS: users of lang/ghc and */hs-*
+ AUTHOR: haskell@FreeBSD.org
+
+ The Glorious Glasgow Haskell Compiler has been updated to version
+ 8.0.2. Hence it is recommended to rebuild or reinstall all the
+ dependent ports and the lang/ghc port itself in one of the following
+ ways:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+
+ In case of pkg(8), it is probably safer to remove all the GHC-dependent
+ packages along with GHC and reinstall everything from scratch. For
+ example:
+
+ # pkg query "%ro" ghc > ghc-pkgs.txt
+ # pkg delete -y lang/ghc
+
+ In ghc-pkgs.txt, check and remove all the packages that have been moved
+ on the update, then use this command:
+
+ # pkg install -y `cat ghc-pkgs.txt`
+
20170807:
AFFECTS: users of mail/dovecot2 and mail/dovecot2-pigeonhole
AUTHOR: adamw@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index fffe7ba16007..195de84e0b24 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tar
-PORTVERSION= 0.4.2.1
+PORTVERSION= 0.5.0.3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo
index 49518ad3b8ba..9ac9e98c54a1 100644
--- a/archivers/hs-tar/distinfo
+++ b/archivers/hs-tar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tar-0.4.2.1.tar.gz) = 2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080
-SIZE (cabal/tar-0.4.2.1.tar.gz) = 29825
+TIMESTAMP = 1499611841
+SHA256 (cabal/tar-0.5.0.3.tar.gz) = d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3
+SIZE (cabal/tar-0.5.0.3.tar.gz) = 38764
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 45898063e42d..518bbad51621 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.2.3.7
+PORTVERSION= 0.3.1.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 8631b49fbfcc..07ec19cd0301 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/zip-archive-0.2.3.7.tar.gz) = 41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699
-SIZE (cabal/zip-archive-0.2.3.7.tar.gz) = 12902
+TIMESTAMP = 1499611845
+SHA256 (cabal/zip-archive-0.3.1.1.tar.gz) = 9e868e649e6fd06cf50c2f0f1e480ce36640494449e415abf2509f9347f08325
+SIZE (cabal/zip-archive-0.3.1.1.tar.gz) = 16107
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 7f54a488e3e9..70d4e7fa5a47 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.1.5
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index cf394a4c09ce..7fa838abfc22 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal b/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal
new file mode 100644
index 000000000000..3ea88a3a86c2
--- /dev/null
+++ b/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal
@@ -0,0 +1,44 @@
+--- zlib-enum.cabal.orig 2017-07-09 15:22:07 UTC
++++ zlib-enum.cabal
+@@ -14,40 +14,14 @@ build-type: Simple
+ homepage: http://github.com/maltem/zlib-enum
+
+ -------------------------------------------------------------------------------
+-flag test
+- description: Build the test executable.
+- default: False
+-
+--------------------------------------------------------------------------------
+ library
+- if flag(test)
+- Buildable: False
+ build-depends: base >= 4 && < 5
+ , bytestring >= 0.9 && < 0.11
+- , transformers >= 0.2 && < 0.5
++ , transformers >= 0.2 && < 0.6
+ , enumerator == 0.4.*
+ , zlib-bindings == 0.1.*
+ exposed-modules: Codec.Zlib.Enum
+ ghc-options: -Wall
+-
+--------------------------------------------------------------------------------
+-executable zlib-enum-test
+- main-is: test.hs
+- if flag(test)
+- Buildable: True
+- build-depends:
+- base >= 4.0 && < 5.0
+- , bytestring >= 0.9 && < 0.11
+- , transformers >= 0.2 && < 0.5
+- , enumerator >= 0.4 && < 0.5
+- , zlib-bindings >= 0.1
+- , test-framework >= 0.6 && < 0.7
+- , test-framework-quickcheck2 >= 0.2.12.1 && < 0.3.0
+- , QuickCheck >= 2.4 && < 2.5
+- else
+- Buildable: False
+- ghc-options: -Wall
+-
+ -------------------------------------------------------------------------------
+ source-repository head
+ type: git
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 0f5fa62b93f3..84348d68b577 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= zlib
-PORTVERSION= 0.5.4.2
+PORTVERSION= 0.6.1.2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index 12c07cf5af21..d1cc5d2620fb 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/zlib-0.5.4.2.tar.gz) = 75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096
-SIZE (cabal/zlib-0.5.4.2.tar.gz) = 127818
+TIMESTAMP = 1499611868
+SHA256 (cabal/zlib-0.6.1.2.tar.gz) = e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb
+SIZE (cabal/zlib-0.6.1.2.tar.gz) = 142413
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 6f600f16d8af..bb7e0001c131 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ALUT
-PORTVERSION= 2.4.0.0
-PORTREVISION= 1
+PORTVERSION= 2.4.0.2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/distinfo b/audio/hs-ALUT/distinfo
index 7c1b34161100..2e6cad4ceab1 100644
--- a/audio/hs-ALUT/distinfo
+++ b/audio/hs-ALUT/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ALUT-2.4.0.0.tar.gz) = 0f5cf9362ace34a9739cd3a45015782a0102015e62c8dd8e290d7952e6ff193d
-SIZE (cabal/ALUT-2.4.0.0.tar.gz) = 26075
+TIMESTAMP = 1499612631
+SHA256 (cabal/ALUT-2.4.0.2.tar.gz) = b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87
+SIZE (cabal/ALUT-2.4.0.2.tar.gz) = 26231
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 241725d1d8f3..3b31e7e0178a 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= OpenAL
-PORTVERSION= 1.7.0.0
+PORTVERSION= 1.7.0.4
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/distinfo b/audio/hs-OpenAL/distinfo
index 84422e2299f3..7527203781c2 100644
--- a/audio/hs-OpenAL/distinfo
+++ b/audio/hs-OpenAL/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/OpenAL-1.7.0.0.tar.gz) = 5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984
-SIZE (cabal/OpenAL-1.7.0.0.tar.gz) = 41297
+TIMESTAMP = 1499612648
+SHA256 (cabal/OpenAL-1.7.0.4.tar.gz) = 3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118
+SIZE (cabal/OpenAL-1.7.0.4.tar.gz) = 40801
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index cb3d2696a994..8dd1a1713047 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.9.0.2
+PORTVERSION= 0.9.0.6
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 65d5291ebf97..6a36eac296bd 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/libmpd-0.9.0.2.tar.gz) = 5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0
-SIZE (cabal/libmpd-0.9.0.2.tar.gz) = 38392
+TIMESTAMP = 1499538914
+SHA256 (cabal/libmpd-0.9.0.6.tar.gz) = bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937
+SIZE (cabal/libmpd-0.9.0.6.tar.gz) = 38707
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 589010d47ed6..78affc26a4ab 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 1.1.0.0
+PORTVERSION= 1.2.1.0
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,15 +10,17 @@ COMMENT= Robust, reliable performance measurement and analysis
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.8 ansi-wl-pprint>=0.6.7.2 cassava>=0.3.0.0 \
- Glob>=0.7.2 hastache>=0.6.0 mtl>=2 mwc-random>=0.8.0.3 \
- optparse-applicative>=0.11 parsec>=3.1.0 statistics>=0.13.2.1 \
- text>=0.11 vector>=0.7.1 vector-algorithms>=0.4
+USE_CABAL= aeson ansi-wl-pprint base-compat cassava code-page \
+ exceptions Glob js-flot js-jquery microstache mtl mwc-random \
+ optparse-applicative parsec statistics text transformers-compat \
+ vector vector-algorithms
INSTALL_PORTEXAMPLES= \
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
+EXECUTABLE= criterion-report
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index dc7ddf9dec48..c6ecf2f20f28 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/criterion-1.1.0.0.tar.gz) = 5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38
-SIZE (cabal/criterion-1.1.0.0.tar.gz) = 1004534
+TIMESTAMP = 1499613825
+SHA256 (cabal/criterion-1.2.1.0.tar.gz) = d9f4bb88a8762f91ce305896cd7e964d25f007949f7e05514503eec59ca97041
+SIZE (cabal/criterion-1.2.1.0.tar.gz) = 126663
diff --git a/converters/Makefile b/converters/Makefile
index 634aa96aec10..917228318d73 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -33,6 +33,7 @@
SUBDIR += gbase
SUBDIR += gbsdconv
SUBDIR += hs-aeson
+ SUBDIR += hs-aeson-compat
SUBDIR += hs-aeson-pretty
SUBDIR += hs-dataenc
SUBDIR += hs-json
diff --git a/converters/hs-aeson-compat/Makefile b/converters/hs-aeson-compat/Makefile
new file mode 100644
index 000000000000..4dda8e90408e
--- /dev/null
+++ b/converters/hs-aeson-compat/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= aeson-compat
+PORTVERSION= 0.3.7
+CATEGORIES= converters haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast JSON parsing and encoding
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson attoparsec attoparsec-iso8601 base-compat exceptions \
+ hashable scientific semigroups tagged text time-locale-compat \
+ unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-aeson-compat/distinfo b/converters/hs-aeson-compat/distinfo
new file mode 100644
index 000000000000..e22062605592
--- /dev/null
+++ b/converters/hs-aeson-compat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499691052
+SHA256 (cabal/aeson-compat-0.3.7.tar.gz) = 1bf2c2a3d38caba5d3336757f60702afb5dcac6a77aa3d86c9d55f81e4517c14
+SIZE (cabal/aeson-compat-0.3.7.tar.gz) = 6900
diff --git a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
new file mode 100644
index 000000000000..8b11ebe2fea3
--- /dev/null
+++ b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
@@ -0,0 +1,18 @@
+--- aeson-compat.cabal.orig 2017-06-07 12:52:36 UTC
++++ aeson-compat.cabal
+@@ -42,7 +42,6 @@ library
+ , containers >=0.5 && <0.6
+ , exceptions >=0.8 && <0.9
+ , hashable >=1.2 && <1.3
+- , nats >=1 && <1.2
+ , scientific >=0.3 && <0.4
+ , text >=1.2 && <1.3
+ , time >=1.4.2 && <1.9
+@@ -70,7 +69,6 @@ test-suite aeson-compat-test
+ , containers
+ , exceptions
+ , hashable
+- , nats
+ , scientific
+ , text
+ , time
diff --git a/converters/hs-aeson-compat/pkg-descr b/converters/hs-aeson-compat/pkg-descr
new file mode 100644
index 000000000000..e63d60d4528a
--- /dev/null
+++ b/converters/hs-aeson-compat/pkg-descr
@@ -0,0 +1,3 @@
+Compatibility layer for aeson
+
+WWW: https://hackage.haskell.org/package/aeson-compat
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
index 77e6a9b0141a..ef644e2833f9 100644
--- a/converters/hs-aeson-pretty/Makefile
+++ b/converters/hs-aeson-pretty/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aeson-pretty
-PORTVERSION= 0.7.2
+PORTVERSION= 0.8.5
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,10 @@ COMMENT= JSON pretty-printing library and command-line tool
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.7 attoparsec>=0.10 cmdargs>=0.7 text>=0.11 \
- unordered-containers>=0.1.3.0 vector>=0.9
+USE_CABAL= aeson attoparsec base-compat cmdargs scientific text \
+ unordered-containers vector
+FLAGS_DISABLE= lib-only
EXECUTABLE= aeson-pretty
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo
index 21548d0679b1..1ee8ffeee3c1 100644
--- a/converters/hs-aeson-pretty/distinfo
+++ b/converters/hs-aeson-pretty/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/aeson-pretty-0.7.2.tar.gz) = 6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d
-SIZE (cabal/aeson-pretty-0.7.2.tar.gz) = 4838
+TIMESTAMP = 1499545723
+SHA256 (cabal/aeson-pretty-0.8.5.tar.gz) = dd17e86c64b3fe2efb7a855b27b0e5490e42dc58194ae1809d8b662d4e42a9f9
+SIZE (cabal/aeson-pretty-0.8.5.tar.gz) = 5568
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 8cd0e7c8c45c..f5b77570373b 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 0.8.0.2
+PORTVERSION= 1.2.1.0
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Fast JSON parsing and encoding
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.11.3.4 dlist>=0.2 hashable>=1.1.2.0 mtl \
- old-locale scientific>=0.3.1 syb text>=1.1.1.0 \
- unordered-containers>=0.2.3.0 vector>=0.7.1
+USE_CABAL= attoparsec>=0.13.0.1 base-compat>=0.9.1 dlist>=0.6 hashable>=1.1.2.0 \
+ scientific>=0.3.1 syb tagged text>=1.1.1.0 time-locale-compat>=0.1.1 \
+ unordered-containers>=0.2.3.0 uuid-types>=1.0.3 vector>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index 5d67e7c53185..5de020c43d3c 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/aeson-0.8.0.2.tar.gz) = 0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5
-SIZE (cabal/aeson-0.8.0.2.tar.gz) = 143850
+TIMESTAMP = 1499459814
+SHA256 (cabal/aeson-1.2.1.0.tar.gz) = 96170fdbed9bf52357bd6eada0173c4ae8086df01522ed2b8a070f2f51148a73
+SIZE (cabal/aeson-1.2.1.0.tar.gz) = 272206
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index c5129650ef0b..4ff865b1cdea 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/files/patch-dataenc.cabal b/converters/hs-dataenc/files/patch-dataenc.cabal
index cc9b9c0d34ab..68be7dfcc6a7 100644
--- a/converters/hs-dataenc/files/patch-dataenc.cabal
+++ b/converters/hs-dataenc/files/patch-dataenc.cabal
@@ -1,11 +1,11 @@
---- dataenc.cabal.orig 2014-04-22 18:38:41 UTC
+--- dataenc.cabal.orig 2017-07-07 17:18:23 UTC
+++ dataenc.cabal
@@ -21,7 +21,7 @@ flag tests
library
hs-source-dirs: src
- build-depends: array, base >= 3.0.0 && < 4.8, containers
-+ build-depends: array, base >= 3.0.0 && < 4.9, containers
++ build-depends: array, base >= 3.0.0 && < 5, containers
exposed-modules:
Codec.Binary.Base16
Codec.Binary.Base32
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 96c8e3493f38..e4d4fb6f247e 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,6 +3,7 @@
PORTNAME= json
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Support for serialising Haskell to and from JSON
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl parsec syb>=0.3.3 text
+USE_CABAL= mtl parsec syb text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
index 258cf2014640..e95f7c3bdc0d 100644
--- a/converters/hs-sandi/Makefile
+++ b/converters/hs-sandi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sandi
-PORTVERSION= 0.3.5
+PORTVERSION= 0.4.0
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Data encoding library
LICENSE= BSD3CLAUSE
-USE_CABAL= conduit exceptions>=0.6
+USE_CABAL= conduit exceptions stringsearch
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
index a49a5d2b4ed8..d21da2d3c0c8 100644
--- a/converters/hs-sandi/distinfo
+++ b/converters/hs-sandi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/sandi-0.3.5.tar.gz) = 856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5
-SIZE (cabal/sandi-0.3.5.tar.gz) = 18700
+TIMESTAMP = 1499619802
+SHA256 (cabal/sandi-0.4.0.tar.gz) = 40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea
+SIZE (cabal/sandi-0.4.0.tar.gz) = 19319
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
index e2283ef17948..86407ac19b2f 100644
--- a/databases/hs-esqueleto/Makefile
+++ b/databases/hs-esqueleto/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= esqueleto
-PORTVERSION= 2.4.1
+PORTVERSION= 2.5.3
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Type-safe EDSL for SQL queries on persistent backends
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-html conduit>=1.1 monad-logger persistent>=2.1.1.7 \
- resourcet>=1.1 tagged>=0.2 text>=0.11 unordered-containers>=0.2
+USE_CABAL= blaze-html conduit monad-logger persistent \
+ resourcet tagged text unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-esqueleto/distinfo b/databases/hs-esqueleto/distinfo
index ef71a71d1a91..c40bdd28fc6a 100644
--- a/databases/hs-esqueleto/distinfo
+++ b/databases/hs-esqueleto/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/esqueleto-2.4.1.tar.gz) = 12cc83bd2774906c29df20be8b77d11e0fc6efedadf208714494dc406cd8f7fd
-SIZE (cabal/esqueleto-2.4.1.tar.gz) = 39113
+TIMESTAMP = 1499619928
+SHA256 (cabal/esqueleto-2.5.3.tar.gz) = 3d997551fe9e42b39b5eb8215d5daf4c59e33d55da5bc9eff193ae8a7f4ec482
+SIZE (cabal/esqueleto-2.5.3.tar.gz) = 40259
diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile
index cd043fd6242e..7c8b4f5ece67 100644
--- a/databases/hs-hedis/Makefile
+++ b/databases/hs-hedis/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hedis
-PORTVERSION= 0.6.9
+PORTVERSION= 0.9.8
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT= Client library for the Redis datastore
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.12 BoundedChan>=1.0 bytestring-lexing>=0.5 \
- mtl>=2 network>=2 resource-pool>=0.2 vector>=0.9
+USE_CABAL= async bytestring-lexing mtl network resource-pool scanner stm \
+ text unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-hedis/distinfo b/databases/hs-hedis/distinfo
index 07042c46f016..45ae6d783f31 100644
--- a/databases/hs-hedis/distinfo
+++ b/databases/hs-hedis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hedis-0.6.9.tar.gz) = ead8c36dcb7093be9e414da900e2b6fa2f4bc8723a3a5346020d316c75e79179
-SIZE (cabal/hedis-0.6.9.tar.gz) = 27140
+TIMESTAMP = 1499619995
+SHA256 (cabal/hedis-0.9.8.tar.gz) = 822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62
+SIZE (cabal/hedis-0.9.8.tar.gz) = 40058
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index f26a3249b529..26bfc6400b69 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTVERSION= 0.1.1.8
+PORTVERSION= 0.1.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo
index 7fdc00902e05..9df0cddfc532 100644
--- a/databases/hs-mysql/distinfo
+++ b/databases/hs-mysql/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mysql-0.1.1.8.tar.gz) = 90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84
-SIZE (cabal/mysql-0.1.1.8.tar.gz) = 14092
+TIMESTAMP = 1499450806
+SHA256 (cabal/mysql-0.1.4.tar.gz) = 9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e
+SIZE (cabal/mysql-0.1.4.tar.gz) = 16219
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index b13fb2fdcee8..1f54d0f1cf5a 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 2.2
+PORTVERSION= 2.6.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
-USE_CABAL= aeson>=0.6.2 conduit>=0.5.3 monad-control>=0.2 \
- monad-logger>=0.2.4 persistent>=2.2 resourcet>=1.1 \
- text>=0.7
+USE_CABAL= aeson conduit microlens-th monad-control monad-logger \
+ old-locale persistent resource-pool resourcet text \
+ unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 362c952802bc..18e946c2798a 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-sqlite-2.2.tar.gz) = f11005a23df9ad0740111e675aab42f40eda7e37f4996ebae15e1fe48692c794
-SIZE (cabal/persistent-sqlite-2.2.tar.gz) = 1460775
+TIMESTAMP = 1499620122
+SHA256 (cabal/persistent-sqlite-2.6.2.tar.gz) = 6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf
+SIZE (cabal/persistent-sqlite-2.6.2.tar.gz) = 3568400
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 3bb0f65abebc..2527c2d3ed3d 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 2.1.3.4
+PORTVERSION= 2.5.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson>=0.7 monad-control>=0.2 monad-logger path-pieces \
- persistent>=2.1.3 tagged text>=0.5 unordered-containers
+USE_CABAL= aeson aeson-compat http-api-data monad-control monad-logger \
+ path-pieces persistent tagged text unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 69211f2d05a3..351c8ead4fb0 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-template-2.1.3.4.tar.gz) = 4f28c9ef478e3835de5bc0105907582b2e0229cecc84ffa895c67c1a59ae2172
-SIZE (cabal/persistent-template-2.1.3.4.tar.gz) = 19084
+TIMESTAMP = 1499620138
+SHA256 (cabal/persistent-template-2.5.2.tar.gz) = de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011
+SIZE (cabal/persistent-template-2.5.2.tar.gz) = 20403
diff --git a/databases/hs-persistent-template/files/patch-persistent-template.cabal b/databases/hs-persistent-template/files/patch-persistent-template.cabal
new file mode 100644
index 000000000000..9d1b31b66c25
--- /dev/null
+++ b/databases/hs-persistent-template/files/patch-persistent-template.cabal
@@ -0,0 +1,11 @@
+--- persistent-template.cabal.orig 2017-07-10 13:31:32 UTC
++++ persistent-template.cabal
+@@ -23,7 +23,7 @@ library
+ , text >= 0.5
+ , transformers >= 0.2 && < 0.6
+ , containers
+- , aeson >= 0.7 && < 1.2
++ , aeson >= 0.7 && < 1.3
+ , aeson-compat >= 0.3.2.0 && < 0.4
+ , monad-logger
+ , unordered-containers
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 0df540ba667b..030f629d830b 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 2.2
+PORTVERSION= 2.7.0
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \
- fast-logger>=2.1 lifted-base>=0.1 monad-control>=0.3 \
- monad-logger>=0.3 mtl path-pieces>=0.1 resource-pool \
+ fast-logger>=2.1 http-api-data lifted-base>=0.1 monad-control>=0.3 \
+ monad-logger>=0.3 mtl old-locale path-pieces>=0.1 resource-pool \
resourcet>=1.1 scientific silently tagged text>=0.8 \
transformers-base unordered-containers vector
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index d76c723c69a4..2f8e6adf207d 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-2.2.tar.gz) = 174047d7f140571081459713fbdeeabbd4a52bbc02dbf35969a0daec491a8512
-SIZE (cabal/persistent-2.2.tar.gz) = 43419
+TIMESTAMP = 1499620101
+SHA256 (cabal/persistent-2.7.0.tar.gz) = cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea
+SIZE (cabal/persistent-2.7.0.tar.gz) = 69320
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 6216f5592ce3..bac6937328e3 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -114,6 +114,7 @@
SUBDIR += horde-nag
SUBDIR += hot-babe
SUBDIR += howm
+ SUBDIR += hs-fdo-notify
SUBDIR += ical
SUBDIR += ithought
SUBDIR += jjclient
diff --git a/deskutils/hs-fdo-notify/Makefile b/deskutils/hs-fdo-notify/Makefile
new file mode 100644
index 000000000000..6371020f6eb3
--- /dev/null
+++ b/deskutils/hs-fdo-notify/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= fdo-notify
+PORTVERSION= 0.3.1
+CATEGORIES= deskutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Desktop Notifications client
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= dbus
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/deskutils/hs-fdo-notify/distinfo b/deskutils/hs-fdo-notify/distinfo
new file mode 100644
index 000000000000..7550fabf49e9
--- /dev/null
+++ b/deskutils/hs-fdo-notify/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501336223
+SHA256 (cabal/fdo-notify-0.3.1.tar.gz) = 7083414bb25e3057f6444722288cebf4ad3e4c2616f95f26079c8c7762989fd8
+SIZE (cabal/fdo-notify-0.3.1.tar.gz) = 4882
diff --git a/deskutils/hs-fdo-notify/pkg-descr b/deskutils/hs-fdo-notify/pkg-descr
new file mode 100644
index 000000000000..b8766c4c6390
--- /dev/null
+++ b/deskutils/hs-fdo-notify/pkg-descr
@@ -0,0 +1,7 @@
+A library for issuing notifications using FreeDesktop.org's Desktop
+Notifications protcol. This protocol is supported by services such
+as Ubuntu's NotifyOSD.
+
+WWW: http://bitbucket.org/taejo/fdo-notify/
+
+
diff --git a/devel/Makefile b/devel/Makefile
index 69242f6aa5da..5778b3b82145 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -889,16 +889,18 @@
SUBDIR += hs-BoundedChan
SUBDIR += hs-ConfigFile
SUBDIR += hs-DrIFT
+ SUBDIR += hs-EdisonAPI
+ SUBDIR += hs-EdisonCore
SUBDIR += hs-Glob
SUBDIR += hs-HUnit
SUBDIR += hs-IfElse
SUBDIR += hs-List
+ SUBDIR += hs-ListLike
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
- SUBDIR += hs-MonadCatchIO-mtl
- SUBDIR += hs-MonadCatchIO-transformers
SUBDIR += hs-MonadRandom
SUBDIR += hs-ObjectName
+ SUBDIR += hs-Only
SUBDIR += hs-PSQueue
SUBDIR += hs-QuickCheck
SUBDIR += hs-ReadArgs
@@ -922,6 +924,7 @@
SUBDIR += hs-async
SUBDIR += hs-atomic-primops
SUBDIR += hs-auto-update
+ SUBDIR += hs-base-compat
SUBDIR += hs-base-orphans
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
@@ -943,12 +946,17 @@
SUBDIR += hs-bytestring-show
SUBDIR += hs-c2hs
SUBDIR += hs-cabal-install
+ SUBDIR += hs-call-stack
SUBDIR += hs-cereal
SUBDIR += hs-checkers
SUBDIR += hs-chunked-data
SUBDIR += hs-classy-prelude
SUBDIR += hs-classy-prelude-conduit
+ SUBDIR += hs-clock
SUBDIR += hs-cmdargs
+ SUBDIR += hs-code-page
+ SUBDIR += hs-colour
+ SUBDIR += hs-concurrent-output
SUBDIR += hs-conduit
SUBDIR += hs-conduit-combinators
SUBDIR += hs-conduit-extra
@@ -963,13 +971,14 @@
SUBDIR += hs-data-default-instances-containers
SUBDIR += hs-data-default-instances-dlist
SUBDIR += hs-data-default-instances-old-locale
+ SUBDIR += hs-data-endian
SUBDIR += hs-data-hash
SUBDIR += hs-data-ordlist
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
+ SUBDIR += hs-dbus
SUBDIR += hs-deepseq-generics
- SUBDIR += hs-directory
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
SUBDIR += hs-dlist-instances
@@ -988,6 +997,8 @@
SUBDIR += hs-file-embed
SUBDIR += hs-filemanip
SUBDIR += hs-filestore
+ SUBDIR += hs-fmlist
+ SUBDIR += hs-foundation
SUBDIR += hs-free
SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
@@ -998,6 +1009,7 @@
SUBDIR += hs-ghc-paths
SUBDIR += hs-gio
SUBDIR += hs-git-annex
+ SUBDIR += hs-gitrev
SUBDIR += hs-glib
SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
@@ -1007,6 +1019,7 @@
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
SUBDIR += hs-hashtables
+ SUBDIR += hs-haskell-lexer
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
SUBDIR += hs-hasktags
@@ -1025,6 +1038,8 @@
SUBDIR += hs-hspec-core
SUBDIR += hs-hspec-discover
SUBDIR += hs-hspec-expectations
+ SUBDIR += hs-iostreams
+ SUBDIR += hs-iostreams-haproxy
SUBDIR += hs-js-flot
SUBDIR += hs-js-jquery
SUBDIR += hs-keys
@@ -1039,6 +1054,9 @@
SUBDIR += hs-logict
SUBDIR += hs-map-syntax
SUBDIR += hs-memory
+ SUBDIR += hs-microlens
+ SUBDIR += hs-microlens-th
+ SUBDIR += hs-microstache
SUBDIR += hs-mmap
SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
@@ -1046,12 +1064,16 @@
SUBDIR += hs-monad-loops
SUBDIR += hs-monad-par
SUBDIR += hs-monad-par-extras
+ SUBDIR += hs-monad-unlift
+ SUBDIR += hs-monadplus
SUBDIR += hs-monads-tf
SUBDIR += hs-mono-traversable
+ SUBDIR += hs-mono-traversable-instances
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
SUBDIR += hs-mutable-containers
+ SUBDIR += hs-newtype-generics
SUBDIR += hs-ncurses
SUBDIR += hs-newtype
SUBDIR += hs-old-locale
@@ -1063,15 +1085,21 @@
SUBDIR += hs-preprocessor-tools
SUBDIR += hs-prettyclass
SUBDIR += hs-primitive
+ SUBDIR += hs-process-extras
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
+ SUBDIR += hs-psqueues
SUBDIR += hs-quickcheck-io
SUBDIR += hs-random
+ SUBDIR += hs-readable
SUBDIR += hs-readline
+ SUBDIR += hs-refact
SUBDIR += hs-reflection
SUBDIR += hs-resource-pool
SUBDIR += hs-resourcet
SUBDIR += hs-safe
+ SUBDIR += hs-safe-exceptions
+ SUBDIR += hs-say
SUBDIR += hs-scientific
SUBDIR += hs-securemem
SUBDIR += hs-setenv
@@ -1088,17 +1116,21 @@
SUBDIR += hs-strict
SUBDIR += hs-syb
SUBDIR += hs-syb-with-class
- SUBDIR += hs-syb-with-class-instances-text
SUBDIR += hs-system-fileio
SUBDIR += hs-system-filepath
SUBDIR += hs-tagged
SUBDIR += hs-temporary
+ SUBDIR += hs-terminal-size
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
SUBDIR += hs-text
SUBDIR += hs-text-icu
+ SUBDIR += hs-text-short
SUBDIR += hs-tf-random
+ SUBDIR += hs-th-abstraction
+ SUBDIR += hs-th-lift
+ SUBDIR += hs-th-lift-instances
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
@@ -1107,7 +1139,9 @@
SUBDIR += hs-timezone-series
SUBDIR += hs-transformers-base
SUBDIR += hs-transformers-compat
+ SUBDIR += hs-typed-process
SUBDIR += hs-unamb
+ SUBDIR += hs-unexceptionalio
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
SUBDIR += hs-unix-time
@@ -1128,6 +1162,7 @@
SUBDIR += hs-vector-instances
SUBDIR += hs-vector-th-unbox
SUBDIR += hs-void
+ SUBDIR += hs-wl-pprint-text
SUBDIR += hs-word8
SUBDIR += htable
SUBDIR += hub
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 84eafee9333a..7b442f52bfe8 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= BNFC
-PORTVERSION= 2.8
+PORTVERSION= 2.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index b8879a264d2b..2ef77ad5a36d 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/BNFC-2.8.tar.gz) = 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34
-SIZE (cabal/BNFC-2.8.tar.gz) = 183591
+TIMESTAMP = 1499627811
+SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920
+SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 7ec21fea8b64..8e98e83311de 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.2.3
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index 1e079675c174..c378fc89b008 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Boolean-0.2.3.tar.gz) = f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3
-SIZE (cabal/Boolean-0.2.3.tar.gz) = 6608
+TIMESTAMP = 1499627811
+SHA256 (cabal/Boolean-0.2.4.tar.gz) = 67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8
+SIZE (cabal/Boolean-0.2.4.tar.gz) = 6634
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index c8119ab585fb..5a155f970635 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BoundedChan/distinfo b/devel/hs-BoundedChan/distinfo
index 1c925cc39a3d..83dce08f57aa 100644
--- a/devel/hs-BoundedChan/distinfo
+++ b/devel/hs-BoundedChan/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627811
SHA256 (cabal/BoundedChan-1.0.3.0.tar.gz) = 531ceaed7f62844c2a63a7cbfdcab332ea5eaa218e9922ca3305580438adc46d
SIZE (cabal/BoundedChan-1.0.3.0.tar.gz) = 3591
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 4c6a953287ff..00c596cbacf0 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index e680782c4d10..182b274e7f00 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
SHA256 (cabal/ConfigFile-1.1.4.tar.gz) = ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514
SIZE (cabal/ConfigFile-1.1.4.tar.gz) = 28969
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-DrIFT/Makefile
index d95e146dd200..c89e13532287 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-DrIFT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DrIFT
PORTVERSION= 2.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo
index ba543f98badf..bfedcf3f127c 100644
--- a/devel/hs-DrIFT/distinfo
+++ b/devel/hs-DrIFT/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0
SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676
diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile
new file mode 100644
index 000000000000..c17c2f457a0a
--- /dev/null
+++ b/devel/hs-EdisonAPI/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= EdisonAPI
+PORTVERSION= 1.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A library of efficient, purely-functional data structures (API)
+
+LICENSE= MIT
+
+USE_CABAL= mtl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonAPI/distinfo b/devel/hs-EdisonAPI/distinfo
new file mode 100644
index 000000000000..c3562b5b71c7
--- /dev/null
+++ b/devel/hs-EdisonAPI/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996490
+SHA256 (cabal/EdisonAPI-1.3.1.tar.gz) = 95a3b8d01599520a50456219b5a2e9f7832bcddaaeb8e94ce777bd87a4a6b56e
+SIZE (cabal/EdisonAPI-1.3.1.tar.gz) = 30512
diff --git a/devel/hs-EdisonAPI/pkg-descr b/devel/hs-EdisonAPI/pkg-descr
new file mode 100644
index 000000000000..e83fa3d6151d
--- /dev/null
+++ b/devel/hs-EdisonAPI/pkg-descr
@@ -0,0 +1,11 @@
+Edison is a library of purely functional data structures written by Chris
+Okasaki. It is named after Thomas Alva Edison and for the mnemonic value
+EDiSon (Efficient Data Structures). Edison provides several families of
+abstractions, each with multiple implementations. The main abstractions
+provided by Edison are: Sequences such as stacks, queues, and dequeues;
+Collections such as sets, bags and heaps; and Associative Collections such
+as finite maps and priority queues where the priority and element are
+distinct.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile
new file mode 100644
index 000000000000..c3b5618ffc27
--- /dev/null
+++ b/devel/hs-EdisonCore/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= EdisonCore
+PORTVERSION= 1.3.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A library of efficent, purely-functional data structures (Core Implementations)
+
+USE_CABAL= EdisonAPI mtl QuickCheck
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonCore/distinfo b/devel/hs-EdisonCore/distinfo
new file mode 100644
index 000000000000..539ff6b5ab70
--- /dev/null
+++ b/devel/hs-EdisonCore/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996696
+SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b
+SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699
diff --git a/devel/hs-EdisonCore/pkg-descr b/devel/hs-EdisonCore/pkg-descr
new file mode 100644
index 000000000000..1cb6cdaded6e
--- /dev/null
+++ b/devel/hs-EdisonCore/pkg-descr
@@ -0,0 +1,7 @@
+This package provides the core Edison data structure implementations,
+including multiple sequence, set, bag, and finite map concrete implementations
+with various performance characteristics. The implementations in this package
+have no dependencies other than those commonly bundled with Haskell compilers.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index 9897d6cf1463..67d65b16d356 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Glob
-PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTVERSION= 0.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Globbing library
LICENSE= BSD3CLAUSE
-USE_CABAL= dlist>=0.4
+USE_CABAL= dlist>=0.4 transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Glob/distinfo b/devel/hs-Glob/distinfo
index 0b910e5ee196..af2aff5a2e01 100644
--- a/devel/hs-Glob/distinfo
+++ b/devel/hs-Glob/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Glob-0.7.5.tar.gz) = 0063bbc680d90f522455c0dec1121837689da542f4d9c70924d98bfb1389be41
-SIZE (cabal/Glob-0.7.5.tar.gz) = 23443
+TIMESTAMP = 1499452388
+SHA256 (cabal/Glob-0.8.0.tar.gz) = 38f011be0e7818ab1e76880882b15217cd7d5be56a3dab631c14d614e2b2e896
+SIZE (cabal/Glob-0.8.0.tar.gz) = 23943
diff --git a/devel/hs-Glob/files/patch-Glob.cabal b/devel/hs-Glob/files/patch-Glob.cabal
deleted file mode 100644
index 70ad0f1072e2..000000000000
--- a/devel/hs-Glob/files/patch-Glob.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- Glob.cabal.orig 2014-05-08 18:30:42 UTC
-+++ Glob.cabal
-@@ -28,7 +28,7 @@ Library
- , containers < 0.6
- , directory < 1.3
- , dlist >= 0.4 && < 0.8
-- , filepath >= 1.1 && < 1.4
-+ , filepath >= 1.1 && < 1.5
- , transformers >= 0.2 && < 0.6
-
- if os(windows)
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 3c35bfea1d77..448c20235a8a 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HUnit
-PORTVERSION= 1.2.5.2
-PORTREVISION= 7
+PORTVERSION= 1.6.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Unit testing framework for Haskell
LICENSE= BSD3CLAUSE
+USE_CABAL= call-stack
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-HUnit/distinfo b/devel/hs-HUnit/distinfo
index 647d173b8527..6ecf2c9fe5ff 100644
--- a/devel/hs-HUnit/distinfo
+++ b/devel/hs-HUnit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HUnit-1.2.5.2.tar.gz) = 0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41
-SIZE (cabal/HUnit-1.2.5.2.tar.gz) = 24889
+TIMESTAMP = 1499627813
+SHA256 (cabal/HUnit-1.6.0.0.tar.gz) = 7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de
+SIZE (cabal/HUnit-1.6.0.0.tar.gz) = 21937
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index b32219be07da..a7b996c75fa9 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/distinfo b/devel/hs-IfElse/distinfo
index 102e361d482b..630846fea58a 100644
--- a/devel/hs-IfElse/distinfo
+++ b/devel/hs-IfElse/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627813
SHA256 (cabal/IfElse-0.85.tar.gz) = 8ad3bfc3e2c867e6330d9bff874b3105476c35b2e1638fd448f233e9f80addcd
SIZE (cabal/IfElse-0.85.tar.gz) = 2865
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 1dec721ed587..1f111663be02 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= List
-PORTVERSION= 0.5.2
+PORTVERSION= 0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index 4ce3b381a902..c9acc7f2cffd 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/List-0.5.2.tar.gz) = 27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac
-SIZE (cabal/List-0.5.2.tar.gz) = 6242
+TIMESTAMP = 1499627813
+SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889
+SIZE (cabal/List-0.6.0.tar.gz) = 6189
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-ListLike/Makefile
index cbc9815e0cc3..e3f0031f57e0 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-ListLike/Makefile
@@ -1,15 +1,15 @@
# $FreeBSD$
-PORTNAME= MonadCatchIO-transformers
-PORTVERSION= 0.3.1.3
+PORTNAME= ListLike
+PORTVERSION= 4.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad-transformer-compatible version of Control.Exception
+COMMENT= Generic support for list-like structures in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions monads-tf
+USE_CABAL= dlist fmlist text utf8-string vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ListLike/distinfo b/devel/hs-ListLike/distinfo
new file mode 100644
index 000000000000..010c4cdb2e97
--- /dev/null
+++ b/devel/hs-ListLike/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719758
+SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d
+SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600
diff --git a/devel/hs-ListLike/pkg-descr b/devel/hs-ListLike/pkg-descr
new file mode 100644
index 000000000000..c4d10f36ce76
--- /dev/null
+++ b/devel/hs-ListLike/pkg-descr
@@ -0,0 +1,12 @@
+Generic support for list-like structures in Haskell.
+
+The ListLike module provides a common interface to the various Haskell types
+that are list-like. Predefined interfaces include standard Haskell lists,
+Arrays, ByteStrings, and lazy ByteStrings. Custom types can easily be made
+ListLike instances as well.
+
+ListLike also provides for String-like types, such as String and ByteString,
+for types that support input and output, and for types that can handle
+infinite lists.
+
+WWW: http://hackage.haskell.org/package/ListLike
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index a94f819844d2..3d31ce647676 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= MemoTrie
-PORTVERSION= 0.6.2
-PORTREVISION= 2
+PORTVERSION= 0.6.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Trie-based memo functions
LICENSE= BSD3CLAUSE
-USE_CABAL= void
+USE_CABAL= newtype-generics void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index 0633cd874e39..1962e7a19fc2 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MemoTrie-0.6.2.tar.gz) = 9ddc11172db26a54681f14dd8ce881c87a3b0e72dcc7a15b74132f30b4408bbc
-SIZE (cabal/MemoTrie-0.6.2.tar.gz) = 6250
+TIMESTAMP = 1499627814
+SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4
+SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 6566861950cb..a19fe4fba5ef 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= MissingH
-PORTVERSION= 1.3.0.1
+PORTVERSION= 1.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index 5093588314db..5028956bb8f7 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MissingH-1.3.0.1.tar.gz) = ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3
-SIZE (cabal/MissingH-1.3.0.1.tar.gz) = 116812
+TIMESTAMP = 1499544768
+SHA256 (cabal/MissingH-1.4.0.1.tar.gz) = 283f2afd46625d98b4e29f77edadfa5e6009a227812ee2ece10091ad6a7e9b71
+SIZE (cabal/MissingH-1.4.0.1.tar.gz) = 109582
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
deleted file mode 100644
index 6a337d038cc9..000000000000
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= MonadCatchIO-mtl
-PORTVERSION= 0.3.1.0
-PORTREVISION= 2
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad-transformer version of the Control.Exception module
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-mtl/distinfo b/devel/hs-MonadCatchIO-mtl/distinfo
deleted file mode 100644
index 4d2ec948365b..000000000000
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 18c24e23bcb14ccfe3d46012b7935a0f7927eff298c7d6f76b087fc4c6715961
-SIZE (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 1730
diff --git a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
deleted file mode 100644
index 987af20bcd8c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- MonadCatchIO-mtl.cabal.orig 2014-01-04 20:24:53 UTC
-+++ MonadCatchIO-mtl.cabal
-@@ -18,7 +18,7 @@ build-type: Simple
- tested-with: GHC==6.12.3, GHC==7.0.3, GHC==7.2.1, GHC==7.4.2, GHC==7.6.0
-
- Library
-- build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.0
-+ build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.*
- extensions: PackageImports
-
- exposed-modules: Control.Monad.CatchIO
diff --git a/devel/hs-MonadCatchIO-mtl/pkg-descr b/devel/hs-MonadCatchIO-mtl/pkg-descr
deleted file mode 100644
index 706083b2d48c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Provides a monad-transformer version of the Control.Exception.catch
-Haskell function. For this, it defines the MonadCatchIO class, a subset
-of MonadIO. It defines proper instances for most monad transformers in
-the 'mtl' library.
-
-WWW: http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
deleted file mode 100644
index d18607148b86..000000000000
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd
-SIZE (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 4526
diff --git a/devel/hs-MonadCatchIO-transformers/pkg-descr b/devel/hs-MonadCatchIO-transformers/pkg-descr
deleted file mode 100644
index 500453cc9c70..000000000000
--- a/devel/hs-MonadCatchIO-transformers/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Provides functions to throw and catch exceptions. Unlike the functions from
-Control.Exception, which work in IO, these work in any stack of monad
-transformers (from the 'transformers' package) with IO as the base monad.
-You can extend this functionality to other monads, by creating an instance
-of the MonadCatchIO class.
-
-WWW: http://hackage.haskell.org/package/MonadCatchIO-transformers
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index eb2e52ed4391..b91a7fe5938a 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,13 +1,13 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.4
+PORTVERSION= 0.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random-number generation monad
-USE_CABAL= mtl random transformers-compat>=0.4
+USE_CABAL= mtl primitive random transformers-compat>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index ab6bac382761..6143b7ff832e 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MonadRandom-0.4.tar.gz) = d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93
-SIZE (cabal/MonadRandom-0.4.tar.gz) = 5064
+TIMESTAMP = 1499445934
+SHA256 (cabal/MonadRandom-0.5.1.tar.gz) = 9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87
+SIZE (cabal/MonadRandom-0.5.1.tar.gz) = 10326
diff --git a/devel/hs-MonadRandom/files/patch-MonadRandom.cabal b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
new file mode 100644
index 000000000000..35793f2304ed
--- /dev/null
+++ b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
@@ -0,0 +1,10 @@
+--- MonadRandom.cabal.orig 2017-07-10 13:35:15 UTC
++++ MonadRandom.cabal
+@@ -37,7 +37,6 @@ library
+ transformers-compat >=0.4 && <0.6,
+ mtl >=2.1 && <2.3,
+ primitive >=0.6 && <0.7,
+- fail >=4.9 ,
+ random
+ ghc-options: -Wall
+ default-language: Haskell2010
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 968768c567ae..02cfb6d44354 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ObjectName
-PORTVERSION= 1.1.0.0
+PORTVERSION= 1.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index ecc51246047a..7a7335392455 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ObjectName-1.1.0.0.tar.gz) = afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e
-SIZE (cabal/ObjectName-1.1.0.0.tar.gz) = 2583
+TIMESTAMP = 1499547842
+SHA256 (cabal/ObjectName-1.1.0.1.tar.gz) = 72dbef237580fd4e8567de2de752835bbadd3629f486d1586486d49a49aad210
+SIZE (cabal/ObjectName-1.1.0.1.tar.gz) = 2557
diff --git a/devel/hs-directory/Makefile b/devel/hs-Only/Makefile
index f2e27108d421..16b851916edc 100644
--- a/devel/hs-directory/Makefile
+++ b/devel/hs-Only/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
-PORTNAME= directory
-PORTVERSION= 1.3.0.1
+PORTNAME= Only
+PORTVERSION= 0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Library for manipulating files and directories in a portable way
+COMMENT= This package provides a canonical anonymous 1-tuple type
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-Only/distinfo b/devel/hs-Only/distinfo
new file mode 100644
index 000000000000..f2d151814ae7
--- /dev/null
+++ b/devel/hs-Only/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499539872
+SHA256 (cabal/Only-0.1.tar.gz) = ab7aa193e8c257d3bda6b0b3c1cbcf74cdaa85ab08cb20c2dd62ba248c1ab265
+SIZE (cabal/Only-0.1.tar.gz) = 1960
diff --git a/devel/hs-Only/pkg-descr b/devel/hs-Only/pkg-descr
new file mode 100644
index 000000000000..afce2902a3be
--- /dev/null
+++ b/devel/hs-Only/pkg-descr
@@ -0,0 +1,11 @@
+This package provides a canonical anonymous 1-tuple type missing from Haskell
+for attaching typeclass instances.
+
+NOTE: There is also the OneTuple package which by using a boxed data-type
+provides a 1-tuple type which has laziness properties which are more faithful
+to the ones of Haskell's native tuples; whereas the primary purpose of Only is
+to provide the traditionally so named type-wrapper for attaching typeclass
+instances.
+
+WWW: https://github.com/haskell/Only
+
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d1e061850da4..8535add3acd8 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/distinfo b/devel/hs-PSQueue/distinfo
index 42f31babc8ea..d9dda354b543 100644
--- a/devel/hs-PSQueue/distinfo
+++ b/devel/hs-PSQueue/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627814
SHA256 (cabal/PSQueue-1.1.tar.gz) = a8e0871ad10f916f55c3b9baec53eff23c4e97e09cf96d6c66771789e00a49cc
SIZE (cabal/PSQueue-1.1.tar.gz) = 6280
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index fe1fad80de34..62533977baaa 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.8.1
+PORTVERSION= 2.10.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 87c1a1a57ee3..154ed1dcf6f6 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/QuickCheck-2.8.1.tar.gz) = 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b
-SIZE (cabal/QuickCheck-2.8.1.tar.gz) = 38999
+TIMESTAMP = 1499459639
+SHA256 (cabal/QuickCheck-2.10.0.1.tar.gz) = 00d50522cd9550b1e8ae31ccddf2749d39a533807f4207abf1d36f231e00b42e
+SIZE (cabal/QuickCheck-2.10.0.1.tar.gz) = 54415
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 146a4d2074ce..1a13c0e3e085 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ReadArgs
-PORTVERSION= 1.2.2
+PORTVERSION= 1.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
index 37d4784294c4..0f78f81e16d7 100644
--- a/devel/hs-ReadArgs/distinfo
+++ b/devel/hs-ReadArgs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ReadArgs-1.2.2.tar.gz) = 47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec
-SIZE (cabal/ReadArgs-1.2.2.tar.gz) = 5102
+TIMESTAMP = 1499627815
+SHA256 (cabal/ReadArgs-1.2.3.tar.gz) = 9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69
+SIZE (cabal/ReadArgs-1.2.3.tar.gz) = 5100
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index 25128f80d3f0..bdf8a77db120 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= STMonadTrans
-PORTVERSION= 0.3.3
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
index 6b2f9f9399e9..77b76fa18b1e 100644
--- a/devel/hs-STMonadTrans/distinfo
+++ b/devel/hs-STMonadTrans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/STMonadTrans-0.3.3.tar.gz) = d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315
-SIZE (cabal/STMonadTrans-0.3.3.tar.gz) = 4820
+TIMESTAMP = 1499627815
+SHA256 (cabal/STMonadTrans-0.4.3.tar.gz) = 574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db
+SIZE (cabal/STMonadTrans-0.4.3.tar.gz) = 5786
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 09e5c1586efd..72ccc5daf7c0 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/distinfo b/devel/hs-SafeSemaphore/distinfo
index 16e51a6a6991..ae661b9fd032 100644
--- a/devel/hs-SafeSemaphore/distinfo
+++ b/devel/hs-SafeSemaphore/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627815
SHA256 (cabal/SafeSemaphore-0.10.1.tar.gz) = 21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66
SIZE (cabal/SafeSemaphore-0.10.1.tar.gz) = 24007
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index e83eab93b573..610620b73873 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ShellCheck
-PORTVERSION= 0.4.5
+PORTVERSION= 0.4.6
CATEGORIES= devel haskell
MAINTAINER= luca.pizzamiglio@gmail.com
diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo
index 5d28dfe87657..c527598c5e5e 100644
--- a/devel/hs-ShellCheck/distinfo
+++ b/devel/hs-ShellCheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487064735
-SHA256 (cabal/ShellCheck-0.4.5.tar.gz) = 53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7
-SIZE (cabal/ShellCheck-0.4.5.tar.gz) = 109721
+TIMESTAMP = 1499627816
+SHA256 (cabal/ShellCheck-0.4.6.tar.gz) = 11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc
+SIZE (cabal/ShellCheck-0.4.6.tar.gz) = 116618
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 1bbf8dd20161..41f903e94301 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= StateVar
-PORTVERSION= 1.1.0.1
+PORTVERSION= 1.1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= State variables
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.0
+USE_CABAL= stm
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
index 584800b0abf3..ecf2f362f8b5 100644
--- a/devel/hs-StateVar/distinfo
+++ b/devel/hs-StateVar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/StateVar-1.1.0.1.tar.gz) = 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa
-SIZE (cabal/StateVar-1.1.0.1.tar.gz) = 4462
+TIMESTAMP = 1499443877
+SHA256 (cabal/StateVar-1.1.0.4.tar.gz) = 7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7
+SIZE (cabal/StateVar-1.1.0.4.tar.gz) = 4587
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index a1a634bb31d6..df0145fcd6c0 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.7.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 04b62c912e14..06a32567de7f 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627816
SHA256 (cabal/Stream-0.4.7.2.tar.gz) = 990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1
SIZE (cabal/Stream-0.4.7.2.tar.gz) = 6543
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 4c9b28156e6e..17d37e1c4ff0 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= TypeCompose
-PORTVERSION= 0.9.10
-PORTREVISION= 2
+PORTVERSION= 0.9.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,5 +10,7 @@ COMMENT= Type composition classes and instances
LICENSE= BSD3CLAUSE
+USE_CABAL= base-orphans
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index 46f4bbd8f229..fa65760e56f1 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/TypeCompose-0.9.10.tar.gz) = b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2
-SIZE (cabal/TypeCompose-0.9.10.tar.gz) = 17866
+TIMESTAMP = 1499627817
+SHA256 (cabal/TypeCompose-0.9.12.tar.gz) = 3a182c2cc93f8291b3aedfc32c0b1faa84a982601c1a24cbe7fe1ecc50e333e2
+SIZE (cabal/TypeCompose-0.9.12.tar.gz) = 17946
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 7ac40b058d85..b5f7caa610b2 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 917676268041..a00a333060ae 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
SHA256 (cabal/abstract-deque-0.3.tar.gz) = 09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2
SIZE (cabal/abstract-deque-0.3.tar.gz) = 7219
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index f0b52453e552..31d3881c7e90 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/distinfo b/devel/hs-abstract-par/distinfo
index 122e180581d2..bc3bebb4f1a6 100644
--- a/devel/hs-abstract-par/distinfo
+++ b/devel/hs-abstract-par/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
SHA256 (cabal/abstract-par-0.3.3.tar.gz) = 248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860
SIZE (cabal/abstract-par-0.3.3.tar.gz) = 4714
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 2d421bb0b27e..8f9186cbc56c 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= activehs-base
-PORTVERSION= 0.3.0.2
-PORTREVISION= 9
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/distinfo b/devel/hs-activehs-base/distinfo
index c10fe3b3e237..94603a8b3acf 100644
--- a/devel/hs-activehs-base/distinfo
+++ b/devel/hs-activehs-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/activehs-base-0.3.0.2.tar.gz) = bb65782c7c29a745c435e7857b5f466017c622a57a604ef8ee645fad5cd75973
-SIZE (cabal/activehs-base-0.3.0.2.tar.gz) = 1873
+TIMESTAMP = 1499538392
+SHA256 (cabal/activehs-base-0.3.0.4.tar.gz) = 92d516583737ceb2272807eab8280ebb3b36e679c5a219ca9813d0c695efb13e
+SIZE (cabal/activehs-base-0.3.0.4.tar.gz) = 1881
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 9f24f99262fc..47ab808ddeba 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,12 +1,10 @@
---- activehs-base.cabal.orig 2012-09-11 07:56:08 UTC
+--- activehs-base.cabal.orig 2017-07-11 16:35:24 UTC
+++ activehs-base.cabal
-@@ -21,7 +21,7 @@ Library
- Exposed-Modules:
+@@ -22,6 +22,6 @@ Library
ActiveHs.Base
Build-Depends:
-- base >= 4.0 && < 4.7,
-- QuickCheck >= 2.4 && < 2.6
-+ base >= 4.0 && < 4.9,
-+ QuickCheck >= 2.4 && < 2.9
+ base >= 4.0 && < 4.10,
+- QuickCheck >= 2.4 && < 2.9
++ QuickCheck >= 2.4 && < 2.11
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 48134fc0ad15..5ab31ca763ce 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.1.4
+PORTVERSION= 3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index be00f43be4a9..881bf30b7a29 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/alex-3.1.4.tar.gz) = d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
-SIZE (cabal/alex-3.1.4.tar.gz) = 101827
+TIMESTAMP = 1499627818
+SHA256 (cabal/alex-3.2.1.tar.gz) = a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c
+SIZE (cabal/alex-3.2.1.tar.gz) = 111167
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 400c6373755e..0b000eeb7539 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6.2.1
+PORTVERSION= 0.6.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 718b46e311b6..3455706769c7 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ansi-terminal-0.6.2.1.tar.gz) = 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6
-SIZE (cabal/ansi-terminal-0.6.2.1.tar.gz) = 14652
+TIMESTAMP = 1499627818
+SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095
+SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index d9fb74075c8b..f96a30c34aaf 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.7.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index fed41c5cffce..2e0a4c19b235 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index aa861a9d666f..319b0d5e7931 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index 84946a03c6fa..800754e96563 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2
SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index ebef297582c3..5611019f36fb 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-data
-PORTVERSION= 0.7.1
-PORTREVISION= 9
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/distinfo b/devel/hs-asn1-data/distinfo
index e9b1c130d835..febb43807e12 100644
--- a/devel/hs-asn1-data/distinfo
+++ b/devel/hs-asn1-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-data-0.7.1.tar.gz) = f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783
-SIZE (cabal/asn1-data-0.7.1.tar.gz) = 17500
+TIMESTAMP = 1499627819
+SHA256 (cabal/asn1-data-0.7.2.tar.gz) = 83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1
+SIZE (cabal/asn1-data-0.7.2.tar.gz) = 17672
diff --git a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
deleted file mode 100644
index 2ead06800a21..000000000000
--- a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- Data/ASN1/Parse.hs.orig 2012-08-28 06:24:31 UTC
-+++ Data/ASN1/Parse.hs
-@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
-
- -- | Parse ASN1 Monad
- newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
-- deriving (Functor, Monad, MonadError String)
-+ deriving (Functor, Applicative, Monad, MonadError String)
-
- -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
- runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index 1eec53a2bd02..3560322bf356 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-encoding
-PORTVERSION= 0.9.0
+PORTVERSION= 0.9.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-encoding/distinfo b/devel/hs-asn1-encoding/distinfo
index a96bb12cd1ec..1124f6df4982 100644
--- a/devel/hs-asn1-encoding/distinfo
+++ b/devel/hs-asn1-encoding/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-encoding-0.9.0.tar.gz) = 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b
-SIZE (cabal/asn1-encoding-0.9.0.tar.gz) = 15997
+TIMESTAMP = 1499545891
+SHA256 (cabal/asn1-encoding-0.9.5.tar.gz) = 1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29
+SIZE (cabal/asn1-encoding-0.9.5.tar.gz) = 16114
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index e341cd39d2ba..ffef6afeff27 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-parse
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-parse/distinfo b/devel/hs-asn1-parse/distinfo
index 1f5f1e111793..1a0d7c24539a 100644
--- a/devel/hs-asn1-parse/distinfo
+++ b/devel/hs-asn1-parse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-parse-0.9.1.tar.gz) = e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de
-SIZE (cabal/asn1-parse-0.9.1.tar.gz) = 2785
+TIMESTAMP = 1499545839
+SHA256 (cabal/asn1-parse-0.9.4.tar.gz) = c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708
+SIZE (cabal/asn1-parse-0.9.4.tar.gz) = 2860
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index e3d8a8217615..6c79415782b0 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-types
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= ASN.1 types
LICENSE= BSD3CLAUSE
-USE_CABAL= hourglass
+USE_CABAL= hourglass memory
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-types/distinfo b/devel/hs-asn1-types/distinfo
index 784bf5efbedb..764c93c5dea3 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-types-0.3.0.tar.gz) = b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa
-SIZE (cabal/asn1-types-0.3.0.tar.gz) = 5391
+TIMESTAMP = 1499545858
+SHA256 (cabal/asn1-types-0.3.2.tar.gz) = 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217
+SIZE (cabal/asn1-types-0.3.2.tar.gz) = 6424
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index 0477a9e43e80..91ffe88ba1e9 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.2
+PORTVERSION= 2.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index ff48c0540e0f..4955e17e4c19 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/async-2.0.2.tar.gz) = db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b
-SIZE (cabal/async-2.0.2.tar.gz) = 8565
+TIMESTAMP = 1499444628
+SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2
+SIZE (cabal/async-2.1.1.1.tar.gz) = 10608
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index 17672a1cee03..1e2b39e935e7 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= atomic-primops
-PORTVERSION= 0.8
+PORTVERSION= 0.8.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index 8ec74aa1c2b7..b74ee8e82196 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/atomic-primops-0.8.tar.gz) = c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471
-SIZE (cabal/atomic-primops-0.8.tar.gz) = 33588
+TIMESTAMP = 1499450732
+SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864
+SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index b0219c06daa2..24f47698f60a 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= auto-update
-PORTVERSION= 0.1.2.2
+PORTVERSION= 0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
index 5e0526850464..fd55b6f10ab1 100644
--- a/devel/hs-auto-update/distinfo
+++ b/devel/hs-auto-update/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/auto-update-0.1.2.2.tar.gz) = 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db
-SIZE (cabal/auto-update-0.1.2.2.tar.gz) = 6651
+TIMESTAMP = 1499627821
+SHA256 (cabal/auto-update-0.1.4.tar.gz) = 5e96c151024e8bcaf4eaa932e16995872b2017f46124b967e155744d9580b425
+SIZE (cabal/auto-update-0.1.4.tar.gz) = 8607
diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile
new file mode 100644
index 000000000000..346c9e181b13
--- /dev/null
+++ b/devel/hs-base-compat/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= base-compat
+PORTVERSION= 0.9.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Provides functions available in later versions of base to a wider range of compilers
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo
new file mode 100644
index 000000000000..30eaf35ba24b
--- /dev/null
+++ b/devel/hs-base-compat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499541026
+SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210
+SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632
diff --git a/devel/hs-base-compat/pkg-descr b/devel/hs-base-compat/pkg-descr
new file mode 100644
index 000000000000..8070cfe9be6b
--- /dev/null
+++ b/devel/hs-base-compat/pkg-descr
@@ -0,0 +1,11 @@
+Provides functions available in later versions of base to a wider range of
+compilers, without requiring you to use CPP pragmas in your code. See the README
+for what is covered. Also see the changelog for recent changes.
+
+Note that base-compat does not add any orphan instances. There is a separate
+package, base-orphans, for that.
+
+In addition, base-compat does not backport any data types or type classes.
+See this section of the README for more info.
+
+WWW: https://github.com/haskell-compat/base-compat
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
index 4bda66211d93..bdd0752ad466 100644
--- a/devel/hs-base-orphans/Makefile
+++ b/devel/hs-base-orphans/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= base-orphans
-PORTVERSION= 0.4.4
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
index 96924c04e284..914152611128 100644
--- a/devel/hs-base-orphans/distinfo
+++ b/devel/hs-base-orphans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/base-orphans-0.4.4.tar.gz) = f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42
-SIZE (cabal/base-orphans-0.4.4.tar.gz) = 13068
+TIMESTAMP = 1499444442
+SHA256 (cabal/base-orphans-0.6.tar.gz) = c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e
+SIZE (cabal/base-orphans-0.6.tar.gz) = 18087
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 66fed67ce046..71fdcef917b5 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/distinfo b/devel/hs-base-unicode-symbols/distinfo
index 2b45526e5bfa..b22606d29201 100644
--- a/devel/hs-base-unicode-symbols/distinfo
+++ b/devel/hs-base-unicode-symbols/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9
SIZE (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = 5562
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 781e32c8fd37..435a182d81bd 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/distinfo b/devel/hs-base16-bytestring/distinfo
index 650a4c79ede3..037937ec0505 100644
--- a/devel/hs-base16-bytestring/distinfo
+++ b/devel/hs-base16-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base16-bytestring-0.1.1.6.tar.gz) = 5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449
SIZE (cabal/base16-bytestring-0.1.1.6.tar.gz) = 3694
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 3e577f7abf26..b767736a43b9 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/distinfo b/devel/hs-base64-bytestring/distinfo
index 7e8b3be0249d..9f919349a61c 100644
--- a/devel/hs-base64-bytestring/distinfo
+++ b/devel/hs-base64-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base64-bytestring-1.0.0.1.tar.gz) = ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50
SIZE (cabal/base64-bytestring-1.0.0.1.tar.gz) = 9080
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index ac37d873a539..3c586f1c15cc 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index a1e555b06399..4ed645814eec 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/basic-prelude-0.5.0.tar.gz) = d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1
-SIZE (cabal/basic-prelude-0.5.0.tar.gz) = 5743
+TIMESTAMP = 1499627821
+SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7
+SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 95a22f469d72..2730176b02e7 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 5
+PORTVERSION= 5.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Bifunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.8.3.1 tagged>=0.7.3
+USE_CABAL= base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index 29f009f021b8..8dce950a9667 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/bifunctors-5.tar.gz) = 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d
-SIZE (cabal/bifunctors-5.tar.gz) = 10562
+TIMESTAMP = 1499542053
+SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d
+SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 6d852cd3c6b3..a63cce50300b 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= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/distinfo b/devel/hs-bits-atomic/distinfo
index 52e579d6dd8e..e34ba4fe9445 100644
--- a/devel/hs-bits-atomic/distinfo
+++ b/devel/hs-bits-atomic/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bits-atomic-0.1.3.tar.gz) = e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d
SIZE (cabal/bits-atomic-0.1.3.tar.gz) = 7982
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 5681e08b1689..b65216b742e0 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,7 @@ COMMENT= Enumeratees for the incremental conversion of builders to bytestrings
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 \
- streaming-commons>=0.1.10
+USE_CABAL= blaze-builder enumerator streaming-commons
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-enumerator/distinfo b/devel/hs-blaze-builder-enumerator/distinfo
index 03c891974651..34ad87e35b46 100644
--- a/devel/hs-blaze-builder-enumerator/distinfo
+++ b/devel/hs-blaze-builder-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96
SIZE (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 4248
diff --git a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
index 2cc38b10c15a..4605b668925e 100644
--- a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
+++ b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
@@ -1,6 +1,13 @@
--- blaze-builder-enumerator.cabal.orig 2015-04-01 17:10:57 UTC
+++ blaze-builder-enumerator.cabal
-@@ -49,8 +49,7 @@ Library
+@@ -43,14 +43,13 @@ Library
+ , bytestring >= 0.9 && < 0.11
+ , enumerator >= 0.4.3.1 && < 0.5
+ , streaming-commons >= 0.1.10 && < 0.2
+- , transformers >= 0.2 && < 0.5
++ , transformers >= 0.2
+ Exposed-modules:
+ Blaze.ByteString.Builder.Enumerator
if flag(newbuilder)
Build-depends:
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index d09ea0698f14..7a5c4d641b2f 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.4.0.1
+PORTVERSION= 0.4.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 2f75f60ae439..30274144b35e 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-builder-0.4.0.1.tar.gz) = c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5
-SIZE (cabal/blaze-builder-0.4.0.1.tar.gz) = 57113
+TIMESTAMP = 1499546087
+SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4
+SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index e34329a2fa7a..7710fbf01630 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index 08620f567b48..bbcc1722f430 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/blaze-textual-0.2.1.0.tar.gz) = 1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d
SIZE (cabal/blaze-textual-0.2.1.0.tar.gz) = 6914
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 99228152485a..dbf244ba7dc3 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 2.0.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index 85c94c7fff64..4849664c4a67 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bloomfilter-2.0.1.0.tar.gz) = 6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f
SIZE (cabal/bloomfilter-2.0.1.0.tar.gz) = 22100
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index e77118f2047d..216e15214dc1 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= boxes
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index e6d863864160..19bce67a016a 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8
SIZE (cabal/boxes-0.1.4.tar.gz) = 6481
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index e9240b6062b2..92a42042c4be 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= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/distinfo b/devel/hs-bsd-sysctl/distinfo
index d2c54e2b94cb..eff026fbdfe9 100644
--- a/devel/hs-bsd-sysctl/distinfo
+++ b/devel/hs-bsd-sysctl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bsd-sysctl-1.0.7.tar.gz) = de8c9e2b6d0fa64f7e33885392a05b450e30da35d80de10f37c918ac8d2e1aa3
SIZE (cabal/bsd-sysctl-1.0.7.tar.gz) = 6183
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index 543bb55fcf8a..b3499275238c 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/distinfo b/devel/hs-byteable/distinfo
index 11d3c1e2095b..0097dff3c870 100644
--- a/devel/hs-byteable/distinfo
+++ b/devel/hs-byteable/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2
SIZE (cabal/byteable-0.1.1.tar.gz) = 2400
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 0c6670728d26..a29c64c76a77 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/distinfo b/devel/hs-byteorder/distinfo
index a1c0b78b4b22..3a4873c29cab 100644
--- a/devel/hs-byteorder/distinfo
+++ b/devel/hs-byteorder/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
SIZE (cabal/byteorder-1.0.4.tar.gz) = 2030
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index adf7ab389d06..5dcb321986c3 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bytestring-lexing
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/distinfo b/devel/hs-bytestring-lexing/distinfo
index 5ad031818cf3..035e04bee31b 100644
--- a/devel/hs-bytestring-lexing/distinfo
+++ b/devel/hs-bytestring-lexing/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73
SIZE (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 13859
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
index c23b2e740858..2381a20e1a80 100644
--- a/devel/hs-bytestring-mmap/Makefile
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bytestring-mmap
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-mmap/distinfo b/devel/hs-bytestring-mmap/distinfo
index 93a825b438ce..668ccd42740c 100644
--- a/devel/hs-bytestring-mmap/distinfo
+++ b/devel/hs-bytestring-mmap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bytestring-mmap-0.2.2.tar.gz) = 7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af
SIZE (cabal/bytestring-mmap-0.2.2.tar.gz) = 7188
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 0cb43c1f2689..a022ded4130e 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/distinfo b/devel/hs-bytestring-nums/distinfo
index a1d9cc088072..0a4d5c2d5993 100644
--- a/devel/hs-bytestring-nums/distinfo
+++ b/devel/hs-bytestring-nums/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
SHA256 (cabal/bytestring-nums-0.3.6.tar.gz) = bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd
SIZE (cabal/bytestring-nums-0.3.6.tar.gz) = 3770
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index ebb40e415b60..d6ed55e071d4 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/distinfo b/devel/hs-bytestring-show/distinfo
index 82c5cb792baf..7876a0176d41 100644
--- a/devel/hs-bytestring-show/distinfo
+++ b/devel/hs-bytestring-show/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
SHA256 (cabal/bytestring-show-0.3.5.6.tar.gz) = 29242efd16951ebba888218c469a99ff25b19ab74ee1e0d7b4db09b8800a0812
SIZE (cabal/bytestring-show-0.3.5.6.tar.gz) = 8145
diff --git a/devel/hs-bytestring-show/files/patch-bytestring-show.cabal b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
new file mode 100644
index 000000000000..fa60616d91cd
--- /dev/null
+++ b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
@@ -0,0 +1,11 @@
+--- bytestring-show.cabal.orig 2017-07-08 18:54:46 UTC
++++ bytestring-show.cabal
+@@ -16,7 +16,7 @@ flag integer-simple
+ description: use with integer-simple build of GHC
+
+ 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
+
+ exposed-modules:
+ Text.Show.ByteString
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index ce0fe1ebeecd..671000d9b919 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.28.1
+PORTVERSION= 0.28.2
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index 2c6b94f46cad..54b7479f6378 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/c2hs-0.28.1.tar.gz) = 95b04ef42cf43a1078e9c8a4bf9264dd26e8653b441b3fb7f2296c8b3a0752bb
-SIZE (cabal/c2hs-0.28.1.tar.gz) = 205622
+TIMESTAMP = 1499627824
+SHA256 (cabal/c2hs-0.28.2.tar.gz) = f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e
+SIZE (cabal/c2hs-0.28.2.tar.gz) = 205916
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 4b181195025b..3d9a58654b59 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.22.6.0
+PORTVERSION= 1.24.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,9 @@ COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.5 mtl>=2.0 network>=2.6 network-uri>=2.6 \
- random>=1 stm>=2.0 zlib>=0.5.3
+USE_CABAL= async base16-bytestring cryptohash-sha256 hackage-security \
+ hashable HTTP mtl network network-uri old-time random stm \
+ tar zlib
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 3194cae126ee..e357bb419c56 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cabal-install-1.22.6.0.tar.gz) = 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4
-SIZE (cabal/cabal-install-1.22.6.0.tar.gz) = 302564
+TIMESTAMP = 1499540276
+SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0
+SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937
diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile
new file mode 100644
index 000000000000..f956def523ed
--- /dev/null
+++ b/devel/hs-call-stack/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= call-stack
+PORTVERSION= 0.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The call-stack package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-call-stack/distinfo b/devel/hs-call-stack/distinfo
new file mode 100644
index 000000000000..59b4d0446cca
--- /dev/null
+++ b/devel/hs-call-stack/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547219
+SHA256 (cabal/call-stack-0.1.0.tar.gz) = f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2
+SIZE (cabal/call-stack-0.1.0.tar.gz) = 2473
diff --git a/devel/hs-call-stack/pkg-descr b/devel/hs-call-stack/pkg-descr
new file mode 100644
index 000000000000..e0499cd7eb67
--- /dev/null
+++ b/devel/hs-call-stack/pkg-descr
@@ -0,0 +1,3 @@
+Use GHC call-stacks in a backward compatible way.
+
+WWW: https://hackage.haskell.org/package/call-stack
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 891578352351..676a373ad875 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.4.1.1
+PORTVERSION= 0.5.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index 2853ab1df6d8..f99ee80b5cec 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cereal-0.4.1.1.tar.gz) = df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097
-SIZE (cabal/cereal-0.4.1.1.tar.gz) = 22656
+TIMESTAMP = 1499627824
+SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7
+SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 76af9e653c12..b5191c210f56 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index 8f64068af05c..beb5d19fb724 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/checkers-0.4.3.tar.gz) = c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567
-SIZE (cabal/checkers-0.4.3.tar.gz) = 15022
+TIMESTAMP = 1499538835
+SHA256 (cabal/checkers-0.4.7.tar.gz) = f9d9cb2fcd613d0cfe440aae024e27e9ccb5c8f925046e4f71f6360d8f4c2b97
+SIZE (cabal/checkers-0.4.7.tar.gz) = 15026
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index e320c81b7e40..d475008a8118 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= chunked-data
-PORTVERSION= 0.2.0
+PORTVERSION= 0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
index 3f032bab4c10..08ac2c815ca5 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/chunked-data-0.2.0.tar.gz) = 9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272
-SIZE (cabal/chunked-data-0.2.0.tar.gz) = 4923
+TIMESTAMP = 1499627825
+SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f
+SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 116e25f33b28..4a9901889680 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= 0.12.0.1
+PORTVERSION= 1.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index 02e71d9dca36..f6816aa3392e 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7
-SIZE (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = 1598
+TIMESTAMP = 1499627826
+SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f
+SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 5f910e7e2fbf..f0cd3722a972 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.12.1.1
+PORTVERSION= 1.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,11 +9,12 @@ COMMENT= Typeclass-based Prelude
LICENSE= MIT
-USE_CABAL= basic-prelude>=0.4 bifunctors chunked-data dlist>=0.7 \
- enclosed-exceptions exceptions>=0.5 hashable lifted-base>=0.2 \
- mono-traversable>=0.9.1 mtl mutable-containers>=0.3 primitive \
- semigroups stm text time-locale-compat unordered-containers \
- vector vector-instances
+USE_CABAL= async basic-prelude bifunctors chunked-data dlist \
+ exceptions hashable lifted-async lifted-base monad-unlift \
+ mono-traversable mono-traversable-instances mtl \
+ mutable-containers primitive safe-exceptions say semigroups \
+ stm stm-chans text time-locale-compat transformers-base \
+ unordered-containers vector vector-instances
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index 166c94d5dd36..e72567fe62a0 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-0.12.1.1.tar.gz) = 670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13
-SIZE (cabal/classy-prelude-0.12.1.1.tar.gz) = 10273
+TIMESTAMP = 1499627825
+SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34
+SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017
diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile
new file mode 100644
index 000000000000..02325b2071f1
--- /dev/null
+++ b/devel/hs-clock/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= clock
+PORTVERSION= 0.7.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A package for convenient access to high-resolution clock and timer functions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-clock/distinfo b/devel/hs-clock/distinfo
new file mode 100644
index 000000000000..6c3e33220931
--- /dev/null
+++ b/devel/hs-clock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499692787
+SHA256 (cabal/clock-0.7.2.tar.gz) = 886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f
+SIZE (cabal/clock-0.7.2.tar.gz) = 7465
diff --git a/devel/hs-clock/pkg-descr b/devel/hs-clock/pkg-descr
new file mode 100644
index 000000000000..37748a5a5bd3
--- /dev/null
+++ b/devel/hs-clock/pkg-descr
@@ -0,0 +1,4 @@
+A package for convenient access to high-resolution clock and timer functions of
+different operating systems via a unified API.
+
+WWW: http://hackage.haskell.org/package/clock
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 901c6e0a425c..ac7b2abe82e8 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.13
+PORTVERSION= 0.10.17
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index 13b88cc1930f..8509d2ff8fcf 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cmdargs-0.10.13.tar.gz) = 66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e
-SIZE (cabal/cmdargs-0.10.13.tar.gz) = 64008
+TIMESTAMP = 1499596679
+SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da
+SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440
diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile
new file mode 100644
index 000000000000..0e23bf06a190
--- /dev/null
+++ b/devel/hs-code-page/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= code-page
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A cross-platform module that exports functions which adjust code pages on Windows
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-code-page/distinfo b/devel/hs-code-page/distinfo
new file mode 100644
index 000000000000..96e1d94bf360
--- /dev/null
+++ b/devel/hs-code-page/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499790338
+SHA256 (cabal/code-page-0.1.3.tar.gz) = e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191
+SIZE (cabal/code-page-0.1.3.tar.gz) = 4718
diff --git a/devel/hs-code-page/pkg-descr b/devel/hs-code-page/pkg-descr
new file mode 100644
index 000000000000..b2fb523749a7
--- /dev/null
+++ b/devel/hs-code-page/pkg-descr
@@ -0,0 +1,10 @@
+This library provides two modules:
+
+ * System.IO.CodePage: a cross-platform module that exports functions which
+ adjust code pages on Windows, and do nothing on other operating systems.
+
+ * System.Win32.CodePage: On Windows, this exports functions for getting,
+ setting, and analyzing code pages. On other operating systems, this module
+ exports nothing.
+
+WWW: https://hackage.haskell.org/package/code-page
diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile
new file mode 100644
index 000000000000..d655d0b8b7fa
--- /dev/null
+++ b/devel/hs-colour/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= colour
+PORTVERSION= 2.3.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package provides a data type for colours and transparency
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-colour/distinfo b/devel/hs-colour/distinfo
new file mode 100644
index 000000000000..db94588f4d62
--- /dev/null
+++ b/devel/hs-colour/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547650
+SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2
+SIZE (cabal/colour-2.3.3.tar.gz) = 20392
diff --git a/devel/hs-colour/pkg-descr b/devel/hs-colour/pkg-descr
new file mode 100644
index 000000000000..3876a3997a17
--- /dev/null
+++ b/devel/hs-colour/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a data type for colours and transparency.
+Colours can be blended and composed. Various colour spaces are
+supported. A module of colour names (Data.Colour.Names) is provided.
+
+WWW: http://hackage.haskell.org/package/colour
diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile
new file mode 100644
index 000000000000..d04077288657
--- /dev/null
+++ b/devel/hs-concurrent-output/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= concurrent-output
+PORTVERSION= 1.10.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Ungarble output from several threads or commands
+
+LICENSE= BSD2CLAUSE
+
+USE_CABAL= text async stm exceptions ansi-terminal terminal-size
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo
new file mode 100644
index 000000000000..f3d0b41e12c9
--- /dev/null
+++ b/devel/hs-concurrent-output/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501333173
+SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2
+SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764
diff --git a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
new file mode 100644
index 000000000000..a517c388b924
--- /dev/null
+++ b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
@@ -0,0 +1,11 @@
+--- concurrent-output.cabal.orig 2017-05-19 15:55:09 UTC
++++ concurrent-output.cabal
+@@ -34,7 +34,7 @@ Library
+ , text (>= 0.11.0 && < 1.3.0)
+ , async (>= 2.0 && < 2.2)
+ , stm (>= 2.0 && < 2.5)
+- , process (>= 1.6.0 && < 1.7.0)
++ , process
+ , directory (>= 1.2.0 && < 1.4.0)
+ , transformers (>= 0.3.0 && < 0.6.0)
+ , exceptions (>= 0.6.0 && < 0.9.0)
diff --git a/devel/hs-concurrent-output/pkg-descr b/devel/hs-concurrent-output/pkg-descr
new file mode 100644
index 000000000000..ed809c2db02d
--- /dev/null
+++ b/devel/hs-concurrent-output/pkg-descr
@@ -0,0 +1,9 @@
+Lets multiple threads and external processes concurrently output to the
+console, without it getting all garbled up.
+
+Built on top of that is a way of defining multiple output regions, which are
+automatically laid out on the screen and can be individually updated by
+concurrent threads. Can be used for progress displays etc.
+
+WWW: http://hackage.haskell.org/package/concurrent-output
+
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index c5f79cb56198..0572e6866c44 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-combinators
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
index b8915bbc4208..28904c912a66 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-combinators-1.0.3.tar.gz) = 29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf
-SIZE (cabal/conduit-combinators-1.0.3.tar.gz) = 38172
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918
+SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index 12683b586da5..65b6e826afe3 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-extra
-PORTVERSION= 1.1.9.1
+PORTVERSION= 1.1.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
index 50bdc241aee9..bb3c610cd933 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-extra-1.1.9.1.tar.gz) = 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3
-SIZE (cabal/conduit-extra-1.1.9.1.tar.gz) = 29571
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5
+SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index b3376359f2ab..8a4d095c9e73 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.2.5
+PORTVERSION= 1.2.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index dcde7641cbdc..0ede71efa0c2 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-1.2.5.tar.gz) = b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46
-SIZE (cabal/conduit-1.2.5.tar.gz) = 46805
+TIMESTAMP = 1499543753
+SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7
+SIZE (cabal/conduit-1.2.11.tar.gz) = 50240
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index e121c375bb34..fb879d793858 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index 1ffcc4ec4af8..fa149af9b6c2 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
SHA256 (cabal/configurator-0.3.0.0.tar.gz) = 6eb9996b672e9f7112ca23482c42fa533553312c3c13f38a8a06476e67c031b4
SIZE (cabal/configurator-0.3.0.0.tar.gz) = 15232
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
index aa95bda4cf6d..8d517c0f9e19 100644
--- a/devel/hs-constraints/Makefile
+++ b/devel/hs-constraints/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= constraints
-PORTVERSION= 0.4.1.3
+PORTVERSION= 0.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Constraint manipulation
LICENSE= BSD3CLAUSE
-USE_CABAL= newtype>=0.2
+USE_CABAL= hashable mtl transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
index 1bb8e26226ee..33ab50904526 100644
--- a/devel/hs-constraints/distinfo
+++ b/devel/hs-constraints/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/constraints-0.4.1.3.tar.gz) = dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0
-SIZE (cabal/constraints-0.4.1.3.tar.gz) = 7311
+TIMESTAMP = 1499444670
+SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785
+SIZE (cabal/constraints-0.9.1.tar.gz) = 18503
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 737bdfbc5b9c..64b0529283a0 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,6 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.1.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 76a4901de85a..aa551f69bf81 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
SHA256 (cabal/convertible-1.1.1.0.tar.gz) = e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c
SIZE (cabal/convertible-1.1.1.0.tar.gz) = 14354
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index c27affa50ef0..855ca369d6f3 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.19
+PORTVERSION= 1.20.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index e79d6bde247c..d2925493b20e 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cpphs-1.19.tar.gz) = e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a
-SIZE (cabal/cpphs-1.19.tar.gz) = 44056
+TIMESTAMP = 1499627828
+SHA256 (cabal/cpphs-1.20.8.tar.gz) = e56d64a7d8058e0fb63f0669397c1c861efb20a0376e0e74d86942ac151105ae
+SIZE (cabal/cpphs-1.20.8.tar.gz) = 45108
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 54cd8d9fa7eb..b828d3b42acb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.10.1
+PORTVERSION= 2.12.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +10,12 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
-USE_CABAL= attoparsec>=0.11 base16-bytestring>=0.1 cryptohash>=0.4 \
- data-ordlist>=0.4 dataenc>=0.11 hashable>=1.0 html \
- mmap>=0.5 mtl>=2.1 parsec>=3.1 random>=1.0 \
- regex-applicative>=0.2 regex-compat-tdfa>=0.95.1 tar>=0.4 \
- text>=0.11.2.0 transformers-compat>=0.4 unix-compat>=0.1.2 \
- utf8-string>=0.3.6 vector>=0.7 zip-archive>=0.2.3 zlib>=0.5.3.0
+USE_CABAL= async attoparsec base16-bytestring cryptohash \
+ data-ordlist dataenc fgl graphviz hashable html HTTP \
+ mmap mtl parsec random \
+ regex-applicative regex-compat-tdfa sandi tar \
+ text transformers-compat unix-compat \
+ utf8-string vector zip-archive zlib
EXECUTABLE= darcs
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 674b3132fd28..b1637f2cebd2 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/darcs-2.10.1.tar.gz) = f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
-SIZE (cabal/darcs-2.10.1.tar.gz) = 1509208
+TIMESTAMP = 1499538866
+SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553
+SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index c93b12126848..e37898d12a64 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,6 +1,6 @@
---- ./Setup.lhs.orig 2013-02-06 07:07:21.000000000 +0100
-+++ ./Setup.lhs 2014-07-13 22:44:31.000000000 +0200
-@@ -26,7 +26,7 @@
+--- Setup.lhs.orig 2017-01-11 20:07:29 UTC
++++ Setup.lhs
+@@ -26,7 +26,7 @@ import Distribution.Version
import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
@@ -9,7 +9,7 @@
import Distribution.Simple.PackageIndex ( topologicalOrder )
import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
import Distribution.Simple.Setup
-@@ -200,7 +200,7 @@
+@@ -217,7 +217,7 @@ installManpage :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy =
copyFiles verbosity
@@ -17,4 +17,4 @@
+ (prefix (absoluteInstallDirs pkg lbi copy) </> "man" </> "man1")
[(buildDir lbi </> "darcs", "darcs.1")]
- determineVersion :: Verbosity -> PackageDescription -> IO (String, String)
+ -- ---------------------------------------------------------------------
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 000000000000..18095e40a87a
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,11 @@
+--- darcs.cabal.orig 2017-07-11 16:28:16 UTC
++++ darcs.cabal
+@@ -400,7 +400,7 @@ Library
+ transformers-compat >= 0.4 && < 0.6,
+ parsec >= 3.1 && < 3.2,
+ fgl >= 5.5.0.1 && < 5.6,
+- graphviz >= 2999.17.0.1 && < 2999.19,
++ graphviz >= 2999.17.0.1 && < 2999.20,
+ html >= 1.0.1.2 && < 1.1,
+ filepath >= 1.3.0.1 && < 1.5.0.0,
+ haskeline >= 0.6.3 && < 0.8,
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index ff032871af21..9a0ca9723fa4 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default-class
-PORTVERSION= 0.0.1
-PORTREVISION= 7
+PORTVERSION= 0.1.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-class/distinfo b/devel/hs-data-default-class/distinfo
index 31fd528a0f3d..464fd1fafb02 100644
--- a/devel/hs-data-default-class/distinfo
+++ b/devel/hs-data-default-class/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-class-0.0.1.tar.gz) = adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31
-SIZE (cabal/data-default-class-0.0.1.tar.gz) = 1461
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
+SIZE (cabal/data-default-class-0.1.2.0.tar.gz) = 2522
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index bec4750fbc4a..8f046f7753fb 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default-instances-base
-PORTVERSION= 0.0.1
-PORTREVISION= 7
+PORTVERSION= 0.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/distinfo b/devel/hs-data-default-instances-base/distinfo
index ac501b02ff33..92eddcf0b843 100644
--- a/devel/hs-data-default-instances-base/distinfo
+++ b/devel/hs-data-default-instances-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-instances-base-0.0.1.tar.gz) = eb12ff0174ae1fe2613058b87d0752f94e64df9a9bf971780c2e24bf0cb662a0
-SIZE (cabal/data-default-instances-base-0.0.1.tar.gz) = 1930
+TIMESTAMP = 1499627830
+SHA256 (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 844fe453f674b6b0998da804465914abce8936c5e640d8bb8bff37ad07d7a17a
+SIZE (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 1554
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 70d45256768c..3294b52f7c02 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/distinfo b/devel/hs-data-default-instances-containers/distinfo
index 67aacc61da1d..6576bb357d2a 100644
--- a/devel/hs-data-default-instances-containers/distinfo
+++ b/devel/hs-data-default-instances-containers/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
SIZE (cabal/data-default-instances-containers-0.0.1.tar.gz) = 1659
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index f86cd4604227..76628997145a 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/distinfo b/devel/hs-data-default-instances-dlist/distinfo
index f62a64d50b1e..fa9fd22b9699 100644
--- a/devel/hs-data-default-instances-dlist/distinfo
+++ b/devel/hs-data-default-instances-dlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
SIZE (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 1503
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 9da6291cfec6..a9fb775eaf74 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/distinfo b/devel/hs-data-default-instances-old-locale/distinfo
index 475d09844e98..16f3c50a4a6d 100644
--- a/devel/hs-data-default-instances-old-locale/distinfo
+++ b/devel/hs-data-default-instances-old-locale/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
SIZE (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 5266420f2c68..5ee16ba88fdc 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default
-PORTVERSION= 0.5.3
-PORTREVISION= 7
+PORTVERSION= 0.7.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default/distinfo b/devel/hs-data-default/distinfo
index 46c14a4b1a21..dce4860a7ea1 100644
--- a/devel/hs-data-default/distinfo
+++ b/devel/hs-data-default/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-0.5.3.tar.gz) = ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034
-SIZE (cabal/data-default-0.5.3.tar.gz) = 1623
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
+SIZE (cabal/data-default-0.7.1.1.tar.gz) = 1627
diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile
new file mode 100644
index 000000000000..d1481a6d3f71
--- /dev/null
+++ b/devel/hs-data-endian/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-endian
+PORTVERSION= 0.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Endian-sensitive data
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-endian/distinfo b/devel/hs-data-endian/distinfo
new file mode 100644
index 000000000000..b983e0971148
--- /dev/null
+++ b/devel/hs-data-endian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501335045
+SHA256 (cabal/data-endian-0.1.1.tar.gz) = 8c1d4f30374f8331d31f4d7c6b39284331b6b9436e7b50f86547417bd05f2ac0
+SIZE (cabal/data-endian-0.1.1.tar.gz) = 2788
diff --git a/devel/hs-data-endian/pkg-descr b/devel/hs-data-endian/pkg-descr
new file mode 100644
index 000000000000..8e9be44da194
--- /dev/null
+++ b/devel/hs-data-endian/pkg-descr
@@ -0,0 +1,3 @@
+This package provides helpers for converting endian-sensitive data.
+
+WWW: https://github.com/mvv/data-endian
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index 7ebe7dedcbe2..079a44a215b0 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-hash
PORTVERSION= 0.2.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
index 9f44700516fb..8e75d5aff7b2 100644
--- a/devel/hs-data-hash/distinfo
+++ b/devel/hs-data-hash/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-hash-0.2.0.1.tar.gz) = 9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe
SIZE (cabal/data-hash-0.2.0.1.tar.gz) = 8504
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
index 3d7e5e71c198..723703f4aac0 100644
--- a/devel/hs-data-ordlist/Makefile
+++ b/devel/hs-data-ordlist/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-ordlist
PORTVERSION= 0.4.7.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-ordlist/distinfo b/devel/hs-data-ordlist/distinfo
index 84fbd37ceec0..bb7c22be6541 100644
--- a/devel/hs-data-ordlist/distinfo
+++ b/devel/hs-data-ordlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-ordlist-0.4.7.0.tar.gz) = 6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d
SIZE (cabal/data-ordlist-0.4.7.0.tar.gz) = 8906
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index 5935bd598519..bc9aea80728e 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= data-pprint
-PORTVERSION= 0.2.4
+PORTVERSION= 0.2.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Prettyprint and compare Data values
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 parallel>=3.1
+USE_CABAL= mtl parallel
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index cc583500b7e0..eff54157f627 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-pprint-0.2.4.tar.gz) = 659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864
-SIZE (cabal/data-pprint-0.2.4.tar.gz) = 10112
+TIMESTAMP = 1499448153
+SHA256 (cabal/data-pprint-0.2.4.1.tar.gz) = 0c06aae83e1e41883927fbaa008964acd7d6b005a0f7e44c95fa5062943e0f83
+SIZE (cabal/data-pprint-0.2.4.1.tar.gz) = 10117
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
new file mode 100644
index 000000000000..a63eb3a49419
--- /dev/null
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -0,0 +1,10 @@
+--- data-pprint.cabal.orig 2017-07-10 15:51:41 UTC
++++ data-pprint.cabal
+@@ -72,6 +72,6 @@ library
+ pretty >= 1.0 && < 1.2,
+ mtl >= 2.0 && < 2.3,
+ deepseq >= 1.1 && < 1.5,
+- time >= 1.2 && < 1.6,
++ time >= 1.2 && < 1.7,
+ parallel >= 3.1 && < 3.3
+
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 1dda19d3ff04..1cb954ca3af3 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-date-cache/distinfo b/devel/hs-date-cache/distinfo
index 5bf3401bd783..0a4b730b040f 100644
--- a/devel/hs-date-cache/distinfo
+++ b/devel/hs-date-cache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
SHA256 (cabal/date-cache-0.3.0.tar.gz) = abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f
SIZE (cabal/date-cache-0.3.0.tar.gz) = 2126
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 583939a50a2d..c3bfc1c8cabe 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,6 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index 67c44c65626e..f1b398b13494 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
SHA256 (cabal/datetime-0.3.1.tar.gz) = 333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a
SIZE (cabal/datetime-0.3.1.tar.gz) = 15071
diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile
new file mode 100644
index 000000000000..bd04b57d9d51
--- /dev/null
+++ b/devel/hs-dbus/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= dbus
+PORTVERSION= 0.10.13
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A client library for the D-Bus IPC system
+
+LICENSE= GPLv3
+
+USE_CABAL= cereal libxml-sax network parsec random text vector xml-types
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-dbus/distinfo b/devel/hs-dbus/distinfo
new file mode 100644
index 000000000000..14245bed4930
--- /dev/null
+++ b/devel/hs-dbus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501342515
+SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca
+SIZE (cabal/dbus-0.10.13.tar.gz) = 75603
diff --git a/devel/hs-dbus/pkg-descr b/devel/hs-dbus/pkg-descr
new file mode 100644
index 000000000000..4b968c71b5b2
--- /dev/null
+++ b/devel/hs-dbus/pkg-descr
@@ -0,0 +1,13 @@
+D-Bus is a simple, message-based protocol for inter-process communication,
+which allows applications to interact with other parts of the machine and the
+user's session using remote procedure calls.
+
+D-Bus is a essential part of the modern Linux desktop, where it replaces
+earlier protocols such as CORBA and DCOP.
+
+This library is an implementation of the D-Bus protocol in Haskell. It can be
+used to add D-Bus support to Haskell applications, without the awkward
+interfaces common to foreign bindings.
+
+WWW: https://github.com/rblaze/haskell-dbus#readme
+
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index c7ef01f26245..8b9dac1701f1 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= deepseq-generics
-PORTVERSION= 0.1.1.2
+PORTVERSION= 0.2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
index 5359067853f9..f344190f38b7 100644
--- a/devel/hs-deepseq-generics/distinfo
+++ b/devel/hs-deepseq-generics/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/deepseq-generics-0.1.1.2.tar.gz) = 839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06
-SIZE (cabal/deepseq-generics-0.1.1.2.tar.gz) = 5304
+TIMESTAMP = 1499444756
+SHA256 (cabal/deepseq-generics-0.2.0.0.tar.gz) = b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d
+SIZE (cabal/deepseq-generics-0.2.0.0.tar.gz) = 5192
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
deleted file mode 100644
index 0245d5386535..000000000000
--- a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- deepseq-generics.cabal.orig 2014-12-17 12:16:47 UTC
-+++ deepseq-generics.cabal
-@@ -42,7 +42,7 @@ source-repository head
- library
- default-language: Haskell2010
- exposed-modules: Control.DeepSeq.Generics
-- build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.4, deepseq >= 1.2.0.1 && < 1.5
-+ build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.5, 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 e9d095a13975..c5b152b8bb86 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= directory-tree
-PORTVERSION= 0.12.0
-PORTREVISION= 2
+PORTVERSION= 0.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/distinfo b/devel/hs-directory-tree/distinfo
index 27ecf8e3d60c..b736767ddc50 100644
--- a/devel/hs-directory-tree/distinfo
+++ b/devel/hs-directory-tree/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/directory-tree-0.12.0.tar.gz) = ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5
-SIZE (cabal/directory-tree-0.12.0.tar.gz) = 12024
+TIMESTAMP = 1499627831
+SHA256 (cabal/directory-tree-0.12.1.tar.gz) = e2084495b3a226cf54d949635c86fc14e89daa09d86cce39e3c3cf898ae6e517
+SIZE (cabal/directory-tree-0.12.1.tar.gz) = 12261
diff --git a/devel/hs-directory/distinfo b/devel/hs-directory/distinfo
deleted file mode 100644
index 68dd5f329300..000000000000
--- a/devel/hs-directory/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486844627
-SHA256 (cabal/directory-1.3.0.1.tar.gz) = b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c
-SIZE (cabal/directory-1.3.0.1.tar.gz) = 69401
diff --git a/devel/hs-directory/pkg-descr b/devel/hs-directory/pkg-descr
deleted file mode 100644
index 734cb0047d97..000000000000
--- a/devel/hs-directory/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This library provides a basic set of operations for manipulating files
-and directories in a portable way.
-
-WWW: https://github.com/haskell/directory
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index fd05f71049e9..9458168704d2 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dlist-instances
-PORTVERSION= 0.1
-PORTREVISION= 2
+PORTVERSION= 0.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/distinfo b/devel/hs-dlist-instances/distinfo
index 315dc4394517..7d69d5afb950 100644
--- a/devel/hs-dlist-instances/distinfo
+++ b/devel/hs-dlist-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-instances-0.1.tar.gz) = 2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264
-SIZE (cabal/dlist-instances-0.1.tar.gz) = 1676
+TIMESTAMP = 1499459956
+SHA256 (cabal/dlist-instances-0.1.1.1.tar.gz) = d14a10c06f52fb412b2c1066d729f5534aa43204221e7ba7d81d935c44ce4f5b
+SIZE (cabal/dlist-instances-0.1.1.1.tar.gz) = 1749
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 6288b3521685..fff9b0a721ea 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.7.1.1
+PORTVERSION= 0.8.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index a41378fd3338..c6c49fd409be 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-0.7.1.1.tar.gz) = 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd
-SIZE (cabal/dlist-0.7.1.1.tar.gz) = 6161
+TIMESTAMP = 1499627832
+SHA256 (cabal/dlist-0.8.0.3.tar.gz) = 876782c96957ff480863effb33878f48dd55de7fa64d036e12bf1fbd49542f2f
+SIZE (cabal/dlist-0.8.0.3.tar.gz) = 8596
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
index 1c0a16c6afc2..b9415c7970a1 100644
--- a/devel/hs-easy-file/Makefile
+++ b/devel/hs-easy-file/Makefile
@@ -2,6 +2,7 @@
PORTNAME= easy-file
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-easy-file/distinfo b/devel/hs-easy-file/distinfo
index 442be3eb075b..2cd4b787e652 100644
--- a/devel/hs-easy-file/distinfo
+++ b/devel/hs-easy-file/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
SHA256 (cabal/easy-file-0.2.1.tar.gz) = ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c
SIZE (cabal/easy-file-0.2.1.tar.gz) = 12610
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index e383af325ba3..e63ee6759f9a 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,6 +2,7 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index 85c64552e7f2..f42daab8bbd8 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
SHA256 (cabal/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a
SIZE (cabal/edit-distance-0.2.2.1.tar.gz) = 13228
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 95f7c319a0bd..02b6daea9eb2 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 4.4.1
+PORTVERSION= 4.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Either monad transformer
LICENSE= BSD3CLAUSE
-USE_CABAL= exceptions>=0.5 free>=4.9 mmorph>=1.0.0 monad-control>=0.3.2 \
- MonadRandom>=0.1 mtl>=2.0 profunctors>=4 semigroupoids>=4 \
- semigroups>=0.8.3.1 transformers-base>=0.4
+USE_CABAL= bifunctors exceptions free mmorph monad-control \
+ MonadRandom mtl profunctors semigroupoids semigroups \
+ transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 84bef2727732..69815b6ae8a3 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/either-4.4.1.tar.gz) = 91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb
-SIZE (cabal/either-4.4.1.tar.gz) = 9243
+TIMESTAMP = 1499627832
+SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3
+SIZE (cabal/either-4.4.1.1.tar.gz) = 9376
diff --git a/devel/hs-either/files/patch-either.cabal b/devel/hs-either/files/patch-either.cabal
new file mode 100644
index 000000000000..ab50ef682130
--- /dev/null
+++ b/devel/hs-either/files/patch-either.cabal
@@ -0,0 +1,14 @@
+--- either.cabal.orig 2017-07-10 15:15:32 UTC
++++ either.cabal
+@@ -32,9 +32,9 @@ library
+ exceptions >= 0.5 && < 0.9,
+ free >= 4.9 && < 5,
+ monad-control >= 0.3.2 && < 1.1,
+- MonadRandom >= 0.1 && < 0.5,
++ MonadRandom >= 0.1 && < 0.6,
+ mtl >= 2.0 && < 2.3,
+- mmorph >= 1.0.0 && < 1.1,
++ mmorph >= 1.0.0 && < 1.2,
+ profunctors >= 4 && < 6,
+ semigroups >= 0.8.3.1 && < 1,
+ semigroupoids >= 4 && < 6,
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index d2306d4a23e7..64c65d434316 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= enclosed-exceptions
-PORTVERSION= 1.0.1.1
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
index bd569bcf8f0c..a459aca75509 100644
--- a/devel/hs-enclosed-exceptions/distinfo
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99
-SIZE (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = 4566
+TIMESTAMP = 1499627832
+SHA256 (cabal/enclosed-exceptions-1.0.2.tar.gz) = 7b9beab82d219c0dd879dfdef70fb74a4a7595b4dbd0baf7adb12cdbbe8189f1
+SIZE (cabal/enclosed-exceptions-1.0.2.tar.gz) = 5266
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index 78876b4978e5..c50501fad3ca 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.20
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/distinfo b/devel/hs-enumerator/distinfo
index c1f9e82e96b9..11f76a64f017 100644
--- a/devel/hs-enumerator/distinfo
+++ b/devel/hs-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
SHA256 (cabal/enumerator-0.4.20.tar.gz) = 33e21054352bb579e8db8697256ff3c61b3dc862c567f9e0fc2509f95e2b4709
SIZE (cabal/enumerator-0.4.20.tar.gz) = 53986
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index eaa20d8e958a..f8816a8caa53 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= equivalence
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 9349edba452b..0851897e619b 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/equivalence-0.3.1.tar.gz) = 7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e
-SIZE (cabal/equivalence-0.3.1.tar.gz) = 8350
+TIMESTAMP = 1499627833
+SHA256 (cabal/equivalence-0.3.2.tar.gz) = 7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529
+SIZE (cabal/equivalence-0.3.2.tar.gz) = 8378
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index a5029c309957..98059612584a 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 2.0.0
+PORTVERSION= 2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Simplified error-handling
LICENSE= BSD3CLAUSE
-USE_CABAL= safe>=0.3.3
+USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index f846ddacfef6..0a965efdc044 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/errors-2.0.0.tar.gz) = 4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703
-SIZE (cabal/errors-2.0.0.tar.gz) = 8051
+TIMESTAMP = 1499451104
+SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531
+SIZE (cabal/errors-2.2.1.tar.gz) = 8821
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index 383bf7f826b3..04af10620e39 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= exceptions
-PORTVERSION= 0.8.0.2
+PORTVERSION= 0.8.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Extensible optionally-pure exceptions
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 stm>=2.2 transformers-compat>=0.3
+USE_CABAL= mtl stm transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index 7e311699bb69..da74124de563 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/exceptions-0.8.0.2.tar.gz) = 070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4
-SIZE (cabal/exceptions-0.8.0.2.tar.gz) = 12241
+TIMESTAMP = 1499444351
+SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be
+SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 43687062a78c..8d8ba3046664 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extensible-exceptions/distinfo b/devel/hs-extensible-exceptions/distinfo
index ff89f15c5a1f..e3594b520253 100644
--- a/devel/hs-extensible-exceptions/distinfo
+++ b/devel/hs-extensible-exceptions/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627833
SHA256 (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
SIZE (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 8531
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
index 848f063aec9e..87b00eb94a88 100644
--- a/devel/hs-extra/Makefile
+++ b/devel/hs-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= extra
-PORTVERSION= 1.4.1
+PORTVERSION= 1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Extra functions
LICENSE= BSD3CLAUSE
+USE_CABAL= clock
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
index 10c9ac0cd146..a58102038407 100644
--- a/devel/hs-extra/distinfo
+++ b/devel/hs-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/extra-1.4.1.tar.gz) = e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001
-SIZE (cabal/extra-1.4.1.tar.gz) = 31235
+TIMESTAMP = 1499627833
+SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df
+SIZE (cabal/extra-1.6.tar.gz) = 36369
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 41139b293b1e..936d5e68ed8a 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Fast logging system
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update>=0.1.2 text
+USE_CABAL= auto-update easy-file old-locale text unix-time
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo
index 1e2a7ada305f..c05e4df04faa 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fast-logger-2.4.1.tar.gz) = e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e
-SIZE (cabal/fast-logger-2.4.1.tar.gz) = 6211
+TIMESTAMP = 1499627834
+SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d
+SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537
diff --git a/devel/hs-fast-logger/files/patch-fast-logger.cabal b/devel/hs-fast-logger/files/patch-fast-logger.cabal
deleted file mode 100644
index 3f9ce7c18d0b..000000000000
--- a/devel/hs-fast-logger/files/patch-fast-logger.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- fast-logger.cabal.orig 2015-07-06 02:52:26 UTC
-+++ fast-logger.cabal
-@@ -23,7 +23,6 @@ Library
- , array
- , auto-update >= 0.1.2
- , bytestring
-- , bytestring-builder
- , directory
- , filepath
- , text
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 937cd5b6a9cc..16b615ea6277 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.5.2.1
+PORTVERSION= 5.5.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 42f437b83f82..917f6f6c0665 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fgl-5.5.2.1.tar.gz) = 0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9
-SIZE (cabal/fgl-5.5.2.1.tar.gz) = 51963
+TIMESTAMP = 1499541554
+SHA256 (cabal/fgl-5.5.3.1.tar.gz) = dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c
+SIZE (cabal/fgl-5.5.3.1.tar.gz) = 54868
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index ccc2968879e8..d8525e5c22a7 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.9
+PORTVERSION= 0.0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 1f6cd82e6aca..d3031a0c3178 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/file-embed-0.0.9.tar.gz) = 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005
-SIZE (cabal/file-embed-0.0.9.tar.gz) = 5624
+TIMESTAMP = 1499627834
+SHA256 (cabal/file-embed-0.0.10.tar.gz) = f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711
+SIZE (cabal/file-embed-0.0.10.tar.gz) = 6247
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 5b1dd783e572..96596b5cf345 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,6 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 6ea50035080f..ab907943273d 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627834
SHA256 (cabal/filemanip-0.3.6.3.tar.gz) = 8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846
SIZE (cabal/filemanip-0.3.6.3.tar.gz) = 10369
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index 6fcbe68cd90c..0ccba25d07b0 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.1
+PORTVERSION= 0.6.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index df9d1c96775d..6088cc20a8d7 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/filestore-0.6.1.tar.gz) = 0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455
-SIZE (cabal/filestore-0.6.1.tar.gz) = 31837
+TIMESTAMP = 1499627835
+SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de
+SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776
diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile
new file mode 100644
index 000000000000..8e2edd4e1090
--- /dev/null
+++ b/devel/hs-fmlist/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= fmlist
+PORTVERSION= 0.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= FoldMap lists are lists represented by their foldMap function
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-fmlist/distinfo b/devel/hs-fmlist/distinfo
new file mode 100644
index 000000000000..dea77335835d
--- /dev/null
+++ b/devel/hs-fmlist/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719989
+SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf
+SIZE (cabal/fmlist-0.9.tar.gz) = 4256
diff --git a/devel/hs-fmlist/pkg-descr b/devel/hs-fmlist/pkg-descr
new file mode 100644
index 000000000000..6ba34e535217
--- /dev/null
+++ b/devel/hs-fmlist/pkg-descr
@@ -0,0 +1,6 @@
+FoldMap lists are lists represented by their foldMap function. FoldMap lists
+have O(1) cons, snoc and append, just like DLists, but other operations might
+have favorable performance characteristics as well. These wild claims are
+still completely unverified though.
+
+WWW: http://hackage.haskell.org/package/fmlist
diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile
new file mode 100644
index 000000000000..d0672ee1950f
--- /dev/null
+++ b/devel/hs-foundation/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= foundation
+PORTVERSION= 0.0.13
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A custom prelude with no dependencies apart from base
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo
new file mode 100644
index 000000000000..59ee0c7dfef8
--- /dev/null
+++ b/devel/hs-foundation/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499627835
+SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f
+SIZE (cabal/foundation-0.0.13.tar.gz) = 221540
diff --git a/devel/hs-foundation/pkg-descr b/devel/hs-foundation/pkg-descr
new file mode 100644
index 000000000000..38f7cc1da12d
--- /dev/null
+++ b/devel/hs-foundation/pkg-descr
@@ -0,0 +1,12 @@
+This package has the following goals:
+ * provide a base like sets of modules that provide a consistent set of
+ features and bugfixes across multiple versions of GHC (unlike base).
+ * provide a better and more efficient prelude than base's prelude.
+ * be self-sufficient: no external dependencies apart from base.
+ * provide better data-types: packed unicode string by default, arrays.
+ * Better numerical classes that better represent mathematical thing
+ (No more all-in-one Num).
+ * Better I/O system with less Lazy IO
+ * Usual partial functions distinguished through type system
+
+WWW: https://hackage.haskell.org/package/foundation
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index 86194dcc6b5b..f31e8aa1f1f8 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= free
-PORTVERSION= 4.12.1
+PORTVERSION= 4.12.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index e523078645db..c6c9e393deaf 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/free-4.12.1.tar.gz) = 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b
-SIZE (cabal/free-4.12.1.tar.gz) = 49736
+TIMESTAMP = 1499627836
+SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784
+SIZE (cabal/free-4.12.4.tar.gz) = 50601
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 72bad04d3bd3..f22d1147ab6f 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fsnotify
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 1dc69d4078a9..728dfcc0bee5 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627836
SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 365f10509d37..b6c423b1eb77 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gconf
-PORTVERSION= 0.13.0.2
+PORTVERSION= 0.13.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index bccf100b122d..df39899b5024 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gconf-0.13.0.2.tar.gz) = 930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77
-SIZE (cabal/gconf-0.13.0.2.tar.gz) = 35926
+TIMESTAMP = 1499627837
+SHA256 (cabal/gconf-0.13.1.0.tar.gz) = 57cfa606ef4dcd377e0d77d59b880439382ad05604b3e3d439fd64af64a21dad
+SIZE (cabal/gconf-0.13.1.0.tar.gz) = 26625
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 380256201b95..3b887cf735f7 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.8.0
+PORTVERSION= 1.11.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 4cfb6fb27f08..f17dac442933 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/generic-deriving-1.8.0.tar.gz) = 26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd
-SIZE (cabal/generic-deriving-1.8.0.tar.gz) = 29935
+TIMESTAMP = 1499450572
+SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9
+SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546
diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile
index 4ff286881e57..814151f860a4 100644
--- a/devel/hs-geniplate-mirror/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= geniplate-mirror
-PORTVERSION= 0.7.1
+PORTVERSION= 0.7.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
index 4cf96ad95c03..4559e257c665 100644
--- a/devel/hs-geniplate-mirror/distinfo
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/geniplate-mirror-0.7.1.tar.gz) = 60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773
-SIZE (cabal/geniplate-mirror-0.7.1.tar.gz) = 9259
+TIMESTAMP = 1499447732
+SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f
+SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index e3bc987a88bd..89d9af661f0b 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.4.4.0
+PORTVERSION= 0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 49f97900fc31..d5b8b4ab4904 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ghc-events-0.4.4.0.tar.gz) = ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d
-SIZE (cabal/ghc-events-0.4.4.0.tar.gz) = 102944
+TIMESTAMP = 1499451126
+SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769
+SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 826d267f8f6f..f0e411ca3b3c 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index 9c319377b28e..61739ae5260f 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
SHA256 (cabal/ghc-mtl-1.2.1.0.tar.gz) = 934e36c03ae0cbf59d6eb6d626983a3e520c6101417284b0a652db74e333d940
SIZE (cabal/ghc-mtl-1.2.1.0.tar.gz) = 2963
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 0bcd5f8de789..8ee5773961d1 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo
index fd8cca66f7c9..46b995f709f4 100644
--- a/devel/hs-ghc-paths/distinfo
+++ b/devel/hs-ghc-paths/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
SHA256 (cabal/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945
SIZE (cabal/ghc-paths-0.1.0.9.tar.gz) = 2402
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 5c4930c27273..c3c3acd505fc 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gio
-PORTVERSION= 0.13.1.0
+PORTVERSION= 0.13.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index 67620fc1577e..ab8dd7804ffd 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gio-0.13.1.0.tar.gz) = b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3
-SIZE (cabal/gio-0.13.1.0.tar.gz) = 79367
+TIMESTAMP = 1499627838
+SHA256 (cabal/gio-0.13.3.1.tar.gz) = ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827
+SIZE (cabal/gio-0.13.3.1.tar.gz) = 70058
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 95ef2c76d532..b43f5b8b0c8d 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 5.20150727
-PORTREVISION= 1
+PORTVERSION= 6.20170520
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,17 +10,52 @@ COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-USE_CABAL= optparse-applicative>=0.10 cryptohash>=0.11.0 exceptions>=0.6 \
- QuickCheck>=2.1 stm>=2.3 mtl>=2 data-default case-insensitive \
- uuid random dlist unix-compat SafeSemaphore async IfElse \
- MissingH hslogger monad-logger utf8-string text sandi json \
- monad-control bloomfilter edit-distance resourcet aws>=0.9.2 \
- http-conduit http-types network>=2.6 network-uri>=2.6
+USE_CABAL= hslogger split IfElse QuickCheck SafeSemaphore bloomfilter \
+ concurrent-output disk-free-space edit-distance esqueleto \
+ feed magic network persistent-sqlite regex-tdfa sandi \
+ torrent uuid
USES= gmake perl5
USE_PERL5= build
-MAN1PAGES= git-annex.1 git-annex-shell.1
+MAN1PAGES= git-annex-add.1 git-annex-expire.1 git-annex-lookupkey.1 \
+ git-annex-remotedaemon.1 git-annex-ungroup.1 \
+ git-annex-addunused.1 git-annex-find.1 git-annex-map.1 \
+ git-annex-repair.1 git-annex-uninit.1 git-annex-addurl.1 \
+ git-annex-findref.1 git-annex-matchexpression.1 \
+ git-annex-required.1 git-annex-unlock.1 git-annex-adjust.1 \
+ git-annex-fix.1 git-annex-matching-options.1 \
+ git-annex-resolvemerge.1 git-annex-untrust.1 \
+ git-annex-assistant.1 git-annex-forget.1 git-annex-merge.1 \
+ git-annex-rmurl.1 git-annex-unused.1 git-annex-calckey.1 \
+ git-annex-fromkey.1 git-annex-metadata.1 git-annex-schedule.1 \
+ git-annex-upgrade.1 git-annex-checkpresentkey.1 \
+ git-annex-fsck.1 git-annex-migrate.1 git-annex-semitrust.1 \
+ git-annex-vadd.1 git-annex-contentlocation.1 \
+ git-annex-fuzztest.1 git-annex-mirror.1 git-annex-setkey.1 \
+ git-annex-vcycle.1 git-annex-copy.1 git-annex-get.1 \
+ git-annex-move.1 git-annex-setpresentkey.1 \
+ git-annex-version.1 git-annex-dead.1 git-annex-group.1 \
+ git-annex-multicast.1 git-annex-shell.1 git-annex-vfilter.1 \
+ git-annex-describe.1 git-annex-groupwanted.1 \
+ git-annex-numcopies.1 git-annex-smudge.1 git-annex-vicfg.1 \
+ git-annex-diffdriver.1 git-annex-import.1 git-annex-p2p.1 \
+ git-annex-status.1 git-annex-view.1 git-annex-direct.1 \
+ git-annex-importfeed.1 git-annex-pre-commit.1 \
+ git-annex-sync.1 git-annex-vpop.1 git-annex-drop.1 \
+ git-annex-indirect.1 git-annex-preferred-content.1 \
+ git-annex-test.1 git-annex-wanted.1 git-annex-dropkey.1 \
+ git-annex-info.1 git-annex-proxy.1 git-annex-testremote.1 \
+ git-annex-watch.1 git-annex-dropunused.1 git-annex-init.1 \
+ git-annex-readpresentkey.1 git-annex-transferkey.1 \
+ git-annex-webapp.1 git-annex-edit.1 git-annex-initremote.1 \
+ git-annex-registerurl.1 git-annex-transferkeys.1 \
+ git-annex-whereis.1 git-annex-enable-tor.1 git-annex-list.1 \
+ git-annex-reinit.1 git-annex-trust.1 git-annex.1 \
+ git-annex-enableremote.1 git-annex-lock.1 \
+ git-annex-reinject.1 git-annex-unannex.1 \
+ git-remote-tor-annex.1 git-annex-examinekey.1 git-annex-log.1 \
+ git-annex-rekey.1 git-annex-undo.1
BUILD_DEPENDS+= rsync:net/rsync \
git:devel/git \
@@ -31,92 +65,45 @@ RUN_DEPENDS+= rsync:net/rsync \
git:devel/git \
gsha256sum:sysutils/coreutils
-EXECUTABLE= git-annex git-annex-shell
+EXECUTABLE= git-annex git-annex-shell git-remote-tor-annex
STANDALONE= yes
-FLAGS_DEFINE= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DESKTOPNOTIFY \
- TORRENTPARSER EKG DATABASE
-FLAGS_DEFAULT= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DATABASE
+FLAGS_DEFINE= S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION DBUS
+FLAGS_DEFAULT= S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION
S3_DESC= S3 support
S3_FLAG_ENABLE= S3
-S3_FLAG_CABAL= hS3
+S3_FLAG_CABAL= conduit conduit-extra aws
+
+WEBDAV_DESC= WebDAV support
+WEBDAV_FLAG_ENABLE= WebDAV
+WEBDAV_FLAG_CABAL= DAV
ASSISTANT_DESC= 'assistant' and 'watch' commands
ASSISTANT_FLAG_ENABLE= Assistant
-
-INOTIFY_DESC= File system notifications support
-INOTIFY_FLAG_ENABLE= Inotify
-INOTIFY_FLAG_CABAL= hinotify
+ASSISTANT_FLAG_CABAL= dns mountpoints hinotify
WEBAPP_DESC= Web application (requires assistant)
WEBAPP_FLAG_DEPENDS= ASSISTANT
WEBAPP_FLAG_ENABLE= Webapp
-WEBAPP_FLAG_CABAL= yesod>=1.2.6 yesod-static>=1.2.4 yesod-form>=1.3.15 \
- yesod-core>=1.2.19 path-pieces>=0.1.4 warp>=3.0.05 \
- warp-tls wai wai-extra blaze-builder crypto-api \
- clientsession aeson shakespeare>=2.0.0
-
-WEBAPP_SECURE_DESC= Secure webapp (requires webbapp)
-WEBAPP_SECURE_FLAG_DEPENDS= WEBAPP
-WEBAPP_SECURE_FLAG_ENABLE= Webapp-secure
-WEBAPP_SECURE_FLAG_CABAL= warp-tls>=1.4 securemem byteable
+WEBAPP_FLAG_CABAL= yesod yesod-static yesod-form yesod-core path-pieces \
+ warp warp-tls wai wai-extra blaze-builder \
+ clientsession shakespeare
PAIRING_DESC= Enable pairing (requires web application)
PAIRING_FLAG_DEPENDS= WEBAPP
PAIRING_FLAG_ENABLE= Pairing
PAIRING_FLAG_CABAL= network-multicast network-info
-XMPP_DESC= Enable notifications using XMPP (requires assistant)
-XMPP_FLAG_DEPENDS= ASSISTANT
-XMPP_FLAG_ENABLE= XMPP
-XMPP_FLAG_CABAL= gnutls>=0.1.4 network-protocol-xmpp xml-types
-
-DNS_DESC= Use the DNS library for lookups (requires XMPP)
-DNS_FLAG_DEPENDS= ASSISTANT XMPP
-DNS_FLAG_ENABLE= DNS
-DNS_FLAG_CABAL= dns
-
PRODUCTION_DESC= Production build
PRODUCTION_FLAG_ENABLE= Production
-TDFA_DESC= Use regex-tdfa for wildcards
-TDFA_FLAG_ENABLE= TDFA
-TDFA_FLAG_CABAL= regex-tdfa
-
-WEBDAV_DESC= WebDAV support
-WEBDAV_FLAG_ENABLE= WebDAV
-WEBDAV_FLAG_CABAL= DAV>=0.3 http-conduit xml-conduit http-types
-
-FEED_DESC= Podcast feed support
-FEED_FLAG_ENABLE= Feed
-FEED_FLAG_CABAL= feed
-
-QUVI_DESC= quvi to download videos
-QUVI_FLAG_ENABLE= Quvi
-QUVI_FLAG_CABAL= aeson
-
-TAHOE_DESC= Tahoe special remote
-TAHOE_FLAG_ENABLE= Tahoe
-TAHOE_FLAG_CABAL= aeson
-
-DESKTOPNOTIFY_DESC= Desktop environment notifications
-DESKTOPNOTIFY_FLAG_ENABLE= DesktopNotify
-
-TORRENTPARSER_DESC= Use haskell torrent library to parse torrent files
-TORRENTPARSER_FLAG_ENABLE= TorrentParser
-TORRENTPARSER_FLAG_CABAL= torrent>=10000.0.0
-
-EKG_DESC= EKG for run-time monitoring
-EKG_FLAG_ENABLE= EKG
-EKG_FLAG_CABAL= ekg
+DBUS_DESC= Dbus support
+DBUS_FLAG_ENABLE= Dbus
+DBUS_FLAG_CABAL= dbus fdo-notify
-DATABASE_DESC= Build with persistent for database use
-DATABASE_FLAG_ENABLE= Database
-DATABASE_FLAG_CABAL= esqueleto persistent-sqlite persistent \
- persistent-template
+FLAGS_ENABLE= ConcurrentOutput TorrentParser MagicMime
+FLAGS_DISABLE= Benchmark TestSuite Android AndroidSplice
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index 1cc0fbc15a2b..001933951e4b 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/git-annex-5.20150727.tar.gz) = 9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f
-SIZE (cabal/git-annex-5.20150727.tar.gz) = 5095110
+TIMESTAMP = 1499627839
+SHA256 (cabal/git-annex-6.20170520.tar.gz) = f8cf9b44172ce1914c8be8134795c4197d02960b81a2ba596712cbd35e002717
+SIZE (cabal/git-annex-6.20170520.tar.gz) = 1124314
diff --git a/devel/hs-git-annex/files/patch-Build__Configure.hs b/devel/hs-git-annex/files/patch-Build__Configure.hs
index ea06e561b749..4a60a71ad332 100644
--- a/devel/hs-git-annex/files/patch-Build__Configure.hs
+++ b/devel/hs-git-annex/files/patch-Build__Configure.hs
@@ -1,6 +1,6 @@
---- ./Build/Configure.hs.orig 2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/Configure.hs 2014-07-13 15:15:00.000000000 +0200
-@@ -68,7 +68,7 @@
+--- Build/Configure.hs.orig 2017-06-12 17:56:05 UTC
++++ Build/Configure.hs
+@@ -75,7 +75,7 @@ shaTestCases l = map make l
else search cmds
shacmds n = concatMap (\x -> [x, 'g':x]) $
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
index 5a5352bc2d4a..8290342bfff3 100644
--- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
+++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
@@ -1,14 +1,14 @@
---- ./Build/DesktopFile.hs.orig 2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/DesktopFile.hs 2014-07-13 01:40:51.000000000 +0200
-@@ -25,6 +25,7 @@
+--- Build/DesktopFile.hs.orig 2017-06-12 17:56:05 UTC
++++ Build/DesktopFile.hs
+@@ -25,6 +25,7 @@ import System.Environment
#ifndef mingw32_HOST_OS
import System.Posix.User
#endif
+import System.FilePath.Posix
import Data.Maybe
-
- systemwideInstall :: IO Bool
-@@ -48,12 +49,17 @@
+ import Control.Applicative
+ import Prelude
+@@ -50,12 +51,17 @@ writeFDODesktop :: FilePath -> IO ()
writeFDODesktop command = do
systemwide <- systemwideInstall
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index 9691658ad45f..1a01309521fa 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,45 +1,11 @@
---- Setup.hs.orig 2015-07-27 16:25:52 UTC
+--- Setup.hs.orig 2017-06-12 17:56:05 UTC
+++ Setup.hs
-@@ -23,6 +23,7 @@ main = defaultMainWithHooks simpleUserHo
- Configure.run Configure.tests
- return (Nothing, [])
- , postInst = myPostInst
-+ , postCopy = myPostCopy
- }
-
- myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-@@ -34,6 +35,15 @@ myPostInst _ (InstallFlags { installVerb
- dest = NoCopyDest
- verbosity = fromFlag installVerbosity
-
-+myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-+myPostCopy _ (CopyFlags { copyVerbosity, copyDest }) pkg lbi = do
-+ installGitAnnexShell dest verbosity pkg lbi
-+ installManpages dest verbosity pkg lbi
-+ installDesktopFile dest verbosity pkg lbi
-+ where
-+ dest = fromFlag copyDest
-+ verbosity = fromFlag copyVerbosity
-+
- installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
- installGitAnnexShell copyDest verbosity pkg lbi =
- rawSystemExit verbosity "ln"
-@@ -50,14 +60,14 @@ installManpages :: CopyDest -> Verbosity
+@@ -54,7 +54,7 @@ installManpages :: CopyDest -> Verbosity -> PackageDes
installManpages copyDest verbosity pkg lbi =
installOrdinaryFiles verbosity dstManDir =<< srcManpages
where
- dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
+ dstManDir = prefix (absoluteInstallDirs pkg lbi copyDest) </> "man" </> "man1"
- srcManpages = zip (repeat srcManDir)
-- <$> filterM doesFileExist manpages
-- srcManDir = ""
-+ <$> filterM (doesFileExist . (srcManDir </>)) manpages
-+ srcManDir = "man"
- manpages = ["git-annex.1", "git-annex-shell.1"]
-
- installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
- installDesktopFile copyDest _verbosity pkg lbi =
- DesktopFile.install $ dstBinDir </> "git-annex"
- where
-- dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
-+ dstBinDir = bindir $ absoluteInstallDirs pkg lbi NoCopyDest
+ -- If mdwn2man fails, perhaps because perl is not available,
+ -- we just skip installing man pages.
+ srcManpages = zip (repeat "man") . map takeFileName . catMaybes
diff --git a/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
new file mode 100644
index 000000000000..28ecb91890cb
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
@@ -0,0 +1,12 @@
+--- Utility/QuickCheck.hs.orig 2017-06-12 17:56:05 UTC
++++ Utility/QuickCheck.hs
+@@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) w
+ instance Arbitrary POSIXTime where
+ arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+
+-instance Arbitrary EpochTime where
+- arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+-
+ {- Pids are never negative, or 0. -}
+ instance Arbitrary ProcessID where
+ arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
index fb102a057ff0..55604acd49d5 100644
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -1,10 +1,7 @@
---- git-annex.cabal.orig 2015-07-27 16:25:52 UTC
+--- git-annex.cabal.orig 2017-06-12 17:56:05 UTC
+++ git-annex.cabal
-@@ -218,9 +218,9 @@ Executable git-annex
- CPP-Options: -DANDROID_SPLICES
-
+@@ -446,7 +446,6 @@ Executable git-annex
if flag(Webapp)
-+ extensions: TemplateHaskell
Build-Depends:
yesod (>= 1.2.6),
- yesod-default (>= 1.2.0),
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
deleted file mode 100644
index 02dfba5c4c0e..000000000000
--- a/devel/hs-git-annex/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/xdg/autostart/git-annex.desktop
-share/applications/git-annex.desktop
-share/icons/hicolor/16x16/apps/git-annex.png
-share/icons/hicolor/scalable/apps/git-annex.svg
diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile
new file mode 100644
index 000000000000..1e1198b7d33a
--- /dev/null
+++ b/devel/hs-gitrev/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= gitrev
+PORTVERSION= 1.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compile git revision info into Haskell projects
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base-compat
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-gitrev/distinfo b/devel/hs-gitrev/distinfo
new file mode 100644
index 000000000000..a663b88ab8f5
--- /dev/null
+++ b/devel/hs-gitrev/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996936
+SHA256 (cabal/gitrev-1.3.1.tar.gz) = a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332
+SIZE (cabal/gitrev-1.3.1.tar.gz) = 3756
diff --git a/devel/hs-gitrev/pkg-descr b/devel/hs-gitrev/pkg-descr
new file mode 100644
index 000000000000..bb27b0d5b2a0
--- /dev/null
+++ b/devel/hs-gitrev/pkg-descr
@@ -0,0 +1,6 @@
+Some handy Template Haskell splices for including the current git hash and
+branch in the code of your project. Useful for including in panic messages,
+--version output, or diagnostic info for more informative bug reports.
+
+WWW: https://github.com/acfoltzer/gitrev
+
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index ee5031ec1322..33a1d38367a3 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.13.1.1
+PORTVERSION= 0.13.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 6d08348ce0c0..6012de34c7a7 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/glib-0.13.1.1.tar.gz) = e494b416ee7b80743af586edf5f7f497b4ce5eae6c070ec12b0e9ec5b99b43f1
-SIZE (cabal/glib-0.13.1.1.tar.gz) = 48228
+TIMESTAMP = 1499537811
+SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630
+SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 92e5cc4f557d..50c90a6be8ea 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.13.0.4
-PORTREVISION= 1
+PORTVERSION= 0.13.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +15,5 @@ USE_HAPPY= yes
EXECUTABLE= gtk2hsC2hs gtk2hsHookGenerator gtk2hsTypeGen
-STANDALONE= yes
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 02392bc17433..8f7d36f1bde7 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510
-SIZE (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 169272
+TIMESTAMP = 1499539633
+SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b
+SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
index f0400f06d69c..03e1bd95991a 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
@@ -1,4 +1,4 @@
---- c2hs/c/CAST.hs.orig 2017-03-21 18:15:30 UTC
+--- c2hs/c/CAST.hs.orig 2017-01-14 09:17:54 UTC
+++ c2hs/c/CAST.hs
@@ -1125,6 +1125,9 @@ instance Binary CStorageSpec where
put_ bh (CTypedef ae) = do
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
index b06fe7616609..9c1fbee08541 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
@@ -5,18 +5,9 @@ c2hs: C header contains errors:
The symbol `long' does not fit here.
*** Error code 1
---- c2hs/toplevel/C2HSConfig.hs.orig 2017-03-21 18:17:37 UTC
+--- c2hs/toplevel/C2HSConfig.hs.orig 2017-01-14 09:17:54 UTC
+++ c2hs/toplevel/C2HSConfig.hs
-@@ -64,14 +64,17 @@ cpp = case os of
- -- * `-x c' forces CPP to regard the input as C code; this option seems to be
- -- understood at least on Linux, FreeBSD, and Solaris and seems to make a
- -- difference over the default language setting on FreeBSD
-+--
-+-- * Pass -std=c99 as c2hs get's confused by the c11 parts in the FreeBSD
-+-- system headers.
- --
- -- * `-P' would suppress `#line' directives
- --
+@@ -70,8 +70,8 @@ cpp = case os of
cppopts :: [String]
cppopts = case (os,cpp) of
("openbsd","cpp") -> ["-xc", "-w"]
@@ -25,5 +16,5 @@ c2hs: C header contains errors:
+ (_,"cpp") -> ["-x", "c", "-w", "-std=c99"]
+ (_,"gcc") -> ["-E", "-x", "c", "-w", "-std=c99"]
_ -> []
-
+
-- C preprocessor option for including only definitions (EXPORTED)
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
index 2ec7d93b2459..9eb4dbe64326 100644
--- a/devel/hs-haddock-api/Makefile
+++ b/devel/hs-haddock-api/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-api
-PORTVERSION= 2.16.1
+PORTVERSION= 2.17.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
index 1d7a4bb3e6f2..0dbdea95c108 100644
--- a/devel/hs-haddock-api/distinfo
+++ b/devel/hs-haddock-api/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-api-2.16.1.tar.gz) = e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea
-SIZE (cabal/haddock-api-2.16.1.tar.gz) = 125372
+TIMESTAMP = 1499452541
+SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601
+SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index 49e1f3adf54d..91fcfde88b77 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.2.1
+PORTVERSION= 1.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 63fd398d1116..2723301ae1e4 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-library-1.2.1.tar.gz) = 0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056
-SIZE (cabal/haddock-library-1.2.1.tar.gz) = 38606
+TIMESTAMP = 1499448291
+SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b
+SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 97836694bc0b..17f2e5ce28a7 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.16.1
+PORTVERSION= 2.17.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 340a26fb4bb1..3191273deadb 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-2.16.1.tar.gz) = 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6
-SIZE (cabal/haddock-2.16.1.tar.gz) = 216323
+TIMESTAMP = 1499538938
+SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3
+SIZE (cabal/haddock-2.17.5.tar.gz) = 244683
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index f8193e05dd97..85fc89b4d9c7 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,2 +1,2 @@
-@exec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
-@unexec /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
+@postexec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
+@postunexec [ -f %%GHC_HADDOCK_CMD%% ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%% || rm -f %%HADDOCK%%
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 06a878c83f08..d18aebe2fe45 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.19.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index aa017607273a..03e89dcd0154 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
SHA256 (cabal/happy-1.19.5.tar.gz) = 62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da
SIZE (cabal/happy-1.19.5.tar.gz) = 159280
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 8748ce486135..d95e7842426f 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.3.3
+PORTVERSION= 1.2.6.1
PORTEPOCH= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.0.5
+USE_CABAL= text>=0.11.0.5 vector
FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41
FLAGS_DEFAULT= INTEGER_GMP SSE2
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 4afe612aab92..6ac7cd366364 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashable-1.2.3.3.tar.gz) = fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e
-SIZE (cabal/hashable-1.2.3.3.tar.gz) = 23944
+TIMESTAMP = 1499444230
+SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a
+SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 2613f4cd336d..c1f82213e716 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 80c49d2722dd..da799e91cea0 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
SHA256 (cabal/hashed-storage-0.5.11.tar.gz) = 734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569
SIZE (cabal/hashed-storage-0.5.11.tar.gz) = 57315
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 2a0461743df2..8b05dcc5b5c6 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.2.0.2
+PORTVERSION= 1.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index cb3331d3b895..5b17209d1054 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashtables-1.2.0.2.tar.gz) = 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837
-SIZE (cabal/hashtables-1.2.0.2.tar.gz) = 54283
+TIMESTAMP = 1499459894
+SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951
+SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674
diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile
new file mode 100644
index 000000000000..70bc5d3ea37e
--- /dev/null
+++ b/devel/hs-haskell-lexer/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= haskell-lexer
+PORTVERSION= 1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A fully compliant Haskell 98 lexer
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haskell-lexer/distinfo b/devel/hs-haskell-lexer/distinfo
new file mode 100644
index 000000000000..12a4838366d0
--- /dev/null
+++ b/devel/hs-haskell-lexer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720420
+SHA256 (cabal/haskell-lexer-1.0.1.tar.gz) = d7d42ab3c4bc2f0232ede8b005fb9de57f862ee4c1c83aa61e1022346fc84366
+SIZE (cabal/haskell-lexer-1.0.1.tar.gz) = 12380
diff --git a/devel/hs-haskell-lexer/pkg-descr b/devel/hs-haskell-lexer/pkg-descr
new file mode 100644
index 000000000000..69b5920898aa
--- /dev/null
+++ b/devel/hs-haskell-lexer/pkg-descr
@@ -0,0 +1,3 @@
+A fully compliant Haskell 98 lexer.
+
+WWW: http://hackage.haskell.org/package/haskell-lexer
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index a92a23dbeb77..14886b6229a5 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.16.0.1
+PORTVERSION= 1.19.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Manipulating Haskell source
LICENSE= BSD3CLAUSE
-USE_CABAL= cpphs>=1.3
+USE_CABAL= cpphs
USE_HAPPY= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index e2d628abb831..6be8325d27cb 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1
-SIZE (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 1410081
+TIMESTAMP = 1501416565
+SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971
+SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 92047cb04bc3..f6e0e665e442 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,6 +2,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 2ed2cd3688ad..90bac848ea19 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6
SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index b05ca0f007a5..72eef06077fd 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hasktags
-PORTVERSION= 0.69.1
+PORTVERSION= 0.69.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index 193a3cc0a9b4..358d9a444b55 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hasktags-0.69.1.tar.gz) = 243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6
-SIZE (cabal/hasktags-0.69.1.tar.gz) = 55906
+TIMESTAMP = 1499452576
+SHA256 (cabal/hasktags-0.69.3.tar.gz) = 4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa
+SIZE (cabal/hasktags-0.69.3.tar.gz) = 62888
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index f9e004babaf4..18a58a2d3d50 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hastache
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 35d7df616e3e..41407ad2d527 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-hastache/files/patch-hastache.cabal b/devel/hs-hastache/files/patch-hastache.cabal
new file mode 100644
index 000000000000..cd911a4513d7
--- /dev/null
+++ b/devel/hs-hastache/files/patch-hastache.cabal
@@ -0,0 +1,29 @@
+--- hastache.cabal.orig 2014-12-23 10:40:08 UTC
++++ hastache.cabal
+@@ -27,7 +27,7 @@ extra-source-files:
+ executable mkReadme
+ main-is: mkReadme.hs
+ build-depends: hastache, process,
+- base >=4 && <4.9
++ base >=4.4 && <4.10
+ ,bytestring
+ ,mtl
+ ,transformers
+@@ -46,7 +46,7 @@ library
+ Text.Hastache.Context
+
+ build-depends:
+- base >=4 && <4.9
++ base >=4.4 && <4.10
+ ,bytestring
+ ,mtl
+ ,transformers
+@@ -69,7 +69,7 @@ test-suite test-hastache
+
+ build-depends:
+ hastache
+- ,base >=4 && <4.9
++ ,base >=4.4 && <4.10
+ ,directory
+ ,mtl
+ ,HUnit
diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile
index 501e1fffe875..d20e9b9c0411 100644
--- a/devel/hs-hex/Makefile
+++ b/devel/hs-hex/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hex
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hex/distinfo b/devel/hs-hex/distinfo
index 028bd5b9ff27..865934a937ce 100644
--- a/devel/hs-hex/distinfo
+++ b/devel/hs-hex/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hex-0.1.2.tar.gz) = 12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec
SIZE (cabal/hex-0.1.2.tar.gz) = 1956
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 3b55f6aed5a7..6a8f9b020ced 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.8.1
+PORTVERSION= 0.3.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,5 +11,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libinotify.so:devel/libinotify
+USE_CABAL= async
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index 0786180a0527..4c22b16eb385 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hinotify-0.3.8.1.tar.gz) = 37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d
-SIZE (cabal/hinotify-0.3.8.1.tar.gz) = 8344
+TIMESTAMP = 1499627841
+SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99
+SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 21f719d7e506..105492453361 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.4.2.3
+PORTVERSION= 0.7.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,13 +13,5 @@ LICENSE= BSD3CLAUSE
USE_CABAL= exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \
mtl random utf8-string
-INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-
-INSTALL_PORTDATA= ${INSTALL_DATA} \
- ${WRKSRC}/AUTHORS \
- ${WRKSRC}/README \
- ${WRKSRC}/CHANGELOG.markdown \
- ${STAGEDIR}${DATADIR}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 0705311b2690..a86f3e935bad 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hint-0.4.2.3.tar.gz) = cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7
-SIZE (cabal/hint-0.4.2.3.tar.gz) = 30117
+TIMESTAMP = 1499544799
+SHA256 (cabal/hint-0.7.0.tar.gz) = 299a735848bd6b2e0bdeeee4b47d9d52f865198fbb9403df3f6571801b3e8155
+SIZE (cabal/hint-0.7.0.tar.gz) = 28138
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 5a103a4c373c..9876c9bbbd88 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/distinfo b/devel/hs-hlibev/distinfo
index 7c1d484f3cbe..6d33daf25c98 100644
--- a/devel/hs-hlibev/distinfo
+++ b/devel/hs-hlibev/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hlibev-0.4.0.tar.gz) = dc37dafa42fad03228f353eaa0cda8d57eaf2f8c2558c3de29d2425526e02610
SIZE (cabal/hlibev-0.4.0.tar.gz) = 6366
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index c1d1ecd22b44..51e589260859 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.9.21
+PORTVERSION= 2.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Source code suggestions
LICENSE= BSD3CLAUSE
USE_CABAL= ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \
- haskell-src-exts>=1.16 hscolour>=1.21 uniplate>=1.5
+ haskell-src-exts>=1.16 hscolour>=1.21 refact uniplate>=1.5 yaml
EXECUTABLE= hlint
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 797190e14399..87c73ce3021c 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hlint-1.9.21.tar.gz) = 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393
-SIZE (cabal/hlint-1.9.21.tar.gz) = 88802
+TIMESTAMP = 1499627842
+SHA256 (cabal/hlint-2.0.9.tar.gz) = 252993e74def5caae29a546f39ce37ce2cf2b6bcafa6cc5c867fb5d07fb4a5ad
+SIZE (cabal/hlint-2.0.9.tar.gz) = 102835
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index b4e7d34b2842..b7f6d15da9de 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.41
+PORTVERSION= 5.0.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +10,11 @@ COMMENT= Haskell API Search
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6.1 blaze-builder>=0.2 case-insensitive>=0.2 \
- cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.16 \
- http-types>=0.7 parsec>=2.1 QuickCheck random resourcet \
- safe shake>=0.14 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
- vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=2.1
+USE_CABAL= aeson cmdargs conduit conduit-extra connection extra \
+ haskell-src-exts http-conduit http-types js-flot js-jquery \
+ mmap network network-uri old-locale process-extras QuickCheck \
+ resourcet tar text uniplate utf8-string vector wai wai-logger \
+ warp warp-tls zlib
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index ad1f0b7d7521..dfbeb4d4eadb 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hoogle-4.2.41.tar.gz) = a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be
-SIZE (cabal/hoogle-4.2.41.tar.gz) = 135709
+TIMESTAMP = 1499627842
+SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308
+SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
index d262dac03a4c..9da5e9077d41 100644
--- a/devel/hs-hourglass/Makefile
+++ b/devel/hs-hourglass/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hourglass
-PORTVERSION= 0.2.9
+PORTVERSION= 0.2.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
index 84a2f947bcd7..004beeb32729 100644
--- a/devel/hs-hourglass/distinfo
+++ b/devel/hs-hourglass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hourglass-0.2.9.tar.gz) = 9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6
-SIZE (cabal/hourglass-0.2.9.tar.gz) = 24919
+TIMESTAMP = 1499627843
+SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80
+SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
index 62692b468a38..d40d66e52677 100644
--- a/devel/hs-hsb2hs/Makefile
+++ b/devel/hs-hsb2hs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hsb2hs
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hsb2hs/distinfo b/devel/hs-hsb2hs/distinfo
index dfc1480a3782..7678c1dbee86 100644
--- a/devel/hs-hsb2hs/distinfo
+++ b/devel/hs-hsb2hs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627843
SHA256 (cabal/hsb2hs-0.3.1.tar.gz) = 8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8
SIZE (cabal/hsb2hs-0.3.1.tar.gz) = 2387
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index fba6efa57025..b1d396c346fb 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.9
+PORTVERSION= 1.2.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index a3c3b8cfa6d5..ca3967e131eb 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslogger-1.2.9.tar.gz) = be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476
-SIZE (cabal/hslogger-1.2.9.tar.gz) = 35576
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslogger-1.2.10.tar.gz) = d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b
+SIZE (cabal/hslogger-1.2.10.tar.gz) = 35889
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index 226fa652639a..4713ee9658ca 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.4.0
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index 2bd503366a26..c2f863c5136c 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslua-0.4.0.tar.gz) = 77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050
-SIZE (cabal/hslua-0.4.0.tar.gz) = 129883
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b
+SIZE (cabal/hslua-0.5.0.tar.gz) = 132155
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
index f295c7b4e74f..891cd2575c2a 100644
--- a/devel/hs-hspec-core/Makefile
+++ b/devel/hs-hspec-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-core
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
index b61d2cfa9735..4ed332246055 100644
--- a/devel/hs-hspec-core/distinfo
+++ b/devel/hs-hspec-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-core-2.1.10.tar.gz) = 682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0
-SIZE (cabal/hspec-core-2.1.10.tar.gz) = 31124
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf
+SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index 93d2f36a834d..6f236fac8001 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-discover
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
index d7e8b0958085..a21ccef98240 100644
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-discover-2.1.10.tar.gz) = efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b
-SIZE (cabal/hspec-discover-2.1.10.tar.gz) = 5646
+TIMESTAMP = 1499627846
+SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47
+SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 51fff1e33223..fc40aa304791 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.7.1
+PORTVERSION= 0.8.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Catchy combinators for HUnit
LICENSE= MIT
-USE_CABAL= HUnit
+USE_CABAL= call-stack HUnit
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index 8a324976d0a2..a652ea8cc82f 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-expectations-0.7.1.tar.gz) = afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258
-SIZE (cabal/hspec-expectations-0.7.1.tar.gz) = 4005
+TIMESTAMP = 1499544608
+SHA256 (cabal/hspec-expectations-0.8.2.tar.gz) = 819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef
+SIZE (cabal/hspec-expectations-0.8.2.tar.gz) = 5492
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index e59cfd8da701..ceec95ce63f5 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index f5e185fd06c4..4bf6e7e7d4ac 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-2.1.10.tar.gz) = f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154
-SIZE (cabal/hspec-2.1.10.tar.gz) = 5382
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21
+SIZE (cabal/hspec-2.4.4.tar.gz) = 10634
diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile
new file mode 100644
index 000000000000..cb937d615984
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= io-streams-haproxy
+PORTVERSION= 1.0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HAProxy protocol version 1.5 support for I/O using streams
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec io-streams network
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams-haproxy/distinfo b/devel/hs-io-streams-haproxy/distinfo
new file mode 100644
index 000000000000..5753d01dfff3
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499716472
+SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f
+SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892
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
new file mode 100644
index 000000000000..bd2556d4f862
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
@@ -0,0 +1,11 @@
+--- io-streams-haproxy.cabal.orig 2017-07-10 20:00:53 UTC
++++ io-streams-haproxy.cabal
+@@ -38,7 +38,7 @@ library
+ build-depends: base >= 4.5 && < 4.10,
+ attoparsec >= 0.7 && < 0.14,
+ bytestring >= 0.9 && < 0.11,
+- io-streams >= 1.3 && < 1.4,
++ io-streams >= 1.3 && < 1.5,
+ network >= 2.3 && < 2.7,
+ transformers >= 0.3 && < 0.6
+ default-language: Haskell2010
diff --git a/devel/hs-io-streams-haproxy/pkg-descr b/devel/hs-io-streams-haproxy/pkg-descr
new file mode 100644
index 000000000000..bc3a1c898726
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/pkg-descr
@@ -0,0 +1,7 @@
+HAProxy protocol version 1.5 support
+(see http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt) for
+applications using io-streams. The proxy protocol allows information about a
+networked peer (like remote address and port) to be propagated through a
+forwarding proxy that is configured to speak this protocol.
+
+WWW: http://hackage.haskell.org/package/io-streams-haproxy
diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile
new file mode 100644
index 000000000000..bb088ca8e65e
--- /dev/null
+++ b/devel/hs-io-streams/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= io-streams
+PORTVERSION= 1.4.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple and easy-to-use primitives for I/O using streams
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec network primitive text vector zlib-bindings
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams/distinfo b/devel/hs-io-streams/distinfo
new file mode 100644
index 000000000000..8f375908cf33
--- /dev/null
+++ b/devel/hs-io-streams/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694762
+SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e
+SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422
diff --git a/devel/hs-io-streams/files/patch-io-streams.cabal b/devel/hs-io-streams/files/patch-io-streams.cabal
new file mode 100644
index 000000000000..41a7921eb24d
--- /dev/null
+++ b/devel/hs-io-streams/files/patch-io-streams.cabal
@@ -0,0 +1,18 @@
+--- io-streams.cabal.orig 2017-07-10 15:08:37 UTC
++++ io-streams.cabal
+@@ -122,7 +122,6 @@ Library
+ Build-depends: base >= 4 && <5,
+ attoparsec >= 0.10 && <0.14,
+ bytestring >= 0.9 && <0.11,
+- bytestring-builder >= 0.10 && <0.11,
+ network >= 2.3 && <2.7,
+ primitive >= 0.2 && <0.7,
+ process >= 1.1 && <1.7,
+@@ -205,7 +204,6 @@ Test-suite testsuite
+ Build-depends: base >= 4 && <5,
+ attoparsec >= 0.10 && <0.14,
+ bytestring >= 0.9 && <0.11,
+- bytestring-builder >= 0.10 && <0.11,
+ deepseq >= 1.2 && <1.5,
+ directory >= 1.1 && <2,
+ filepath >= 1.2 && <2,
diff --git a/devel/hs-io-streams/pkg-descr b/devel/hs-io-streams/pkg-descr
new file mode 100644
index 000000000000..03d9f4a68b2b
--- /dev/null
+++ b/devel/hs-io-streams/pkg-descr
@@ -0,0 +1,4 @@
+The io-streams library contains simple and easy-to-use primitives for I/O using
+streams.
+
+WWW: http://hackage.haskell.org/package/io-streams
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
index afe5f5cb4837..06e2c83cf22b 100644
--- a/devel/hs-js-flot/Makefile
+++ b/devel/hs-js-flot/Makefile
@@ -2,6 +2,7 @@
PORTNAME= js-flot
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-flot/distinfo b/devel/hs-js-flot/distinfo
index 187227743469..d902e5d7ee79 100644
--- a/devel/hs-js-flot/distinfo
+++ b/devel/hs-js-flot/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627846
SHA256 (cabal/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a
SIZE (cabal/js-flot-0.8.3.tar.gz) = 662691
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
index 02093d645f42..b1a083f622ae 100644
--- a/devel/hs-js-jquery/Makefile
+++ b/devel/hs-js-jquery/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= js-jquery
-PORTVERSION= 1.11.3
+PORTVERSION= 3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-jquery/distinfo b/devel/hs-js-jquery/distinfo
index acae74b0abc9..ee23890482a0 100644
--- a/devel/hs-js-jquery/distinfo
+++ b/devel/hs-js-jquery/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/js-jquery-1.11.3.tar.gz) = 3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257
-SIZE (cabal/js-jquery-1.11.3.tar.gz) = 120919
+TIMESTAMP = 1499618157
+SHA256 (cabal/js-jquery-3.2.1.tar.gz) = 60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f
+SIZE (cabal/js-jquery-3.2.1.tar.gz) = 112319
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index f221c3257287..74775fcbac8b 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.10.2
+PORTVERSION= 3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 4cf4edfc81f5..214b50411120 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/keys-3.10.2.tar.gz) = 425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6
-SIZE (cabal/keys-3.10.2.tar.gz) = 8635
+TIMESTAMP = 1499627846
+SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2
+SIZE (cabal/keys-3.11.tar.gz) = 8674
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index fd95a5523483..1ac7c6876fc5 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kqueue
-PORTVERSION= 0.1.2.6
-PORTREVISION= 2
+PORTVERSION= 0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/distinfo b/devel/hs-kqueue/distinfo
index 716fbaf364f4..2655994756cf 100644
--- a/devel/hs-kqueue/distinfo
+++ b/devel/hs-kqueue/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/kqueue-0.1.2.6.tar.gz) = e851243826ecadda865809289d6f6921483ab5fed54f9d12453277dd355445e0
-SIZE (cabal/kqueue-0.1.2.6.tar.gz) = 7398
+TIMESTAMP = 1499627846
+SHA256 (cabal/kqueue-0.2.tar.gz) = 700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369
+SIZE (cabal/kqueue-0.2.tar.gz) = 7505
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
deleted file mode 100644
index a6145d68df98..000000000000
--- a/devel/hs-kqueue/files/patch-kqueue.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
---- kqueue.cabal.orig 2014-05-08 16:35:57 UTC
-+++ kqueue.cabal
-@@ -21,11 +21,11 @@ Library
- Hs-Source-Dirs: src
- Exposed-modules: System.KQueue
- System.KQueue.HighLevel
-- Build-depends: base >= 4.0 && < 4.8
-+ Build-depends: base >= 4.0 && < 4.9
- , directory >= 1.0 && < 1.4
-- , filepath >= 1.1 && < 1.4
-+ , filepath >= 1.1 && < 1.5
- , mtl >= 1.1 && < 2.3
-- , time >= 1.1 && < 1.5
-+ , time >= 1.1 && < 1.6
- , unix >= 2.3 && < 2.8
- Build-tools: c2hs
- GHC-Options: -Wall
diff --git a/devel/hs-kqueue/files/patch-src__System__KQueue.chs b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
index f5a9586bc0dd..294fed64b0b5 100644
--- a/devel/hs-kqueue/files/patch-src__System__KQueue.chs
+++ b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
@@ -1,14 +1,22 @@
---- ./src/System/KQueue.chs.orig 2012-01-03 14:00:32.000000000 +0100
-+++ ./src/System/KQueue.chs 2012-01-27 07:17:17.000000000 +0100
-@@ -21,6 +21,7 @@
+--- src/System/KQueue.chs.orig 2016-05-30 14:31:11 UTC
++++ src/System/KQueue.chs
+@@ -21,6 +21,7 @@ module System.KQueue
#include <sys/time.h>
#include <sys/event.h>
+#include "MachDeps.h"
+ #if __GLASGOW_HASKELL__ <= 708
import Control.Applicative ( (<$>), (<*>) )
- import Control.Exception ( Exception, throwIO )
-@@ -62,11 +63,19 @@
+@@ -57,6 +58,7 @@ import Foreign.C ( CInt )
+ import Foreign.C ( CLong
+ , CTime
+ , CULong
++ , CUInt
+ )
+
+ -- | A kernel event queue.
+@@ -68,11 +70,19 @@ kqueue = KQueue <$> {#call kqueue as kqueue_ #}
-- | A kernel event.
data KEvent = KEvent
@@ -28,13 +36,13 @@
, udata :: Ptr () -- ^ User-defined data, passed through unchanged.
} deriving (Show, Eq)
-@@ -122,8 +131,10 @@
+@@ -128,8 +138,10 @@ enum FFlag
, NoteExit = NOTE_EXIT
, NoteFork = NOTE_FORK
, NoteExec = NOTE_EXEC
+#ifndef __FreeBSD__
, NoteSignal = NOTE_SIGNAL
- , NoteReap = NOTE_REAP
+ // , NoteReap = NOTE_REAP
+#endif
};
#endc
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 65bc346da2b6..19f3bfef1a93 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 0f68692100b0..f3bf44a232b6 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/language-c-0.5.0.tar.gz) = 86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222
-SIZE (cabal/language-c-0.5.0.tar.gz) = 170403
+TIMESTAMP = 1499627847
+SHA256 (cabal/language-c-0.6.1.tar.gz) = 23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8
+SIZE (cabal/language-c-0.6.1.tar.gz) = 179625
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 0f8a5f55f391..b55dd42617cf 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.5.14.2
+PORTVERSION= 0.6.0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index c9de3973546f..e6721b6b616d 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/language-javascript-0.5.14.2.tar.gz) = 2a86bd58b1821f1522be191c8d77a80e35550d43637a37644cbb15caac37d546
-SIZE (cabal/language-javascript-0.5.14.2.tar.gz) = 48466
+TIMESTAMP = 1499627848
+SHA256 (cabal/language-javascript-0.6.0.10.tar.gz) = caf14c410bf4463fda497af2b9ea750eddff34e55bc1cfc696f2fb4a36983e54
+SIZE (cabal/language-javascript-0.6.0.10.tar.gz) = 101770
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 19f9cd748134..b5021f8dda6b 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= largeword
-PORTVERSION= 1.2.3
-PORTREVISION= 2
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index ef21db6dec00..8e5dd0af5991 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/largeword-1.2.3.tar.gz) = 960e341af0de950db4e7c47a987bb0789f7759bb27c801ac26e89a28add5acd1
-SIZE (cabal/largeword-1.2.3.tar.gz) = 4278
+TIMESTAMP = 1499627848
+SHA256 (cabal/largeword-1.2.5.tar.gz) = 00b3b06d846649bf404f52a725c88349a38bc8c810e16c99f3100c4e1e9d7d46
+SIZE (cabal/largeword-1.2.5.tar.gz) = 4339
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 561edf5c1f8a..9700416849bd 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/distinfo b/devel/hs-lazysmallcheck/distinfo
index 00ccad62bed0..9ae7998acb26 100644
--- a/devel/hs-lazysmallcheck/distinfo
+++ b/devel/hs-lazysmallcheck/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627848
SHA256 (cabal/lazysmallcheck-0.6.tar.gz) = 9dd4dfb590c77e4f6aff68296602de58422eed5e7148fc29190d875a4e7d0f53
SIZE (cabal/lazysmallcheck-0.6.tar.gz) = 16862
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index 9f8cb01a052e..df6ba4d9c6e8 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.12.3
+PORTVERSION= 4.15.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=4 \
free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \
parallel>=3.1.0.1 profunctors>=5 reflection>=2 \
semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \
- transformers-compat>=0.4 unordered-containers>=0.2.4 \
+ th-abstraction transformers-compat>=0.4 unordered-containers>=0.2.4 \
vector>=0.9 void>=0.5
FLAGS_DISABLE= test-hlint test-doctests test-hunit test-properties test-templates
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 90b626c43420..448a02506de2 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lens-4.12.3.tar.gz) = 48fa9d46b37ff4f650204f82df7d40f7ae78418badf40d9d3fc7eba479f82821
-SIZE (cabal/lens-4.12.3.tar.gz) = 967851
+TIMESTAMP = 1499627850
+SHA256 (cabal/lens-4.15.3.tar.gz) = a2613bb987792da597b514c979636882931d46c596b37d5fbbcdb63bed30cd7e
+SIZE (cabal/lens-4.15.3.tar.gz) = 985354
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
index a8e0776feb62..426cfcab8f1a 100644
--- a/devel/hs-lifted-async/Makefile
+++ b/devel/hs-lifted-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-async
-PORTVERSION= 0.7.0.1
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
index 3e32b11d68d9..539c569e4539 100644
--- a/devel/hs-lifted-async/distinfo
+++ b/devel/hs-lifted-async/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lifted-async-0.7.0.1.tar.gz) = c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a
-SIZE (cabal/lifted-async-0.7.0.1.tar.gz) = 9060
+TIMESTAMP = 1499608443
+SHA256 (cabal/lifted-async-0.9.3.tar.gz) = 97978307f34c8ab1d765724d723a13fede4112a94fe5fbf3494f00378961b461
+SIZE (cabal/lifted-async-0.9.3.tar.gz) = 10321
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index d4f9139ae4e2..c50747ca8e50 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.3.6
+PORTVERSION= 0.2.3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index a672801dc8af..b8006a1fb228 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lifted-base-0.2.3.6.tar.gz) = 57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb
-SIZE (cabal/lifted-base-0.2.3.6.tar.gz) = 11613
+TIMESTAMP = 1499627850
+SHA256 (cabal/lifted-base-0.2.3.11.tar.gz) = 8ec47a9fce7cf5913766a5c53e1b2cf254be733fa9d62e6e2f3f24e538005aab
+SIZE (cabal/lifted-base-0.2.3.11.tar.gz) = 11777
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 7cba0369a59f..00338e7ef7ef 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/distinfo b/devel/hs-logict/distinfo
index 9f889cc47ee3..504e7376a8aa 100644
--- a/devel/hs-logict/distinfo
+++ b/devel/hs-logict/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627850
SHA256 (cabal/logict-0.6.0.2.tar.gz) = 1182b68e8d00279460c7fb9b8284bf129805c07754c678b2a8de5a6d768e161e
SIZE (cabal/logict-0.6.0.2.tar.gz) = 5370
diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile
index 9b5211d495af..c21e9039fd1b 100644
--- a/devel/hs-map-syntax/Makefile
+++ b/devel/hs-map-syntax/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= map-syntax
-PORTVERSION= 0.2
+PORTVERSION= 0.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo
index 43334ad941e2..809123a512af 100644
--- a/devel/hs-map-syntax/distinfo
+++ b/devel/hs-map-syntax/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/map-syntax-0.2.tar.gz) = 395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b
-SIZE (cabal/map-syntax-0.2.tar.gz) = 7129
+TIMESTAMP = 1499627850
+SHA256 (cabal/map-syntax-0.2.0.2.tar.gz) = b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a
+SIZE (cabal/map-syntax-0.2.0.2.tar.gz) = 6944
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
index 5850cc37ff03..31bc92325254 100644
--- a/devel/hs-memory/Makefile
+++ b/devel/hs-memory/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= memory
-PORTVERSION= 0.8
+PORTVERSION= 0.14.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Memory and related abtraction stuff
LICENSE= BSD3CLAUSE
+USE_CABAL= foundation
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
index 970dfe7c1e36..c5cc22911f6d 100644
--- a/devel/hs-memory/distinfo
+++ b/devel/hs-memory/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/memory-0.8.tar.gz) = 7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de
-SIZE (cabal/memory-0.8.tar.gz) = 35030
+TIMESTAMP = 1499444278
+SHA256 (cabal/memory-0.14.6.tar.gz) = c7dec070174756f1753010585a6dcd4f958a4360634142c4e387b3475bffc160
+SIZE (cabal/memory-0.14.6.tar.gz) = 37020
diff --git a/devel/hs-microlens-th/Makefile b/devel/hs-microlens-th/Makefile
new file mode 100644
index 000000000000..968885b2eb5a
--- /dev/null
+++ b/devel/hs-microlens-th/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= microlens-th
+PORTVERSION= 0.4.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package lets you automatically generate lenses for data types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= microlens
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microlens-th/distinfo b/devel/hs-microlens-th/distinfo
new file mode 100644
index 000000000000..80e863a6dc7b
--- /dev/null
+++ b/devel/hs-microlens-th/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499789717
+SHA256 (cabal/microlens-th-0.4.1.1.tar.gz) = 5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b
+SIZE (cabal/microlens-th-0.4.1.1.tar.gz) = 16406
diff --git a/devel/hs-microlens-th/pkg-descr b/devel/hs-microlens-th/pkg-descr
new file mode 100644
index 000000000000..81cdf658e8db
--- /dev/null
+++ b/devel/hs-microlens-th/pkg-descr
@@ -0,0 +1,6 @@
+This package lets you automatically generate lenses for data types; code was
+extracted from the lens package, and therefore generated lenses are fully
+compatible with ones generated by lens (and can be used both from lens and
+microlens).
+
+WWW: https://hackage.haskell.org/package/microlens-th
diff --git a/devel/hs-microlens/Makefile b/devel/hs-microlens/Makefile
new file mode 100644
index 000000000000..18a330e0c73c
--- /dev/null
+++ b/devel/hs-microlens/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= microlens
+PORTVERSION= 0.4.8.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The microlens package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microlens/distinfo b/devel/hs-microlens/distinfo
new file mode 100644
index 000000000000..2ab34561f53c
--- /dev/null
+++ b/devel/hs-microlens/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499703416
+SHA256 (cabal/microlens-0.4.8.0.tar.gz) = aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5
+SIZE (cabal/microlens-0.4.8.0.tar.gz) = 24766
diff --git a/devel/hs-microlens/pkg-descr b/devel/hs-microlens/pkg-descr
new file mode 100644
index 000000000000..6ddfff4a974a
--- /dev/null
+++ b/devel/hs-microlens/pkg-descr
@@ -0,0 +1,6 @@
+This library is an extract from lens (with no dependencies). It's not a toy
+lenses library, unsuitable for “real world”, but merely a small one. It is
+compatible with lens, and should have same performance. It also has better
+documentation.
+
+WWW: http://hackage.haskell.org/package/microlens
diff --git a/devel/hs-microstache/Makefile b/devel/hs-microstache/Makefile
new file mode 100644
index 000000000000..524f3325a6f9
--- /dev/null
+++ b/devel/hs-microstache/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= microstache
+PORTVERSION= 1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Mustache templates for Haskell
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson parsec semigroups text unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microstache/distinfo b/devel/hs-microstache/distinfo
new file mode 100644
index 000000000000..a5f70a866a65
--- /dev/null
+++ b/devel/hs-microstache/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499618263
+SHA256 (cabal/microstache-1.tar.gz) = e8875bfeac9e54e84d7c91f1f448ee80ec07b9b3db28d5369131fbaa20517164
+SIZE (cabal/microstache-1.tar.gz) = 19859
diff --git a/devel/hs-microstache/pkg-descr b/devel/hs-microstache/pkg-descr
new file mode 100644
index 000000000000..adc327c8c432
--- /dev/null
+++ b/devel/hs-microstache/pkg-descr
@@ -0,0 +1,6 @@
+Mustache templates for Haskell.
+
+Based on stache library, which uses megaparsec.
+This library uses parsec, thus the name: microstache.
+
+WWW: https://hackage.haskell.org/package/microstache
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index d7cbc667befb..05080c6b5889 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmap/distinfo b/devel/hs-mmap/distinfo
index 9569fa6a7e81..dfd3bf24ed4a 100644
--- a/devel/hs-mmap/distinfo
+++ b/devel/hs-mmap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627850
SHA256 (cabal/mmap-0.5.9.tar.gz) = 58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8
SIZE (cabal/mmap-0.5.9.tar.gz) = 11731
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index 1cc5678b0db2..7c258f7710d9 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mmorph
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Monad morphisms
LICENSE= BSD3CLAUSE
+USE_CABAL= mtl transformers-compat
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
index 0e1846b93999..116cbf814370 100644
--- a/devel/hs-mmorph/distinfo
+++ b/devel/hs-mmorph/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mmorph-1.0.4.tar.gz) = 22e3665b4c86bf28cb4e836da91f586294d74d1cf1c18db364dcf568eba7bf4c
-SIZE (cabal/mmorph-1.0.4.tar.gz) = 6100
+TIMESTAMP = 1499444382
+SHA256 (cabal/mmorph-1.1.0.tar.gz) = c1bcb45560753203f5ce3952f3c8a100b7d5b37c91746372c1da4988c4db74de
+SIZE (cabal/mmorph-1.1.0.tar.gz) = 6663
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 6c99ba9d3bfe..e0ab1e01b378 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 1.0.0.4
+PORTVERSION= 1.0.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index 6f5a9de683f9..846604e0bfcc 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-control-1.0.0.4.tar.gz) = e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e
-SIZE (cabal/monad-control-1.0.0.4.tar.gz) = 10709
+TIMESTAMP = 1499444311
+SHA256 (cabal/monad-control-1.0.2.1.tar.gz) = cc4ecb2db714499c0fa518321cfbbf22f98ed03c199d47eee0dea3e0430358c2
+SIZE (cabal/monad-control-1.0.2.1.tar.gz) = 12406
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index 6400fc960308..661d23d7fe05 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.13.2
+PORTVERSION= 0.3.24
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index c6f87b261e5f..382f3b033835 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-logger-0.3.13.2.tar.gz) = c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2
-SIZE (cabal/monad-logger-0.3.13.2.tar.gz) = 7402
+TIMESTAMP = 1499595500
+SHA256 (cabal/monad-logger-0.3.24.tar.gz) = 05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4
+SIZE (cabal/monad-logger-0.3.24.tar.gz) = 9525
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index b78cafd88801..d90e7736bda7 100644
--- a/devel/hs-monad-loops/Makefile
+++ b/devel/hs-monad-loops/Makefile
@@ -2,6 +2,7 @@
PORTNAME= monad-loops
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-loops/distinfo b/devel/hs-monad-loops/distinfo
index 49ee6342abfb..199ddd4e6f70 100644
--- a/devel/hs-monad-loops/distinfo
+++ b/devel/hs-monad-loops/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627851
SHA256 (cabal/monad-loops-0.4.3.tar.gz) = 7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18
SIZE (cabal/monad-loops-0.4.3.tar.gz) = 4996
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index bd3a91d3f201..951c2876e39d 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/distinfo b/devel/hs-monad-par-extras/distinfo
index 09e69d5ca341..5959b71d4e95 100644
--- a/devel/hs-monad-par-extras/distinfo
+++ b/devel/hs-monad-par-extras/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627851
SHA256 (cabal/monad-par-extras-0.3.3.tar.gz) = e21e33190bc248afa4ae467287ac37d24037ef3de6050c44fd85b52f4d5b842e
SIZE (cabal/monad-par-extras-0.3.3.tar.gz) = 9146
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 13f3ff3f39ae..5c0cfd7fbb69 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.7
+PORTVERSION= 0.3.4.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index c437a95a4c6a..cdf663ef60b3 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-par-0.3.4.7.tar.gz) = 23b8a68719b4c5848ce9a3381ce9efdc1c96677ba043a3ee74d99223343cc28a
-SIZE (cabal/monad-par-0.3.4.7.tar.gz) = 30411
+TIMESTAMP = 1499627851
+SHA256 (cabal/monad-par-0.3.4.8.tar.gz) = f84cdf51908a1c41c3f672be9520a8fdc028ea39d90a25ecfe5a3b223cfeb951
+SIZE (cabal/monad-par-0.3.4.8.tar.gz) = 30583
diff --git a/devel/hs-monad-unlift/Makefile b/devel/hs-monad-unlift/Makefile
new file mode 100644
index 000000000000..53b205cb4f95
--- /dev/null
+++ b/devel/hs-monad-unlift/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= monad-unlift
+PORTVERSION= 0.2.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The monad-unlift package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= constraints monad-control transformers-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monad-unlift/distinfo b/devel/hs-monad-unlift/distinfo
new file mode 100644
index 000000000000..a1d226785c63
--- /dev/null
+++ b/devel/hs-monad-unlift/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499718296
+SHA256 (cabal/monad-unlift-0.2.0.tar.gz) = 4b5e638619e4821918b4ec67aeffb581ab9df23d168fbb72164137009a15ee0f
+SIZE (cabal/monad-unlift-0.2.0.tar.gz) = 5845
diff --git a/devel/hs-monad-unlift/pkg-descr b/devel/hs-monad-unlift/pkg-descr
new file mode 100644
index 000000000000..2e779d1e4ee5
--- /dev/null
+++ b/devel/hs-monad-unlift/pkg-descr
@@ -0,0 +1,3 @@
+The monad-unlift package
+
+WWW: http://hackage.haskell.org/package/monad-unlift
diff --git a/devel/hs-monadplus/Makefile b/devel/hs-monadplus/Makefile
new file mode 100644
index 000000000000..bd9be57ee2df
--- /dev/null
+++ b/devel/hs-monadplus/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME= monadplus
+PORTVERSION= 1.4.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell98 partial maps and filters over MonadPlus
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monadplus/distinfo b/devel/hs-monadplus/distinfo
new file mode 100644
index 000000000000..0adffef4e7f5
--- /dev/null
+++ b/devel/hs-monadplus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500997085
+SHA256 (cabal/monadplus-1.4.2.tar.gz) = 366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595
+SIZE (cabal/monadplus-1.4.2.tar.gz) = 3671
diff --git a/devel/hs-monadplus/pkg-descr b/devel/hs-monadplus/pkg-descr
new file mode 100644
index 000000000000..6e70945c31ab
--- /dev/null
+++ b/devel/hs-monadplus/pkg-descr
@@ -0,0 +1,5 @@
+Filtering and folding over arbitrary MonadPlus instances. This package
+generalizes many common stream operations such as filter, catMaybes etc.
+
+WWW: http://hackage.haskell.org/package/monadplus
+
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 1f45127f5043..ab2b69182b7a 100644
--- a/devel/hs-monads-tf/Makefile
+++ b/devel/hs-monads-tf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monads-tf
-PORTVERSION= 0.1.0.2
-PORTREVISION= 2
+PORTVERSION= 0.1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monads-tf/distinfo b/devel/hs-monads-tf/distinfo
index 300f91bf0a28..9f208fe21c19 100644
--- a/devel/hs-monads-tf/distinfo
+++ b/devel/hs-monads-tf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monads-tf-0.1.0.2.tar.gz) = cb6f495443f526b00b3d06535aa29e393473244acd410cba1b898eeaa8f8077c
-SIZE (cabal/monads-tf-0.1.0.2.tar.gz) = 14206
+TIMESTAMP = 1499444793
+SHA256 (cabal/monads-tf-0.1.0.3.tar.gz) = 249dd2aa55c4dd6530f1e49f6b052ec91bc590ecfef2bd24c58837a3f8d4b0f1
+SIZE (cabal/monads-tf-0.1.0.3.tar.gz) = 14159
diff --git a/devel/hs-mono-traversable-instances/Makefile b/devel/hs-mono-traversable-instances/Makefile
new file mode 100644
index 000000000000..634d226b6f19
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= mono-traversable-instances
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The mono-traversable-instances package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= comonad dlist dlist-instances mono-traversable semigroupoids \
+ semigroups vector-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mono-traversable-instances/distinfo b/devel/hs-mono-traversable-instances/distinfo
new file mode 100644
index 000000000000..bfe390d30f52
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720948
+SHA256 (cabal/mono-traversable-instances-0.1.0.0.tar.gz) = b5ff2b8bcebe31ffcc652a8dd3adde6aa7cd7f27a1cf6d058d4c658b370c087e
+SIZE (cabal/mono-traversable-instances-0.1.0.0.tar.gz) = 2520
diff --git a/devel/hs-mono-traversable-instances/pkg-descr b/devel/hs-mono-traversable-instances/pkg-descr
new file mode 100644
index 000000000000..8a5e4bdf415e
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/pkg-descr
@@ -0,0 +1,3 @@
+The mono-traversable-instances package
+
+WWW: http://hackage.haskell.org/package/mono-traversable-instances
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index fbc0fd98ac52..6b4a66756189 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mono-traversable
-PORTVERSION= 0.9.2.1
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container
LICENSE= MIT
USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \
- semigroupoids>=3.0 semigroups>=0.10 text>=0.11 \
+ semigroupoids>=3.0 semigroups>=0.10 split text>=0.11 \
unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \
vector-instances
diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo
index d8a1f0bd5c37..43c929c4eac3 100644
--- a/devel/hs-mono-traversable/distinfo
+++ b/devel/hs-mono-traversable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mono-traversable-0.9.2.1.tar.gz) = 34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef
-SIZE (cabal/mono-traversable-0.9.2.1.tar.gz) = 36866
+TIMESTAMP = 1499627851
+SHA256 (cabal/mono-traversable-1.0.2.tar.gz) = aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633
+SIZE (cabal/mono-traversable-1.0.2.tar.gz) = 38239
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index def4bfd35a9f..e6bb3517e3fb 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 92566c3d8201..860e02872e20 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627852
SHA256 (cabal/mtl-2.2.1.tar.gz) = cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5
SIZE (cabal/mtl-2.2.1.tar.gz) = 15391
diff --git a/devel/hs-mtl/files/patch-git_5949840 b/devel/hs-mtl/files/patch-git_5949840
new file mode 100644
index 000000000000..ebc02d418f0f
--- /dev/null
+++ b/devel/hs-mtl/files/patch-git_5949840
@@ -0,0 +1,22 @@
+From 59498406a6338d93891dec3abcbdde2cb7e41325 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus@iki.fi>
+Date: Wed, 23 Dec 2015 16:41:29 +0200
+Subject: [PATCH] Support transformers-0.5
+
+---
+ mtl.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mtl.cabal b/mtl.cabal
+index aaa5187..7702edd 100644
+--- mtl.cabal
++++ mtl.cabal
+@@ -54,7 +54,7 @@ Library
+ Control.Monad.Writer.Class
+ Control.Monad.Writer.Lazy
+ Control.Monad.Writer.Strict
+- build-depends: base < 6, transformers == 0.4.*
++ build-depends: base < 6, transformers >= 0.4 && <0.6
+ extensions:
+ MultiParamTypeClasses
+ FunctionalDependencies
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 3c393935661f..fcbadff2ba41 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.9.1.1.2
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index 652c106d6171..a2949b18a81b 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mueval-0.9.1.1.2.tar.gz) = e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1
-SIZE (cabal/mueval-0.9.1.1.2.tar.gz) = 15746
+TIMESTAMP = 1499627852
+SHA256 (cabal/mueval-0.9.3.tar.gz) = f72a8bbaffecaeb55b67d78011e182073be8ba9f4a90824903e4c78cfe6e1ef7
+SIZE (cabal/mueval-0.9.3.tar.gz) = 16085
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 2d6bac570fc1..6c391e2e0806 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.8
+PORTVERSION= 0.1.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 62562b5dff3d..87e21ea5f99c 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/murmur-hash-0.1.0.8.tar.gz) = 6cb9f4dc4a7d5b35e843bb8767d2e2c9745bcfbdacb5daf4fce5f4e05f983a06
-SIZE (cabal/murmur-hash-0.1.0.8.tar.gz) = 4072
+TIMESTAMP = 1499450881
+SHA256 (cabal/murmur-hash-0.1.0.9.tar.gz) = 89b9db94ead4cc0784dbcfb47c51b5664c1718860db00cd8ada3ef6fdd4465ad
+SIZE (cabal/murmur-hash-0.1.0.9.tar.gz) = 4204
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
index 32a465b32ebf..54c3753d7d42 100644
--- a/devel/hs-mutable-containers/Makefile
+++ b/devel/hs-mutable-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mutable-containers
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mutable-containers/distinfo b/devel/hs-mutable-containers/distinfo
index aaa27aac7bae..25af84a7a894 100644
--- a/devel/hs-mutable-containers/distinfo
+++ b/devel/hs-mutable-containers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mutable-containers-0.3.2.tar.gz) = 781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e
-SIZE (cabal/mutable-containers-0.3.2.tar.gz) = 11969
+TIMESTAMP = 1499627853
+SHA256 (cabal/mutable-containers-0.3.3.tar.gz) = 7a7a39cbb16978dd1607a3977d7a1e5d8ecda7a528845d6983b5b97c49517ceb
+SIZE (cabal/mutable-containers-0.3.3.tar.gz) = 12062
diff --git a/devel/hs-ncurses/Makefile b/devel/hs-ncurses/Makefile
index e0f3b4171f33..181b6f814f13 100644
--- a/devel/hs-ncurses/Makefile
+++ b/devel/hs-ncurses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncurses
PORTVERSION= 0.2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,8 @@ COMMENT= Modernised Haskell binding to GNU ncurses
LICENSE= GPLv3
-USE_CABAL= c2hs>=0.15
+USE_C2HS= yes
+USE_CABAL= text
USES= ncurses
diff --git a/devel/hs-newtype-generics/Makefile b/devel/hs-newtype-generics/Makefile
new file mode 100644
index 000000000000..b9784d0334af
--- /dev/null
+++ b/devel/hs-newtype-generics/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= newtype-generics
+PORTVERSION= 0.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Full replacement for the original newtype package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-newtype-generics/distinfo b/devel/hs-newtype-generics/distinfo
new file mode 100644
index 000000000000..377a45c1a4b3
--- /dev/null
+++ b/devel/hs-newtype-generics/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499700022
+SHA256 (cabal/newtype-generics-0.5.tar.gz) = dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c
+SIZE (cabal/newtype-generics-0.5.tar.gz) = 4490
diff --git a/devel/hs-newtype-generics/pkg-descr b/devel/hs-newtype-generics/pkg-descr
new file mode 100644
index 000000000000..780c9c4ae3c0
--- /dev/null
+++ b/devel/hs-newtype-generics/pkg-descr
@@ -0,0 +1,7 @@
+Per Conor McBride, the Newtype typeclass represents the packing and unpacking
+of a newtype, and allows you to operatate under that newtype with functions
+such as ala. Generics support was added in version 0.4, making this package a
+full replacement for the original newtype package, and a better alternative to
+newtype-th.
+
+WWW: http://hackage.haskell.org/package/newtype-genericse
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
index a914fee795da..4fd2e9d75642 100644
--- a/devel/hs-newtype/Makefile
+++ b/devel/hs-newtype/Makefile
@@ -2,6 +2,7 @@
PORTNAME= newtype
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-newtype/distinfo b/devel/hs-newtype/distinfo
index 4e4d18370e6b..afd7e6783178 100644
--- a/devel/hs-newtype/distinfo
+++ b/devel/hs-newtype/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
SHA256 (cabal/newtype-0.2.tar.gz) = b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459
SIZE (cabal/newtype-0.2.tar.gz) = 3476
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
index 5f8ee8fc53ea..b4aa9990fcb7 100644
--- a/devel/hs-old-locale/Makefile
+++ b/devel/hs-old-locale/Makefile
@@ -2,6 +2,7 @@
PORTNAME= old-locale
PORTVERSION= 1.0.0.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-locale/distinfo b/devel/hs-old-locale/distinfo
index 538cc2730c3f..bbe9a7186f2a 100644
--- a/devel/hs-old-locale/distinfo
+++ b/devel/hs-old-locale/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
SHA256 (cabal/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
SIZE (cabal/old-locale-1.0.0.7.tar.gz) = 3384
diff --git a/devel/hs-old-locale/files/patch-git_15fea2d b/devel/hs-old-locale/files/patch-git_15fea2d
new file mode 100644
index 000000000000..89a56aedd192
--- /dev/null
+++ b/devel/hs-old-locale/files/patch-git_15fea2d
@@ -0,0 +1,21 @@
+From 68cdafe1580fbf448f293ad4efb5ba6313107d0e Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Tue, 4 Apr 2017 10:26:44 -0400
+Subject: [PATCH 1/2] Allow building with base-4.10.0.0
+
+---
+ old-locale.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/old-locale.cabal b/old-locale.cabal
+index 37057a8..52aa83a 100644
+--- old-locale.cabal
++++ old-locale.cabal
+@@ -31,5 +31,5 @@ Library
+ exposed-modules:
+ System.Locale
+
+- build-depends: base >= 4.2 && < 4.9
++ build-depends: base >= 4.2 && < 4.11
+ ghc-options: -Wall
+
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
index 4fa6296b8522..99000c434671 100644
--- a/devel/hs-old-time/Makefile
+++ b/devel/hs-old-time/Makefile
@@ -2,6 +2,7 @@
PORTNAME= old-time
PORTVERSION= 1.1.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-time/distinfo b/devel/hs-old-time/distinfo
index 87139101e088..7e047ac6ce9c 100644
--- a/devel/hs-old-time/distinfo
+++ b/devel/hs-old-time/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
SHA256 (cabal/old-time-1.1.0.3.tar.gz) = 1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1
SIZE (cabal/old-time-1.1.0.3.tar.gz) = 74219
diff --git a/devel/hs-old-time/files/patch-git_82790af b/devel/hs-old-time/files/patch-git_82790af
new file mode 100644
index 000000000000..d2f1d70132f1
--- /dev/null
+++ b/devel/hs-old-time/files/patch-git_82790af
@@ -0,0 +1,23 @@
+From 320f806511c2819c7ae338a5e75a74fc4c3411b7 Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Tue, 4 Apr 2017 10:29:41 -0400
+Subject: [PATCH 1/2] Allow building with base-4.10.0.0
+
+---
+ old-time.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/old-time.cabal b/old-time.cabal
+index d322965..3a0e85c 100644
+--- old-time.cabal
++++ old-time.cabal
+@@ -53,7 +53,7 @@ Library
+ HsTime.h
+
+ build-depends:
+- base >= 4.7 && < 4.9,
++ base >= 4.7 && < 4.11,
+ old-locale == 1.0.*
+
+ ghc-options: -Wall
+
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 5359e2f18a03..cb3810a0263d 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.11.0.2
+PORTVERSION= 0.14.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index a00ea9d3a1f5..cba28fc18757 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/optparse-applicative-0.11.0.2.tar.gz) = 31c6923c01cfd6dce0cf83f3430c17d164169f0db6ff2de9b3b294926214255a
-SIZE (cabal/optparse-applicative-0.11.0.2.tar.gz) = 30425
+TIMESTAMP = 1499447048
+SHA256 (cabal/optparse-applicative-0.14.0.0.tar.gz) = b55b32fdd5d101b2d6edb2746a66648fc2cd1b850d7adea185f201ac71b83c1a
+SIZE (cabal/optparse-applicative-0.14.0.0.tar.gz) = 53120
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 0efe30d5ca24..df37fc262ac5 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.0.6
+PORTVERSION= 3.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index cce1d45d6166..5c4be6485683 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/parallel-3.2.0.6.tar.gz) = b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642
-SIZE (cabal/parallel-3.2.0.6.tar.gz) = 12990
+TIMESTAMP = 1499444913
+SHA256 (cabal/parallel-3.2.1.1.tar.gz) = 323bb9bc9e36fb9bfb08e68a772411302b1599bfffbc6de20fa3437ce1473c17
+SIZE (cabal/parallel-3.2.1.1.tar.gz) = 13367
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 5bcbdb735e50..f3f79fb6b118 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pcre-light
-PORTVERSION= 0.4.0.3
+PORTVERSION= 0.4.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,6 +9,7 @@ COMMENT= Small, efficient, and portable regex library for Perl 5 compatible
LICENSE= BSD3CLAUSE
+USES= pkgconfig
LIB_DEPENDS= libpcre.so:devel/pcre
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index a670ce2345b1..979b58547205 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pcre-light-0.4.0.3.tar.gz) = 6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50
-SIZE (cabal/pcre-light-0.4.0.3.tar.gz) = 16574
+TIMESTAMP = 1499627854
+SHA256 (cabal/pcre-light-0.4.0.4.tar.gz) = 02c97e39263d18fd26aa63d52c88c4bfbb5c3f66ab40564552e7f11d5d889e75
+SIZE (cabal/pcre-light-0.4.0.4.tar.gz) = 15065
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index b93e89fead23..4ae5a2c8a2c9 100644
--- a/devel/hs-prelude-extras/Makefile
+++ b/devel/hs-prelude-extras/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= prelude-extras
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.4.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prelude-extras/distinfo b/devel/hs-prelude-extras/distinfo
index cb1337f371fc..8f485d698d45 100644
--- a/devel/hs-prelude-extras/distinfo
+++ b/devel/hs-prelude-extras/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/prelude-extras-0.4.tar.gz) = 56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57
-SIZE (cabal/prelude-extras-0.4.tar.gz) = 4958
+TIMESTAMP = 1499627854
+SHA256 (cabal/prelude-extras-0.4.0.3.tar.gz) = 09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877
+SIZE (cabal/prelude-extras-0.4.0.3.tar.gz) = 8141
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
index a158db528b4c..883c31dcf276 100644
--- a/devel/hs-preprocessor-tools/Makefile
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -2,6 +2,7 @@
PORTNAME= preprocessor-tools
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/distinfo b/devel/hs-preprocessor-tools/distinfo
index 3a00f578b089..4c431d9d228c 100644
--- a/devel/hs-preprocessor-tools/distinfo
+++ b/devel/hs-preprocessor-tools/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/preprocessor-tools-1.0.1.tar.gz) = c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59
SIZE (cabal/preprocessor-tools-1.0.1.tar.gz) = 9895
diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index 48c4e2de3ad4..db2ddc337da5 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prettyclass/distinfo b/devel/hs-prettyclass/distinfo
index 39e26b6ddb96..dea617a4d328 100644
--- a/devel/hs-prettyclass/distinfo
+++ b/devel/hs-prettyclass/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/prettyclass-1.0.0.0.tar.gz) = e537446e7a346e5e0872ed8281db2bb0220c737f10757848c901da1399548986
SIZE (cabal/prettyclass-1.0.0.0.tar.gz) = 1542
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index c3674d03a4b6..a7edc0af71ed 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.6
+PORTVERSION= 0.6.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 91392bdabf9c..5b1160e13356 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/primitive-0.6.tar.gz) = 34a5f39213c68369e7edc2a3ea175d3f4edbf89e9f0777784710eff6f2d69722
-SIZE (cabal/primitive-0.6.tar.gz) = 12677
+TIMESTAMP = 1499444407
+SHA256 (cabal/primitive-0.6.2.0.tar.gz) = b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1
+SIZE (cabal/primitive-0.6.2.0.tar.gz) = 23954
diff --git a/devel/hs-process-extras/Makefile b/devel/hs-process-extras/Makefile
new file mode 100644
index 000000000000..f1e14a35cb9a
--- /dev/null
+++ b/devel/hs-process-extras/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= process-extras
+PORTVERSION= 0.7.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Read process input and output as ByteStrings or Text
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= data-default generic-deriving ListLike mtl text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-process-extras/distinfo b/devel/hs-process-extras/distinfo
new file mode 100644
index 000000000000..0cd81481a508
--- /dev/null
+++ b/devel/hs-process-extras/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719583
+SHA256 (cabal/process-extras-0.7.2.tar.gz) = e76c1031ec696dcd25b05f1b00611585a40050aa30548394d084a72267a8e958
+SIZE (cabal/process-extras-0.7.2.tar.gz) = 14267
diff --git a/devel/hs-process-extras/pkg-descr b/devel/hs-process-extras/pkg-descr
new file mode 100644
index 000000000000..0c353cc81be2
--- /dev/null
+++ b/devel/hs-process-extras/pkg-descr
@@ -0,0 +1,7 @@
+Extends http://hackage.haskell.org/package/process. Read process input and
+output as ByteStrings or Text, or write your own ProcessOutput instance. Lazy
+process input and output. ProcessMaker class for more flexibility in the
+process creation API.
+
+WWW: http://hackage.haskell.org/package/process-extras
+
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 671a6c857d26..7c841d19b093 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 5.1.1
+PORTVERSION= 5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT= Profunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 distributive>=0.4.4 tagged>=0.4.4
+USE_CABAL= base-orphans bifunctors comonad contravariant \
+ 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 136ffac32930..f23b78305725 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/profunctors-5.1.1.tar.gz) = 873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253
-SIZE (cabal/profunctors-5.1.1.tar.gz) = 17866
+TIMESTAMP = 1499595371
+SHA256 (cabal/profunctors-5.2.tar.gz) = 87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4
+SIZE (cabal/profunctors-5.2.tar.gz) = 23236
diff --git a/devel/hs-profunctors/files/patch-git_c0574c b/devel/hs-profunctors/files/patch-git_c0574c
new file mode 100644
index 000000000000..af645f89acb5
--- /dev/null
+++ b/devel/hs-profunctors/files/patch-git_c0574c
@@ -0,0 +1,22 @@
+From c0574c91a459083066d656bec39e67dfa02daf06 Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Mon, 10 Apr 2017 09:41:23 -0400
+Subject: [PATCH] Bump base-orphans upper version bounds
+
+---
+ profunctors.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profunctors.cabal b/profunctors.cabal
+index 1233e734..8f94e27c 100644
+--- profunctors.cabal
++++ profunctors.cabal
+@@ -30,7 +30,7 @@ source-repository head
+ library
+ build-depends:
+ base >= 4 && < 5,
+- base-orphans >= 0.4 && < 0.6,
++ base-orphans >= 0.4 && < 0.7,
+ bifunctors >= 5.2 && < 6,
+ comonad >= 4 && < 6,
+ contravariant >= 1 && < 2,
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index 71e0917a97d1..925323f1802e 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -2,6 +2,7 @@
PORTNAME= project-template
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 24f8fe521f7d..66526b2a741d 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310
SIZE (cabal/project-template-0.2.0.tar.gz) = 8251
diff --git a/devel/hs-psqueues/Makefile b/devel/hs-psqueues/Makefile
new file mode 100644
index 000000000000..96030e716417
--- /dev/null
+++ b/devel/hs-psqueues/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= psqueues
+PORTVERSION= 0.2.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Provides Priority Search Queues
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-psqueues/distinfo b/devel/hs-psqueues/distinfo
new file mode 100644
index 000000000000..804de738bb55
--- /dev/null
+++ b/devel/hs-psqueues/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499689628
+SHA256 (cabal/psqueues-0.2.3.0.tar.gz) = 25ed95de5de62831d3e1db47aabd0b589ddf71aeec2d53bc3104a9bb663743a7
+SIZE (cabal/psqueues-0.2.3.0.tar.gz) = 26646
diff --git a/devel/hs-psqueues/pkg-descr b/devel/hs-psqueues/pkg-descr
new file mode 100644
index 000000000000..f912ac17c9f3
--- /dev/null
+++ b/devel/hs-psqueues/pkg-descr
@@ -0,0 +1,21 @@
+The psqueues package provides Priority Search Queues in three different flavors.
+
+ * OrdPSQ k p v, which uses the Ord k instance to provide fast insertion,
+ deletion and lookup. This implementation is based on Ralf Hinze's A Simple
+ Implementation Technique for Priority Search Queues. Hence, it is similar to
+ the PSQueue library, although it is considerably faster and provides a
+ slightly different API.
+
+ * IntPSQ p v is a far more efficient implementation. It fixes the key type to
+ Int and uses a radix tree (like IntMap) with an additional min-heap property.
+
+ * HashPSQ k p v is a fairly straightforward extension of IntPSQ: it simply
+ uses the keys' hashes as indices in the IntPSQ. If there are any hash
+ collisions, it uses an OrdPSQ to resolve those. The performance of this
+ implementation is comparable to that of IntPSQ, but it is more widely
+ applicable since the keys are not restricted to Int, but rather to any
+ Hashable datatype.
+
+Each of the three implementations provides the same API, so they can be used interchangeably. The benchmarks show how they perform relative to one another, and also compared to the other Priority Search Queue implementations on Hackage: PSQueue and fingertree-psqueue.
+
+WWW: https://hackage.haskell.org/package/psqueues
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index 4ecbbef1f681..c9a3a5f67909 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= quickcheck-io
-PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-quickcheck-io/distinfo b/devel/hs-quickcheck-io/distinfo
index 0b718d1a65cf..2f777529c916 100644
--- a/devel/hs-quickcheck-io/distinfo
+++ b/devel/hs-quickcheck-io/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/quickcheck-io-0.1.1.tar.gz) = a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b
-SIZE (cabal/quickcheck-io-0.1.1.tar.gz) = 1646
+TIMESTAMP = 1499547635
+SHA256 (cabal/quickcheck-io-0.2.0.tar.gz) = fb779119d79fe08ff4d502fb6869a70c9a8d5fd8ae0959f605c3c937efd96422
+SIZE (cabal/quickcheck-io-0.2.0.tar.gz) = 1843
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index c0322ce466ed..accdf3b5a03e 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,6 +2,7 @@
PORTNAME= random
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/distinfo b/devel/hs-random/distinfo
index aac052b8e65a..137eabe39137 100644
--- a/devel/hs-random/distinfo
+++ b/devel/hs-random/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
SIZE (cabal/random-1.1.tar.gz) = 10870
diff --git a/devel/hs-readable/Makefile b/devel/hs-readable/Makefile
new file mode 100644
index 000000000000..80181c0289e3
--- /dev/null
+++ b/devel/hs-readable/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= readable
+PORTVERSION= 0.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Reading data types from ByteString and Text
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-readable/distinfo b/devel/hs-readable/distinfo
new file mode 100644
index 000000000000..a51972be0809
--- /dev/null
+++ b/devel/hs-readable/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694963
+SHA256 (cabal/readable-0.3.1.tar.gz) = 703037ad2cca4d6d42ba23e2758d1911cd82e3e922c4078076c273231e4b43c9
+SIZE (cabal/readable-0.3.1.tar.gz) = 2907
diff --git a/devel/hs-readable/pkg-descr b/devel/hs-readable/pkg-descr
new file mode 100644
index 000000000000..6d6c5f319795
--- /dev/null
+++ b/devel/hs-readable/pkg-descr
@@ -0,0 +1,4 @@
+Provides a Readable type class for reading data types from ByteString and Text.
+ Also includes efficient implementations for common data types.
+
+WWW: http://hackage.haskell.org/package/readable
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 85386bc776e9..3fc0b6d722c8 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readline/distinfo b/devel/hs-readline/distinfo
index a19af54e3f3f..7918210073d8 100644
--- a/devel/hs-readline/distinfo
+++ b/devel/hs-readline/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/readline-1.0.3.0.tar.gz) = c0b9e174910620db0edea8f9fd6fb6c1d7b066260d523e9a7208294c46a75feb
SIZE (cabal/readline-1.0.3.0.tar.gz) = 52261
diff --git a/devel/hs-refact/Makefile b/devel/hs-refact/Makefile
new file mode 100644
index 000000000000..d6ff92d47c3b
--- /dev/null
+++ b/devel/hs-refact/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= refact
+PORTVERSION= 0.3.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This library provides a datatype which can be interpreted by apply-refact
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-refact/distinfo b/devel/hs-refact/distinfo
new file mode 100644
index 000000000000..6255d49b5ad3
--- /dev/null
+++ b/devel/hs-refact/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499787634
+SHA256 (cabal/refact-0.3.0.2.tar.gz) = 0ad029727797c8ca5d179c7abf1bfc135d86a7d72cf93785ee12ad243aeb1f6c
+SIZE (cabal/refact-0.3.0.2.tar.gz) = 2345
diff --git a/devel/hs-refact/pkg-descr b/devel/hs-refact/pkg-descr
new file mode 100644
index 000000000000..4d6c78ce7b4a
--- /dev/null
+++ b/devel/hs-refact/pkg-descr
@@ -0,0 +1,5 @@
+This library provides a datatype which can be interpreted by apply-refact.
+It exists as a seperate library so that applications can specify refactorings
+without depending on GHC
+
+WWW: https://hackage.haskell.org/package/refact
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index b607c9ce2809..9fd729453cc6 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 2
+PORTVERSION= 2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index e025aa7d2b3f..cec6f7cf28da 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/reflection-2.tar.gz) = ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2
-SIZE (cabal/reflection-2.tar.gz) = 13194
+TIMESTAMP = 1499627855
+SHA256 (cabal/reflection-2.1.2.tar.gz) = a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39
+SIZE (cabal/reflection-2.1.2.tar.gz) = 14334
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 2e8542297453..e4064e8919d9 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -2,6 +2,7 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.3.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resource-pool/distinfo b/devel/hs-resource-pool/distinfo
index 6f889e525a4d..8fd19b0bd466 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627855
SHA256 (cabal/resource-pool-0.2.3.2.tar.gz) = 8627eea2bea8824af2723646e74e2af0c73f583dd0c496c9fd242cd9d242bc12
SIZE (cabal/resource-pool-0.2.3.2.tar.gz) = 6527
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index aa6659e0d60e..df16fa3a3d47 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Deterministic allocation and freeing of scarce resources
LICENSE= BSD3CLAUSE
-USE_CABAL= exceptions>=0.5 lifted-base>=0.1 mmorph monad-control>=0.3.1 \
- mtl>=2.0 transformers-base>=0.4.1 transformers-compat>=0.3
+USE_CABAL= exceptions lifted-base mmorph monad-control mtl \
+ transformers-base transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index 12e5783cf1a0..f56286edbe44 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/resourcet-1.1.6.tar.gz) = 3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e
-SIZE (cabal/resourcet-1.1.6.tar.gz) = 11627
+TIMESTAMP = 1499458469
+SHA256 (cabal/resourcet-1.1.9.tar.gz) = 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5
+SIZE (cabal/resourcet-1.1.9.tar.gz) = 15215
diff --git a/devel/hs-safe-exceptions/Makefile b/devel/hs-safe-exceptions/Makefile
new file mode 100644
index 000000000000..5eddfdd566cd
--- /dev/null
+++ b/devel/hs-safe-exceptions/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= safe-exceptions
+PORTVERSION= 0.1.6.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The safe-exceptions package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= exceptions
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-safe-exceptions/distinfo b/devel/hs-safe-exceptions/distinfo
new file mode 100644
index 000000000000..651ca5d1f089
--- /dev/null
+++ b/devel/hs-safe-exceptions/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499717912
+SHA256 (cabal/safe-exceptions-0.1.6.0.tar.gz) = 71d47ce1049465b02d89231f2931e7a1d22b6960e85fca5281162e979cf08d1c
+SIZE (cabal/safe-exceptions-0.1.6.0.tar.gz) = 13447
diff --git a/devel/hs-safe-exceptions/pkg-descr b/devel/hs-safe-exceptions/pkg-descr
new file mode 100644
index 000000000000..759dc66d60ac
--- /dev/null
+++ b/devel/hs-safe-exceptions/pkg-descr
@@ -0,0 +1,3 @@
+The safe-exceptions package
+
+WWW: http://hackage.haskell.org/package/safe-exceptions
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index d7cceeee09a9..2a782f0a5a81 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= safe
-PORTVERSION= 0.3.9
+PORTVERSION= 0.3.15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 1fa4b9d98302..8122ac9d35b4 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/safe-0.3.9.tar.gz) = d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9
-SIZE (cabal/safe-0.3.9.tar.gz) = 6931
+TIMESTAMP = 1499627855
+SHA256 (cabal/safe-0.3.15.tar.gz) = a35e4ae609aabd568da7e7d220ab529c34040b71ae50df1ee353896445a66a2d
+SIZE (cabal/safe-0.3.15.tar.gz) = 9988
diff --git a/devel/hs-say/Makefile b/devel/hs-say/Makefile
new file mode 100644
index 000000000000..0478c112bcf1
--- /dev/null
+++ b/devel/hs-say/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= say
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The say packagae
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-say/distinfo b/devel/hs-say/distinfo
new file mode 100644
index 000000000000..16c53626cb61
--- /dev/null
+++ b/devel/hs-say/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499718718
+SHA256 (cabal/say-0.1.0.0.tar.gz) = f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40
+SIZE (cabal/say-0.1.0.0.tar.gz) = 5728
diff --git a/devel/hs-say/pkg-descr b/devel/hs-say/pkg-descr
new file mode 100644
index 000000000000..e2fb582fb645
--- /dev/null
+++ b/devel/hs-say/pkg-descr
@@ -0,0 +1,3 @@
+The say package
+
+WWW: http://hackage.haskell.org/package/say
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index 6f48878a10f2..73f2d8f979cd 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= scientific
-PORTVERSION= 0.3.3.8
+PORTVERSION= 0.3.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Numbers represented using scientific notation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.2 text>=0.8
+USE_CABAL= hashable>=1.1.2 text>=0.8 integer-logarithms vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
index f91c9de62e16..c36c330750e5 100644
--- a/devel/hs-scientific/distinfo
+++ b/devel/hs-scientific/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/scientific-0.3.3.8.tar.gz) = e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c
-SIZE (cabal/scientific-0.3.3.8.tar.gz) = 18543
+TIMESTAMP = 1499627855
+SHA256 (cabal/scientific-0.3.5.1.tar.gz) = 5ba6e682cbb6cd5c6444d1c6c35f3b396e316637a14456b18de58c9a33661ba6
+SIZE (cabal/scientific-0.3.5.1.tar.gz) = 20777
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index b1a5d520fcf5..6e4ef44e4956 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -2,6 +2,7 @@
PORTNAME= securemem
PORTVERSION= 0.1.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
index ab0b798d33e4..2cfe81816758 100644
--- a/devel/hs-securemem/distinfo
+++ b/devel/hs-securemem/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036
SIZE (cabal/securemem-0.1.9.tar.gz) = 4180
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index 97cf3c68515a..01a263d88fb2 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,6 +2,7 @@
PORTNAME= setenv
PORTVERSION= 0.1.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
index dded823e77af..710827f5c44b 100644
--- a/devel/hs-setenv/distinfo
+++ b/devel/hs-setenv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/setenv-0.1.1.3.tar.gz) = e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32
SIZE (cabal/setenv-0.1.1.3.tar.gz) = 2710
diff --git a/devel/hs-setlocale/Makefile b/devel/hs-setlocale/Makefile
index bcffdff6ef98..cb52ddbc01fc 100644
--- a/devel/hs-setlocale/Makefile
+++ b/devel/hs-setlocale/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= setlocale
-PORTVERSION= 1.0.0.4
+PORTVERSION= 1.0.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setlocale/distinfo b/devel/hs-setlocale/distinfo
index 249df5c37886..7faa69e6456a 100644
--- a/devel/hs-setlocale/distinfo
+++ b/devel/hs-setlocale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475870204
-SHA256 (cabal/setlocale-1.0.0.4.tar.gz) = 32396aedcb8fdd6c56821dcde25c2cbd76462b13a6dc229bec29cb78df1fa7e9
-SIZE (cabal/setlocale-1.0.0.4.tar.gz) = 2138
+TIMESTAMP = 1499627856
+SHA256 (cabal/setlocale-1.0.0.5.tar.gz) = 57438491475004eda12d7a73eea0ab1c5fb28774027626e5bbcb142fe57d9ff0
+SIZE (cabal/setlocale-1.0.0.5.tar.gz) = 2108
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index af2c6d8239c4..3d416c62ecb7 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shake
-PORTVERSION= 0.15.5
+PORTVERSION= 0.15.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index 66d22f9b1f30..b7f44b6f0a76 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/shake-0.15.5.tar.gz) = 2c806824c9e8a619f364c3ec6bb910d7b1d0b0d3ba39ab472bffb60311f373a3
-SIZE (cabal/shake-0.15.5.tar.gz) = 507883
+TIMESTAMP = 1499544643
+SHA256 (cabal/shake-0.15.11.tar.gz) = 05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb
+SIZE (cabal/shake-0.15.11.tar.gz) = 513926
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index aec1d07304f4..070f1e4132cb 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-show/distinfo b/devel/hs-show/distinfo
index 56a76cb12b4f..b531c43675a1 100644
--- a/devel/hs-show/distinfo
+++ b/devel/hs-show/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/show-0.6.tar.gz) = 4f57a947a538d021406f649049dde27d4d8d0b44aac3ba38fa64806c9d737b95
SIZE (cabal/show-0.6.tar.gz) = 7635
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index 3306d814d82f..f322b082ce2a 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,6 +2,7 @@
PORTNAME= silently
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index c9b6aed74b4c..420a250088cb 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/silently-1.2.5.tar.gz) = cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839
SIZE (cabal/silently-1.2.5.tar.gz) = 3364
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 48ba1ad017ff..f86c586cfeaa 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
index f8fcfcbeb906..5e7ecbf9a708 100644
--- a/devel/hs-simple-reflect/distinfo
+++ b/devel/hs-simple-reflect/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/simple-reflect-0.3.2.tar.gz) = 38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6
SIZE (cabal/simple-reflect-0.3.2.tar.gz) = 4492
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index c3aec7b9c76e..5af58b0c0d50 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index 1d9ad5cb7b2c..b3e772e79269 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/smallcheck-1.1.1.tar.gz) = 4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9
SIZE (cabal/smallcheck-1.1.1.tar.gz) = 15202
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index e3ba2116e009..83c3bf798482 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= split
-PORTVERSION= 0.2.2
-PORTREVISION= 7
+PORTVERSION= 0.2.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index c58d4bbf48ef..305823326e7d 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/split-0.2.2.tar.gz) = f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375
-SIZE (cabal/split-0.2.2.tar.gz) = 14666
+TIMESTAMP = 1499447103
+SHA256 (cabal/split-0.2.3.2.tar.gz) = 4943eaad0dd473d44b4b97b8b9731c20f05ba86abb8a1fa07f8df819f09eb63a
+SIZE (cabal/split-0.2.3.2.tar.gz) = 15779
diff --git a/devel/hs-split/files/patch-split.cabal b/devel/hs-split/files/patch-split.cabal
deleted file mode 100644
index be8fe222fdd5..000000000000
--- a/devel/hs-split/files/patch-split.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- split.cabal.orig 2013-04-14 18:47:17 UTC
-+++ split.cabal
-@@ -51,7 +51,7 @@ Source-repository head
-
- Library
- ghc-options: -Wall
-- build-depends: base <4.8
-+ build-depends: base <4.9
- 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 6be17fe14f18..b07d13b484ad 100644
--- a/devel/hs-stm-chans/Makefile
+++ b/devel/hs-stm-chans/Makefile
@@ -2,6 +2,7 @@
PORTNAME= stm-chans
PORTVERSION= 3.0.0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm-chans/distinfo b/devel/hs-stm-chans/distinfo
index e0fa2ef77f8c..a8ea94309239 100644
--- a/devel/hs-stm-chans/distinfo
+++ b/devel/hs-stm-chans/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/stm-chans-3.0.0.4.tar.gz) = 2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738
SIZE (cabal/stm-chans-3.0.0.4.tar.gz) = 9673
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index e026222609f2..22cde311a15c 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= stm
-PORTVERSION= 2.4.4
+PORTVERSION= 2.4.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 314276a4b6bb..02ce74b1dacf 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/stm-2.4.4.tar.gz) = 5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d
-SIZE (cabal/stm-2.4.4.tar.gz) = 10349
+TIMESTAMP = 1498678463
+SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384
+SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index e7c7f805a95f..99b29947f4a7 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= streaming-commons
-PORTVERSION= 0.1.12.1
+PORTVERSION= 0.1.18
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Common lower-level functions needed by various streaming data libraries
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.3 network random stm text zlib
+USE_CABAL= async blaze-builder network random stm text zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo
index 53346afce3b7..d2427bab995d 100644
--- a/devel/hs-streaming-commons/distinfo
+++ b/devel/hs-streaming-commons/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/streaming-commons-0.1.12.1.tar.gz) = d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7
-SIZE (cabal/streaming-commons-0.1.12.1.tar.gz) = 86864
+TIMESTAMP = 1499627857
+SHA256 (cabal/streaming-commons-0.1.18.tar.gz) = 27af2efb901a003c83fc6c71563eb70f45b4823516c299759d800a48d9f083cb
+SIZE (cabal/streaming-commons-0.1.18.tar.gz) = 87832
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 0a03a25d57e0..4d965caf7955 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/distinfo b/devel/hs-strict/distinfo
index e089fb25d600..37a716c9d25e 100644
--- a/devel/hs-strict/distinfo
+++ b/devel/hs-strict/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627857
SHA256 (cabal/strict-0.3.2.tar.gz) = 2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221
SIZE (cabal/strict-0.3.2.tar.gz) = 3948
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
deleted file mode 100644
index 404b77639c41..000000000000
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= syb-with-class-instances-text
-PORTVERSION= 0.0.1
-PORTREVISION= 12
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Scrap Your Boilerplate With Class Text instance
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= syb-with-class text>=0.7.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-syb-with-class-instances-text/distinfo b/devel/hs-syb-with-class-instances-text/distinfo
deleted file mode 100644
index 18d876d50d9e..000000000000
--- a/devel/hs-syb-with-class-instances-text/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/syb-with-class-instances-text-0.0.1.tar.gz) = 0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e
-SIZE (cabal/syb-with-class-instances-text-0.0.1.tar.gz) = 1838
diff --git a/devel/hs-syb-with-class-instances-text/pkg-descr b/devel/hs-syb-with-class-instances-text/pkg-descr
deleted file mode 100644
index 1f2b7d81c006..000000000000
--- a/devel/hs-syb-with-class-instances-text/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides SYB-with-class instances for Text from the text package.
-
-WWW: http://hackage.haskell.org/package/syb-with-class-instances-text
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 7189fde12787..f6ecddc074f3 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.6
+PORTVERSION= 0.6.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 41462786f910..19544d142ad6 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/syb-with-class-0.6.1.6.tar.gz) = 565c909dcf39c30c7fa2b5721e5d1049dbc9cdcd23e63645f69d8e245e84c1b0
-SIZE (cabal/syb-with-class-0.6.1.6.tar.gz) = 12515
+TIMESTAMP = 1499448315
+SHA256 (cabal/syb-with-class-0.6.1.7.tar.gz) = 5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb
+SIZE (cabal/syb-with-class-0.6.1.7.tar.gz) = 12524
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index fbe3ba5857ac..bb8b8da5b79c 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.5.1
+PORTVERSION= 0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index fa8be9c884bd..d1aea72d6031 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/syb-0.5.1.tar.gz) = 81b05f0e78d03e1cabe9610a6045a5ae74d88eaed7e79464d436ccaa6af93846
-SIZE (cabal/syb-0.5.1.tar.gz) = 39469
+TIMESTAMP = 1499627857
+SHA256 (cabal/syb-0.7.tar.gz) = b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5
+SIZE (cabal/syb-0.7.tar.gz) = 39566
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index c94909f154d8..a6e46b1af235 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= system-fileio
PORTVERSION= 0.3.16.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index 88c5f333f024..c3db8cf034b5 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627858
SHA256 (cabal/system-fileio-0.3.16.3.tar.gz) = 3175707cb322c65760fa2eb2ab17327f251c8294ad688efc6258e82328830491
SIZE (cabal/system-fileio-0.3.16.3.tar.gz) = 15296
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 4ac83df0132a..8db67de2659e 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -2,6 +2,7 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.13.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index 10b75e63b874..50074e72a946 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627858
SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb
SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 38be9aefa824..a02893d86140 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Haskell 98 phantom types to avoid unsafely passing dummy arguments
LICENSE= BSD3CLAUSE
+USE_CABAL= transformers-compat
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index 14ddc6e32d00..4bd7820e0cc1 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tagged-0.8.1.tar.gz) = 5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1
-SIZE (cabal/tagged-0.8.1.tar.gz) = 8088
+TIMESTAMP = 1499459567
+SHA256 (cabal/tagged-0.8.5.tar.gz) = e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99
+SIZE (cabal/tagged-0.8.5.tar.gz) = 10860
diff --git a/devel/hs-tagged/files/patch-tagged.cabal b/devel/hs-tagged/files/patch-tagged.cabal
new file mode 100644
index 000000000000..ed0eb7c3ac4d
--- /dev/null
+++ b/devel/hs-tagged/files/patch-tagged.cabal
@@ -0,0 +1,11 @@
+--- tagged.cabal.orig 2017-07-07 20:47:45 UTC
++++ tagged.cabal
+@@ -57,7 +57,7 @@ library
+
+ if impl(ghc>=7.6)
+ exposed-modules: Data.Proxy.TH
+- build-depends: template-haskell >= 2.8 && < 2.12
++ build-depends: template-haskell >= 2.8 && < 2.13
+
+ if flag(deepseq)
+ build-depends: deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index eb5fd35bb738..1f350c016be7 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= temporary
-PORTVERSION= 1.2.0.3
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-temporary/distinfo b/devel/hs-temporary/distinfo
index c7bacf28cc1a..882bbe77d180 100644
--- a/devel/hs-temporary/distinfo
+++ b/devel/hs-temporary/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/temporary-1.2.0.3.tar.gz) = 8a889c7e62a2bb144eb9e394fab51e5dbd843d473ac2eab9e16b55a9eb3a4647
-SIZE (cabal/temporary-1.2.0.3.tar.gz) = 5308
+TIMESTAMP = 1499627858
+SHA256 (cabal/temporary-1.2.1.tar.gz) = 9ecf88065cf69e965dc672c4a94f0b5e909d3e398c24d947bbd5e9814277a4f8
+SIZE (cabal/temporary-1.2.1.tar.gz) = 5137
diff --git a/devel/hs-terminal-size/Makefile b/devel/hs-terminal-size/Makefile
new file mode 100644
index 000000000000..1c271b2b524a
--- /dev/null
+++ b/devel/hs-terminal-size/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= terminal-size
+PORTVERSION= 0.3.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Get terminal window height and width
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-terminal-size/distinfo b/devel/hs-terminal-size/distinfo
new file mode 100644
index 000000000000..edfa59a47b5d
--- /dev/null
+++ b/devel/hs-terminal-size/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501333052
+SHA256 (cabal/terminal-size-0.3.2.1.tar.gz) = b5c23e964756bc13914649a67d63233f59ad0a813abe7cadeb2fc9d586dc9658
+SIZE (cabal/terminal-size-0.3.2.1.tar.gz) = 4175
diff --git a/devel/hs-terminal-size/pkg-descr b/devel/hs-terminal-size/pkg-descr
new file mode 100644
index 000000000000..140e20dd7ca2
--- /dev/null
+++ b/devel/hs-terminal-size/pkg-descr
@@ -0,0 +1,3 @@
+Get terminal window height and width without ncurses dependency.
+
+WWW: http://hackage.haskell.org/package/terminal-size
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 28ee9401c112..c6ed7562c63f 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework-hunit
-PORTVERSION= 0.3.0.1
-PORTREVISION= 2
+PORTVERSION= 0.3.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HUnit support for the test-framework package
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions>=0.1.1 HUnit>=1.2 test-framework>=0.2.0
+USE_CABAL= extensible-exceptions HUnit test-framework
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-hunit/distinfo b/devel/hs-test-framework-hunit/distinfo
index 001155ebfd03..7f16fa1b6e75 100644
--- a/devel/hs-test-framework-hunit/distinfo
+++ b/devel/hs-test-framework-hunit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/test-framework-hunit-0.3.0.1.tar.gz) = d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0
-SIZE (cabal/test-framework-hunit-0.3.0.1.tar.gz) = 2690
+TIMESTAMP = 1499627859
+SHA256 (cabal/test-framework-hunit-0.3.0.2.tar.gz) = 95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8
+SIZE (cabal/test-framework-hunit-0.3.0.2.tar.gz) = 2770
diff --git a/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal b/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal
new file mode 100644
index 000000000000..0479ad483dfb
--- /dev/null
+++ b/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal
@@ -0,0 +1,16 @@
+From 70a36fbeefd29c9340782d52ba0295014120c82d Mon Sep 17 00:00:00 2001
+From: Adam Bergmark <adam@bergmark.nl>
+Date: Sat, 25 Mar 2017 11:52:44 +0100
+Subject: [PATCH] Allow time 1.6.* and HUnit 1.6.*
+
+--- test-framework-hunit.cabal.orig 2015-09-04 15:42:16 UTC
++++ test-framework-hunit.cabal
+@@ -24,7 +24,7 @@ Flag Base3
+ Library
+ Exposed-Modules: Test.Framework.Providers.HUnit
+
+- Build-Depends: test-framework >= 0.2.0, HUnit >= 1.2 && < 1.4, extensible-exceptions >= 0.1.1 && < 0.2.0
++ Build-Depends: test-framework >= 0.2.0, HUnit >= 1.2 && < 1.7, extensible-exceptions >= 0.1.1 && < 0.2.0
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4
+ else
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index bf848b7be014..84b48062ca53 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework-quickcheck2
-PORTVERSION= 0.3.0.3
-PORTREVISION= 2
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/distinfo b/devel/hs-test-framework-quickcheck2/distinfo
index 5d1611734de2..8299410e9485 100644
--- a/devel/hs-test-framework-quickcheck2/distinfo
+++ b/devel/hs-test-framework-quickcheck2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = cc96c6f30c29b16a3f7ec5c108f320a6c0f0d3ef71afff8a1cb98caf33ffe18a
-SIZE (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = 3518
+TIMESTAMP = 1499627859
+SHA256 (cabal/test-framework-quickcheck2-0.3.0.4.tar.gz) = d763afb99fa14cffaccbfad259534a656be129329ba12246fed2e4330619486e
+SIZE (cabal/test-framework-quickcheck2-0.3.0.4.tar.gz) = 3813
diff --git a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
deleted file mode 100644
index 64f0f4a67575..000000000000
--- a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- test-framework-quickcheck2.cabal.orig 2014-04-11 10:23:46 UTC
-+++ test-framework-quickcheck2.cabal
-@@ -25,7 +25,7 @@ Library
- Exposed-Modules: Test.Framework.Providers.QuickCheck2
-
- Build-Depends: test-framework >= 0.7.1,
-- QuickCheck >= 2.4 && < 2.8,
-+ QuickCheck >= 2.4 && < 2.9,
- extensible-exceptions >= 0.1.1 && < 0.2.0
- if flag(base3)
- Build-Depends: base >= 3 && < 4, random >= 1
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 8518670aea28..f033ca9c05bc 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,6 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index ac25d81801b6..c3edb1f25d57 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273
SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900
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..9f4db483b1df
--- /dev/null
+++ b/devel/hs-test-framework/files/patch-test-framework.cabal
@@ -0,0 +1,11 @@
+--- test-framework.cabal.orig 2017-07-08 19:34:13 UTC
++++ test-framework.cabal
+@@ -50,7 +50,7 @@ Library
+ base >= 4.3 && < 5, random >= 1.0, containers >= 0.1,
+ regex-posix >= 0.72,
+ old-locale >= 1.0,
+- time >= 1.1.2 && < 1.6,
++ time >= 1.1.2 && < 1.7,
+ xml >= 1.3.5, hostname >= 1.0
+
+ Extensions: CPP
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 9406d8649efc..0f24ca69db9e 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-icu/distinfo b/devel/hs-text-icu/distinfo
index df0f0b184181..ac03514ab2b8 100644
--- a/devel/hs-text-icu/distinfo
+++ b/devel/hs-text-icu/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
SHA256 (cabal/text-icu-0.7.0.1.tar.gz) = e2764c2749033706eed5b9fb3cda11177ad15cdf11912028f551eca39a2c7f78
SIZE (cabal/text-icu-0.7.0.1.tar.gz) = 45533
diff --git a/devel/hs-text-short/Makefile b/devel/hs-text-short/Makefile
new file mode 100644
index 000000000000..52962ca1fdf9
--- /dev/null
+++ b/devel/hs-text-short/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= text-short
+PORTVERSION= 0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package provides the ShortText type which is suitable for keeping many short strings in memory
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable semigroups text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-text-short/distinfo b/devel/hs-text-short/distinfo
new file mode 100644
index 000000000000..061c1b8f838f
--- /dev/null
+++ b/devel/hs-text-short/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499546701
+SHA256 (cabal/text-short-0.1.tar.gz) = c06af3e53c345fa50df8e30589d854c84d212787eba648e6ded9b794e0df937e
+SIZE (cabal/text-short-0.1.tar.gz) = 6048
diff --git a/devel/hs-text-short/pkg-descr b/devel/hs-text-short/pkg-descr
new file mode 100644
index 000000000000..66cb96b1c1c6
--- /dev/null
+++ b/devel/hs-text-short/pkg-descr
@@ -0,0 +1,11 @@
+This package provides the ShortText type which is suitable for keeping many
+short strings in memory. This is similiar to how ShortByteString relates to
+ ByteString.
+
+The main difference between Text and ShortText is that ShortText uses UTF-8
+instead of UTF-16 internally and also doesn't support slicing (thereby
+saving 2 words). Consequently, the memory footprint of a (boxed) ShortText
+value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded
+payload.
+
+WWW: https://hackage.haskell.org/package/text-short
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 8cb68caa2ea0..708d442fe311 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 1.2.1.3
+PORTVERSION= 1.2.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 21a9b6928f91..2be66835e568 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/text-1.2.1.3.tar.gz) = 98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f
-SIZE (cabal/text-1.2.1.3.tar.gz) = 145946
+TIMESTAMP = 1499546607
+SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9
+SIZE (cabal/text-1.2.2.2.tar.gz) = 151048
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 9e85e896b8c4..21651b0d2344 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tf-random/distinfo b/devel/hs-tf-random/distinfo
index 262758d3ae17..347da89f2ef9 100644
--- a/devel/hs-tf-random/distinfo
+++ b/devel/hs-tf-random/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
SHA256 (cabal/tf-random-0.5.tar.gz) = 2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510
SIZE (cabal/tf-random-0.5.tar.gz) = 18483
diff --git a/devel/hs-th-abstraction/Makefile b/devel/hs-th-abstraction/Makefile
new file mode 100644
index 000000000000..35038d7d8d1d
--- /dev/null
+++ b/devel/hs-th-abstraction/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= th-abstraction
+PORTVERSION= 0.2.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package normalizes variations in the interface for inspecting datatype information via Template Haskell
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-abstraction/distinfo b/devel/hs-th-abstraction/distinfo
new file mode 100644
index 000000000000..7ba65f2abd89
--- /dev/null
+++ b/devel/hs-th-abstraction/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694293
+SHA256 (cabal/th-abstraction-0.2.3.0.tar.gz) = 954bf25a4d558242970b2085333b2fb8811d2a926354a5d237a2db9c0718de03
+SIZE (cabal/th-abstraction-0.2.3.0.tar.gz) = 22183
diff --git a/devel/hs-th-abstraction/pkg-descr b/devel/hs-th-abstraction/pkg-descr
new file mode 100644
index 000000000000..3beaf70b6eba
--- /dev/null
+++ b/devel/hs-th-abstraction/pkg-descr
@@ -0,0 +1,5 @@
+This package normalizes variations in the interface for inspecting datatype
+information via Template Haskell so that packages and support a single, easier
+to use informational datatype while supporting many versions of Template Haskell.
+
+WWW: http://hackage.haskell.org/package/th-abstraction
diff --git a/devel/hs-th-lift-instances/Makefile b/devel/hs-th-lift-instances/Makefile
new file mode 100644
index 000000000000..efae271c7fc5
--- /dev/null
+++ b/devel/hs-th-lift-instances/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= th-lift-instances
+PORTVERSION= 0.1.11
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Some more Lift instances for common haskell data types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text th-lift vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-lift-instances/distinfo b/devel/hs-th-lift-instances/distinfo
new file mode 100644
index 000000000000..4fa1281f4107
--- /dev/null
+++ b/devel/hs-th-lift-instances/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621827
+SHA256 (cabal/th-lift-instances-0.1.11.tar.gz) = 1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8
+SIZE (cabal/th-lift-instances-0.1.11.tar.gz) = 4477
diff --git a/devel/hs-th-lift-instances/pkg-descr b/devel/hs-th-lift-instances/pkg-descr
new file mode 100644
index 000000000000..22b83781c96e
--- /dev/null
+++ b/devel/hs-th-lift-instances/pkg-descr
@@ -0,0 +1,3 @@
+Most data types in haskell platform do not have Lift instances. This package provides orphan instances for containers, text, bytestring and vector.
+
+WWW: http://hackage.haskell.org/package/th-lift-instances
diff --git a/devel/hs-th-lift/Makefile b/devel/hs-th-lift/Makefile
new file mode 100644
index 000000000000..2bc68f6f6b13
--- /dev/null
+++ b/devel/hs-th-lift/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= th-lift
+PORTVERSION= 0.7.7
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Derive Template Haskell's Lift class for datatypes.
+
+LICENSE= BSD3CLAUSE
+
+.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
new file mode 100644
index 000000000000..c50cacb6471d
--- /dev/null
+++ b/devel/hs-th-lift/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621822
+SHA256 (cabal/th-lift-0.7.7.tar.gz) = 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5
+SIZE (cabal/th-lift-0.7.7.tar.gz) = 12399
diff --git a/devel/hs-th-lift/pkg-descr b/devel/hs-th-lift/pkg-descr
new file mode 100644
index 000000000000..97e675739882
--- /dev/null
+++ b/devel/hs-th-lift/pkg-descr
@@ -0,0 +1,3 @@
+Derive Template Haskell's Lift class for datatypes.
+
+WWW: http://hackage.haskell.org/package/th-lift
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index dbd33390567f..1a9b2f381f7a 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.1.3
+PORTVERSION= 0.5.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index db08e1a6a00e..32a63654f916 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/threads-0.5.1.3.tar.gz) = 02bd4c7597f77d0d5064db4031547cd7b4989f453c77d520223ba2b1b9846411
-SIZE (cabal/threads-0.5.1.3.tar.gz) = 7239
+TIMESTAMP = 1499447395
+SHA256 (cabal/threads-0.5.1.4.tar.gz) = d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd
+SIZE (cabal/threads-0.5.1.4.tar.gz) = 7395
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 5fdd47934b9d..c672767c2a90 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= threadscope
-PORTVERSION= 0.2.7
+PORTVERSION= 0.2.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT= Graphical tool for profiling parallel Haskell programs
LICENSE= BSD3CLAUSE
-USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
- pango text
+USE_CABAL= cairo ghc-events glib gtk mtl pango text
EXECUTABLE= threadscope
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index a93d17e84830..8e4294c912fb 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/threadscope-0.2.7.tar.gz) = cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6
-SIZE (cabal/threadscope-0.2.7.tar.gz) = 79966
+TIMESTAMP = 1501147826
+SHA256 (cabal/threadscope-0.2.8.tar.gz) = c27e15011d4630b77ed51e725e7668e06f6e06b73c2b9b601560af0e60e3f218
+SIZE (cabal/threadscope-0.2.8.tar.gz) = 79624
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 50cabf4e4a25..ee232153eca6 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-compat/distinfo b/devel/hs-time-compat/distinfo
index 5967d17ffb23..a5e3aa568faa 100644
--- a/devel/hs-time-compat/distinfo
+++ b/devel/hs-time-compat/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627860
SHA256 (cabal/time-compat-0.1.0.3.tar.gz) = 590711214510c0d2d09780c7fe3b21748bc4802e9053f78ccd6658e951fe0f7f
SIZE (cabal/time-compat-0.1.0.3.tar.gz) = 2256
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
index efae2d3a06d7..dc7ae2c30a6c 100644
--- a/devel/hs-time-locale-compat/Makefile
+++ b/devel/hs-time-locale-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= time-locale-compat
-PORTVERSION= 0.1.1.0
+PORTVERSION= 0.1.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Compatibility of TimeLocale between old-locale and time-1.5
LICENSE= BSD3CLAUSE
+USE_CABAL= old-locale
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-time-locale-compat/distinfo b/devel/hs-time-locale-compat/distinfo
index 254aff6e4d70..0533bd70cba7 100644
--- a/devel/hs-time-locale-compat/distinfo
+++ b/devel/hs-time-locale-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/time-locale-compat-0.1.1.0.tar.gz) = 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455
-SIZE (cabal/time-locale-compat-0.1.1.0.tar.gz) = 1933
+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
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 05ca18ba3067..cb0ce7e338bb 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index 755daf315011..ba5547e3d00f 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/timezone-olson-0.1.7.tar.gz) = 232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa
-SIZE (cabal/timezone-olson-0.1.7.tar.gz) = 11313
+TIMESTAMP = 1499450481
+SHA256 (cabal/timezone-olson-0.1.8.tar.gz) = b96b01015ae5191a56d6bbdbbc3d084f0afb9acd72d84c301792f07871dd3747
+SIZE (cabal/timezone-olson-0.1.8.tar.gz) = 11356
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index f7b71b91614b..5f5f42ae154f 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-series
-PORTVERSION= 0.1.5.1
+PORTVERSION= 0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
index 89961061e022..1eb2e5ffdc44 100644
--- a/devel/hs-timezone-series/distinfo
+++ b/devel/hs-timezone-series/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/timezone-series-0.1.5.1.tar.gz) = d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56
-SIZE (cabal/timezone-series-0.1.5.1.tar.gz) = 5330
+TIMESTAMP = 1499448454
+SHA256 (cabal/timezone-series-0.1.8.tar.gz) = 8119d90e4e78fdb662e83f2a350e30678e5e9078737ee90b6c121b62c1a3cdf6
+SIZE (cabal/timezone-series-0.1.8.tar.gz) = 6250
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index a0887bea8f44..191da8aae503 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -2,6 +2,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/distinfo b/devel/hs-transformers-base/distinfo
index 966b08ccdc33..29160531051a 100644
--- a/devel/hs-transformers-base/distinfo
+++ b/devel/hs-transformers-base/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
SHA256 (cabal/transformers-base-0.4.4.tar.gz) = 6aa3494fc70659342fbbb163035d5827ecfd8079e3c929e2372adf771fd52387
SIZE (cabal/transformers-base-0.4.4.tar.gz) = 2550
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
index eb5636fbee83..49a7b438db9e 100644
--- a/devel/hs-transformers-compat/Makefile
+++ b/devel/hs-transformers-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-compat
-PORTVERSION= 0.4.0.4
+PORTVERSION= 0.5.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-compat/distinfo b/devel/hs-transformers-compat/distinfo
index 14290a24ab78..4f0a0b90b5b8 100644
--- a/devel/hs-transformers-compat/distinfo
+++ b/devel/hs-transformers-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/transformers-compat-0.4.0.4.tar.gz) = d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52
-SIZE (cabal/transformers-compat-0.4.0.4.tar.gz) = 12048
+TIMESTAMP = 1498678403
+SHA256 (cabal/transformers-compat-0.5.1.4.tar.gz) = d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f
+SIZE (cabal/transformers-compat-0.5.1.4.tar.gz) = 18574
diff --git a/devel/hs-typed-process/Makefile b/devel/hs-typed-process/Makefile
new file mode 100644
index 000000000000..484ef4f4593f
--- /dev/null
+++ b/devel/hs-typed-process/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= typed-process
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The typed-process package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async conduit conduit-extra exceptions stm
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-typed-process/distinfo b/devel/hs-typed-process/distinfo
new file mode 100644
index 000000000000..1c4fce06c6c2
--- /dev/null
+++ b/devel/hs-typed-process/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720967
+SHA256 (cabal/typed-process-0.1.0.0.tar.gz) = de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8
+SIZE (cabal/typed-process-0.1.0.0.tar.gz) = 12886
diff --git a/devel/hs-typed-process/pkg-descr b/devel/hs-typed-process/pkg-descr
new file mode 100644
index 000000000000..46049d20fa59
--- /dev/null
+++ b/devel/hs-typed-process/pkg-descr
@@ -0,0 +1,3 @@
+The typed-process package
+
+WWW: http://hackage.haskell.org/package/typed-process
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 3af42e625da1..0f9bb6afcdc1 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/distinfo b/devel/hs-unamb/distinfo
index 1a5de1cc3152..7fc7f9555ae1 100644
--- a/devel/hs-unamb/distinfo
+++ b/devel/hs-unamb/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
SHA256 (cabal/unamb-0.2.5.tar.gz) = 3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89
SIZE (cabal/unamb-0.2.5.tar.gz) = 6765
diff --git a/devel/hs-unexceptionalio/Makefile b/devel/hs-unexceptionalio/Makefile
new file mode 100644
index 000000000000..478caf7e2844
--- /dev/null
+++ b/devel/hs-unexceptionalio/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= unexceptionalio
+PORTVERSION= 0.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= IO without any non-error, synchronous exceptions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-unexceptionalio/distinfo b/devel/hs-unexceptionalio/distinfo
new file mode 100644
index 000000000000..ce404424d4db
--- /dev/null
+++ b/devel/hs-unexceptionalio/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499452943
+SHA256 (cabal/unexceptionalio-0.3.0.tar.gz) = 927e2be6bb9ced73c1c17d79c981cadef4039d9ee45d2d3d6b4c133ff93ff0b8
+SIZE (cabal/unexceptionalio-0.3.0.tar.gz) = 2335
diff --git a/devel/hs-unexceptionalio/pkg-descr b/devel/hs-unexceptionalio/pkg-descr
new file mode 100644
index 000000000000..ccab481cc4db
--- /dev/null
+++ b/devel/hs-unexceptionalio/pkg-descr
@@ -0,0 +1,7 @@
+When you've caught all the exceptions that can be handled safely,
+this is what you're left with.
+
+It is intended that you use qualified imports with this library.
+
+WWW: https://hackage.haskell.org/package/unexceptionalio
+
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 68d8c6fba98b..438271c4f71d 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index c0b8784e5f07..c34b48d125b0 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
SHA256 (cabal/uniplate-1.6.12.tar.gz) = fcc60bc6b3f6e925f611646db90e6db9f05286a9363405f844df1dc15572a8b7
SIZE (cabal/uniplate-1.6.12.tar.gz) = 30055
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index c61b6692e63e..286972d418df 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.4
+PORTVERSION= 0.4.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index b02b126258dd..6471cd40c909 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unix-compat-0.4.1.4.tar.gz) = fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b
-SIZE (cabal/unix-compat-0.4.1.4.tar.gz) = 12830
+TIMESTAMP = 1499627861
+SHA256 (cabal/unix-compat-0.4.3.1.tar.gz) = 72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27
+SIZE (cabal/unix-compat-0.4.3.1.tar.gz) = 13152
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index d4cbd47db081..a00285d3d423 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index a028d8ab3e9d..d59e5ce39abd 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unix-time-0.3.5.tar.gz) = 7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e
-SIZE (cabal/unix-time-0.3.5.tar.gz) = 40201
+TIMESTAMP = 1499627862
+SHA256 (cabal/unix-time-0.3.7.tar.gz) = 1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1
+SIZE (cabal/unix-time-0.3.7.tar.gz) = 40549
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index c8e0182ae729..a2a47703434f 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.5.1
+PORTVERSION= 0.2.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index dca2a234c777..a571c53c5490 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unordered-containers-0.2.5.1.tar.gz) = 6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a
-SIZE (cabal/unordered-containers-0.2.5.1.tar.gz) = 26093
+TIMESTAMP = 1499596921
+SHA256 (cabal/unordered-containers-0.2.8.0.tar.gz) = a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8
+SIZE (cabal/unordered-containers-0.2.8.0.tar.gz) = 31824
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index d974f5bc1d82..c80fa39461ad 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-light/distinfo b/devel/hs-utf8-light/distinfo
index c435ede9d23e..4f55fb6716cb 100644
--- a/devel/hs-utf8-light/distinfo
+++ b/devel/hs-utf8-light/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
SHA256 (cabal/utf8-light-0.4.2.tar.gz) = 184c428ce7896d702da46f6f107e6873ff100dbc1af40b49b5ce87317e619e67
SIZE (cabal/utf8-light-0.4.2.tar.gz) = 5821
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 4f34953f6f94..d20be246dd5e 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= utf8-string
-PORTVERSION= 1
+PORTVERSION= 1.0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index 34d35826b420..90f08763191f 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/utf8-string-1.tar.gz) = 79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08
-SIZE (cabal/utf8-string-1.tar.gz) = 7707
+TIMESTAMP = 1499444718
+SHA256 (cabal/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
+SIZE (cabal/utf8-string-1.0.1.1.tar.gz) = 8667
diff --git a/devel/hs-utf8-string/files/patch-git_6b70ee7 b/devel/hs-utf8-string/files/patch-git_6b70ee7
new file mode 100644
index 000000000000..5ad204e8f019
--- /dev/null
+++ b/devel/hs-utf8-string/files/patch-git_6b70ee7
@@ -0,0 +1,16 @@
+From ea531a1888b901a56f1503a66c2828f636fb21f9 Mon Sep 17 00:00:00 2001
+From: Herbert Valerio Riedel <hvr@gnu.org>
+Date: Sat, 2 Jan 2016 23:57:50 +0100
+Subject: [PATCH 1/2] Allow GHC 7.10 / base-4.9
+
+--- utf8-string.cabal.orig 2015-08-23 16:19:40 UTC
++++ utf8-string.cabal
+@@ -19,7 +19,7 @@ Tested-With: GHC==7.0.4, GHC==7.4.2, GHC==7.6.3
+ library
+ Ghc-options: -W -O2
+
+- build-depends: base >= 4.3 && < 4.9, bytestring >= 0.9
++ build-depends: base >= 4.3 && < 5.0, bytestring >= 0.9
+
+ Extensions: CPP
+ Exposed-modules: Codec.Binary.UTF8.String
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 1d8b3e5b0286..9b4fc6cf94ab 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= utility-ht
-PORTVERSION= 0.0.10
+PORTVERSION= 0.0.14
PORTREVISION= 2
CATEGORIES= devel haskell
diff --git a/devel/hs-utility-ht/distinfo b/devel/hs-utility-ht/distinfo
index 569d45540235..30645c73c503 100644
--- a/devel/hs-utility-ht/distinfo
+++ b/devel/hs-utility-ht/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/utility-ht-0.0.10.tar.gz) = ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f
-SIZE (cabal/utility-ht-0.0.10.tar.gz) = 20103
+TIMESTAMP = 1499627862
+SHA256 (cabal/utility-ht-0.0.14.tar.gz) = 69c2eee1330839cdff40fad4f68f8c7ce41ae3b46a9e1d575f589fcdcf7ceba8
+SIZE (cabal/utility-ht-0.0.14.tar.gz) = 25927
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 5ba6a77e9a5f..51d273d16d69 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/distinfo b/devel/hs-uuagc-bootstrap/distinfo
index ec40679cb55c..214e91403001 100644
--- a/devel/hs-uuagc-bootstrap/distinfo
+++ b/devel/hs-uuagc-bootstrap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
SHA256 (cabal/uuagc-bootstrap-0.9.40.2.tar.gz) = b83bcb9466026f1edaa396fd28efadff373066bb50a471a546fef42ffe454b7f
SIZE (cabal/uuagc-bootstrap-0.9.40.2.tar.gz) = 405302
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 8cb9ec81b008..6eda0f8fe7c0 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -2,6 +2,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.0.6.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index de780e5ef4e0..b34ca2b703e4 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627863
SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b
SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 56896be02d37..24dd6eee08c0 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.52.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 0fb591a91105..d469d8747b2e 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
SHA256 (cabal/uuagc-0.9.52.1.tar.gz) = 98092b13cb32e4493e877c3752deed471db762f04e7d979be4e6e89065502185
SIZE (cabal/uuagc-0.9.52.1.tar.gz) = 795294
diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile
index 170a0bba7bcb..09625c5e4458 100644
--- a/devel/hs-uuid-types/Makefile
+++ b/devel/hs-uuid-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uuid-types
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid-types/distinfo b/devel/hs-uuid-types/distinfo
index 576c52677e10..62577b26987e 100644
--- a/devel/hs-uuid-types/distinfo
+++ b/devel/hs-uuid-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uuid-types-1.0.2.tar.gz) = 56c6e9d6c05f30461419d2c3b90ef7e5f2fb8dd51c09846b5f4ce12d034f2e05
-SIZE (cabal/uuid-types-1.0.2.tar.gz) = 12142
+TIMESTAMP = 1499448182
+SHA256 (cabal/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
+SIZE (cabal/uuid-types-1.0.3.tar.gz) = 11999
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 12dc1ca5438e..a2d89949f100 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.3.11
+PORTVERSION= 1.3.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
LICENSE= BSD3CLAUSE
-USE_CABAL= cryptohash>=0.7 network-info>=0.2 random>=1.0.1 text>=1 \
- uuid-types>=1.0.2
+USE_CABAL= cryptohash-md5 cryptohash-sha1 entropy network-info random \
+ text uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index ad2711d96953..d67fc4508451 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uuid-1.3.11.tar.gz) = 671876d2f848c9155bfe661eb138d585897ab5b0a2f2e143ef85114d459814d5
-SIZE (cabal/uuid-1.3.11.tar.gz) = 8578
+TIMESTAMP = 1499452434
+SHA256 (cabal/uuid-1.3.13.tar.gz) = dfac808a7026217d018b408eab18facc6a85c6183be308d4ac7877e80599b027
+SIZE (cabal/uuid-1.3.13.tar.gz) = 8926
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 64012ef9214d..86d6fb8a7746 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.20
+PORTVERSION= 0.9.22
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 9b33d6df39a0..5f00cf1175bb 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uulib-0.9.20.tar.gz) = e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3
-SIZE (cabal/uulib-0.9.20.tar.gz) = 45120
+TIMESTAMP = 1499627863
+SHA256 (cabal/uulib-0.9.22.tar.gz) = cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad
+SIZE (cabal/uulib-0.9.22.tar.gz) = 45487
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 528af8e5a1ea..2960d8f42e2c 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.0.4
+PORTVERSION= 0.3.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index d98e273922d8..886921f34bdb 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vault-0.3.0.4.tar.gz) = 561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a
-SIZE (cabal/vault-0.3.0.4.tar.gz) = 5009
+TIMESTAMP = 1499458511
+SHA256 (cabal/vault-0.3.0.7.tar.gz) = 9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0
+SIZE (cabal/vault-0.3.0.7.tar.gz) = 5140
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index dcb27f8d9f52..f583f635ebd9 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -2,6 +2,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.7.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 a5c442db6d98..0ad9e7af2ede 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +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
diff --git a/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal b/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
new file mode 100644
index 000000000000..ef5d891319d5
--- /dev/null
+++ b/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
@@ -0,0 +1,11 @@
+--- 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 8c78d2369fc3..c189614d8eab 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-binary-instances
-PORTVERSION= 0.2.1.0
-PORTREVISION= 2
+PORTVERSION= 0.2.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo
index eaf71dc2946a..06fbd9065513 100644
--- a/devel/hs-vector-binary-instances/distinfo
+++ b/devel/hs-vector-binary-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 9450018a61ee5a62b802c1b2cfe8d289b7c8f3debeb0f8828679a4c085d31909
-SIZE (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 3114
+TIMESTAMP = 1499627864
+SHA256 (cabal/vector-binary-instances-0.2.3.5.tar.gz) = e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a
+SIZE (cabal/vector-binary-instances-0.2.3.5.tar.gz) = 4133
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 6d3f15215387..c14905189629 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector-instances
-PORTVERSION= 3.3.1
+PORTVERSION= 3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/distinfo b/devel/hs-vector-instances/distinfo
index 3cd2700551e5..7af9110640e5 100644
--- a/devel/hs-vector-instances/distinfo
+++ b/devel/hs-vector-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-instances-3.3.1.tar.gz) = 68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59
-SIZE (cabal/vector-instances-3.3.1.tar.gz) = 3726
+TIMESTAMP = 1499627864
+SHA256 (cabal/vector-instances-3.4.tar.gz) = 1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381
+SIZE (cabal/vector-instances-3.4.tar.gz) = 5276
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index e578fee23262..44dd21d37cc7 100644
--- a/devel/hs-vector-th-unbox/Makefile
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector-th-unbox
-PORTVERSION= 0.2.1.2
+PORTVERSION= 0.2.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Deriver for Data.Vector.Unboxed using Template Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= vector>=0.7
+USE_CABAL= vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector-th-unbox/distinfo b/devel/hs-vector-th-unbox/distinfo
index 6521be6e4e49..9c8b20c9c889 100644
--- a/devel/hs-vector-th-unbox/distinfo
+++ b/devel/hs-vector-th-unbox/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05
-SIZE (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 4536
+TIMESTAMP = 1499459996
+SHA256 (cabal/vector-th-unbox-0.2.1.6.tar.gz) = be87d4a6f1005ee2d0de6adf521e05c9e83c441568a8a8b60c79efe24ae90235
+SIZE (cabal/vector-th-unbox-0.2.1.6.tar.gz) = 4717
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 855b23e6d4ea..06bb9aef7430 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector
-PORTVERSION= 0.10.12.3
+PORTVERSION= 0.12.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index 7ef33ea92189..25c0f1dde667 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-0.10.12.3.tar.gz) = 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a
-SIZE (cabal/vector-0.10.12.3.tar.gz) = 103617
+TIMESTAMP = 1499445633
+SHA256 (cabal/vector-0.12.0.1.tar.gz) = b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b
+SIZE (cabal/vector-0.12.0.1.tar.gz) = 121798
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 7c610284fa03..fcf7fdab7ef9 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.7
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index daedb86f01c3..7b3b59ff82cc 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/void-0.7.tar.gz) = 981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47
-SIZE (cabal/void-0.7.tar.gz) = 3900
+TIMESTAMP = 1499627864
+SHA256 (cabal/void-0.7.2.tar.gz) = d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b
+SIZE (cabal/void-0.7.2.tar.gz) = 5563
diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile
new file mode 100644
index 000000000000..ead23629123c
--- /dev/null
+++ b/devel/hs-wl-pprint-text/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= wl-pprint-text
+PORTVERSION= 1.1.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A clone of wl-pprint for use with the text library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base-compat text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-wl-pprint-text/distinfo b/devel/hs-wl-pprint-text/distinfo
new file mode 100644
index 000000000000..096e33a8bb8e
--- /dev/null
+++ b/devel/hs-wl-pprint-text/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499543226
+SHA256 (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd
+SIZE (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 16575
diff --git a/devel/hs-wl-pprint-text/pkg-descr b/devel/hs-wl-pprint-text/pkg-descr
new file mode 100644
index 000000000000..595f33e9e690
--- /dev/null
+++ b/devel/hs-wl-pprint-text/pkg-descr
@@ -0,0 +1,3 @@
+A clone of wl-pprint for use with the text library
+
+WWW: https://hackage.haskell.org/package/wl-pprint-text
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 5a6a632d7520..408731ca0352 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -2,6 +2,7 @@
PORTNAME= word8
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 5f314321424e..235536f79a98 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627864
SHA256 (cabal/word8-0.1.2.tar.gz) = 3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd
SIZE (cabal/word8-0.1.2.tar.gz) = 6218
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 77b96250c9a3..74af0ed424c0 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -10,11 +10,12 @@
PORTNAME= stack
PORTVERSION= 1.5.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel haskell
MASTER_SITES= GH \
https://github.com/applicative-tech/stack-dependencies/releases/download/v${PORTVERSION}/:deps
-DISTFILES= stack-dependencies-${PORTVERSION}${EXTRACT_SUFX}:deps
+DISTFILES= stack-dependencies-${PORTVERSION}-ghc802${EXTRACT_SUFX}:deps
MAINTAINER= tobik@FreeBSD.org
COMMENT= Cross-platform program for developing Haskell programs
@@ -22,6 +23,15 @@ COMMENT= Cross-platform program for developing Haskell programs
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ghc>0:lang/ghc \
+ hs-mtl>0:devel/hs-mtl \
+ hs-network>0:net/hs-network \
+ hs-old-locale>0:devel/hs-old-locale \
+ hs-old-time>0:devel/hs-old-time \
+ hs-parsec>0:textproc/hs-parsec \
+ hs-random>0:devel/hs-random \
+ hs-stm>0:devel/hs-stm \
+ hs-text>0:devel/hs-text \
+ hs-zlib>0:archivers/hs-zlib \
cabal:devel/hs-cabal-install
LIB_DEPENDS= libgmp.so:math/gmp \
libffi.so:devel/libffi
diff --git a/devel/stack/distinfo b/devel/stack/distinfo
index 3af857f9fe5f..b60adb58946f 100644
--- a/devel/stack/distinfo
+++ b/devel/stack/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1501088211
-SHA256 (stack-dependencies-1.5.0.tar.gz) = 7c1697018d681a9b1515036c2a002b99489d58173ea0a3681e6b9e096ea92120
-SIZE (stack-dependencies-1.5.0.tar.gz) = 42174012
+TIMESTAMP = 1501704650
+SHA256 (stack-dependencies-1.5.0-ghc802.tar.gz) = 2bd7a9139ad07e9751dcedb5aa64ce31713b2af77eb1b1403b0330d8cdb1a63e
+SIZE (stack-dependencies-1.5.0-ghc802.tar.gz) = 42304138
SHA256 (applicative-tech-stack-dependencies-v1.5.0_GH0.tar.gz) = 6bec257b601d79ba47244911a5e37a15ff99ce029d234cb59937455203568942
SIZE (applicative-tech-stack-dependencies-v1.5.0_GH0.tar.gz) = 997
diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile
index 9189741eca99..3cfe926b4e78 100644
--- a/dns/hs-dns/Makefile
+++ b/dns/hs-dns/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dns
-PORTVERSION= 2.0.0
+PORTVERSION= 2.0.10
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= DNS library in Haskell
LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec blaze-builder conduit>=1.1 conduit-extra>=1.1 \
- iproute>=1.2.4 mtl network>=2.3 random resourcet
+ iproute>=1.2.4 mtl network>=2.3 random resourcet safe
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/dns/hs-dns/distinfo b/dns/hs-dns/distinfo
index 141cc9a361f4..599dc196d340 100644
--- a/dns/hs-dns/distinfo
+++ b/dns/hs-dns/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dns-2.0.0.tar.gz) = 5ec9e58f71022bbc50888ec8b34be3be6f9e8d1566647b59b6e9bf169b1401cb
-SIZE (cabal/dns-2.0.0.tar.gz) = 20570
+TIMESTAMP = 1499620675
+SHA256 (cabal/dns-2.0.10.tar.gz) = ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3
+SIZE (cabal/dns-2.0.10.tar.gz) = 24142
diff --git a/dns/hs-dns/files/patch-dns.cabal b/dns/hs-dns/files/patch-dns.cabal
new file mode 100644
index 000000000000..deed89903df0
--- /dev/null
+++ b/dns/hs-dns/files/patch-dns.cabal
@@ -0,0 +1,34 @@
+--- dns.cabal.orig 2017-07-11 15:30:47 UTC
++++ dns.cabal
+@@ -30,7 +30,6 @@ Library
+ , attoparsec
+ , binary
+ , bytestring
+- , bytestring-builder
+ , conduit >= 1.1
+ , conduit-extra >= 1.1
+ , containers
+@@ -45,7 +44,6 @@ Library
+ , attoparsec
+ , binary
+ , bytestring
+- , bytestring-builder
+ , conduit >= 1.1
+ , conduit-extra >= 1.1
+ , containers
+@@ -67,7 +65,6 @@ Test-Suite network
+ Build-Depends: dns
+ , base
+ , bytestring
+- , bytestring-builder
+ , hspec
+
+ Test-Suite spec
+@@ -82,7 +79,6 @@ Test-Suite spec
+ , attoparsec
+ , binary
+ , bytestring
+- , bytestring-builder
+ , conduit >= 1.1
+ , conduit-extra >= 1.1
+ , containers
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index 9e8bf9387547..ccf3160efe8d 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gnuidn
-PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTVERSION= 0.2.2
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/dns/hs-gnuidn/distinfo b/dns/hs-gnuidn/distinfo
index cd52d8e83ea4..242a05e0b5a3 100644
--- a/dns/hs-gnuidn/distinfo
+++ b/dns/hs-gnuidn/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gnuidn-0.2.1.tar.gz) = 67744c8559ed5c722c53c7a4c2a37821b59ede4b9288ceb995410ec6cb3031ca
-SIZE (cabal/gnuidn-0.2.1.tar.gz) = 16392
+TIMESTAMP = 1499620695
+SHA256 (cabal/gnuidn-0.2.2.tar.gz) = 61346b1f764cead5633bdc83f7dc9836b1627f484984094cdffa95dfd365b96f
+SIZE (cabal/gnuidn-0.2.2.tar.gz) = 17534
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index a070bff22172..c6485e509c5d 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/games/hs-scroll/Makefile b/games/hs-scroll/Makefile
index c6a6b032c34c..cbdc5729ca8b 100644
--- a/games/hs-scroll/Makefile
+++ b/games/hs-scroll/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scroll
-PORTVERSION= 1.20151219
+PORTVERSION= 1.20170122
CATEGORIES= games haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/games/hs-scroll/distinfo b/games/hs-scroll/distinfo
index ebc88c27979a..68ffb0aedf00 100644
--- a/games/hs-scroll/distinfo
+++ b/games/hs-scroll/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/scroll-1.20151219.tar.gz) = 4f91c20e645ee715c9d3549fffffcc58943bee4fb3ba2e622e0189ccb70dd050
-SIZE (cabal/scroll-1.20151219.tar.gz) = 265861
+TIMESTAMP = 1499620738
+SHA256 (cabal/scroll-1.20170122.tar.gz) = 89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38
+SIZE (cabal/scroll-1.20170122.tar.gz) = 266023
diff --git a/graphics/Makefile b/graphics/Makefile
index 2fd22d4ed41b..a7819e2ef811 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -350,6 +350,7 @@
SUBDIR += hs-cairo
SUBDIR += hs-dia-base
SUBDIR += hs-dia-functions
+ SUBDIR += hs-graphviz
SUBDIR += hs-svgcairo
SUBDIR += hugin
SUBDIR += icat
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index f1132bdbbcbb..13d66cd5ddbe 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile
index 11a2fd992b45..e9147630beb2 100644
--- a/graphics/hs-JuicyPixels/Makefile
+++ b/graphics/hs-JuicyPixels/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= JuicyPixels
-PORTVERSION= 3.2.6
+PORTVERSION= 3.2.8.2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo
index be87ade0f11c..955555fd9aaa 100644
--- a/graphics/hs-JuicyPixels/distinfo
+++ b/graphics/hs-JuicyPixels/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/JuicyPixels-3.2.6.tar.gz) = f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46
-SIZE (cabal/JuicyPixels-3.2.6.tar.gz) = 116169
+TIMESTAMP = 1499538228
+SHA256 (cabal/JuicyPixels-3.2.8.2.tar.gz) = b74c89e57ea81f6f69470dce215beccb7ced270ce8529b4a97535879ea5478e8
+SIZE (cabal/JuicyPixels-3.2.8.2.tar.gz) = 125699
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 4e1710f2abeb..a6bdadc1ee4f 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cairo
-PORTVERSION= 0.13.1.0
+PORTVERSION= 0.13.3.1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Binding to the Cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools mtl text>=1.0.0.0 utf8-string>=0.2
+USE_CABAL= gtk2hs-buildtools mtl text utf8-string
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:graphics/cairo
diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo
index 6fa8fa9905c3..822cf9aba2ca 100644
--- a/graphics/hs-cairo/distinfo
+++ b/graphics/hs-cairo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cairo-0.13.1.0.tar.gz) = 6b8e3fca37104022c53442c62bcb41c18d3e2fed4df372c1de56c41f3f7d276e
-SIZE (cabal/cairo-0.13.1.0.tar.gz) = 54143
+TIMESTAMP = 1499538056
+SHA256 (cabal/cairo-0.13.3.1.tar.gz) = a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a
+SIZE (cabal/cairo-0.13.3.1.tar.gz) = 45033
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 0e9e2b5b3900..d0061958bb4b 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dia-base
-PORTVERSION= 0.1.1.3
+PORTVERSION= 0.1.1.4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/distinfo b/graphics/hs-dia-base/distinfo
index bad39752eceb..c9a365af45b5 100644
--- a/graphics/hs-dia-base/distinfo
+++ b/graphics/hs-dia-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dia-base-0.1.1.3.tar.gz) = e5ac6200e802e81b9d40b497b117cb1b29086170ec9fbff6c574baa53e6ba7cf
-SIZE (cabal/dia-base-0.1.1.3.tar.gz) = 3785
+TIMESTAMP = 1499448265
+SHA256 (cabal/dia-base-0.1.1.4.tar.gz) = 1fc6bbf2f60bdefbd516a84063100f63f9ea9a41188ea5eb8f67be7b01fd9e26
+SIZE (cabal/dia-base-0.1.1.4.tar.gz) = 3786
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index deb179531f45..235747aac523 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dia-functions
PORTVERSION= 0.2.1.4
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,7 @@ COMMENT= EDSL for teaching Haskell with diagrams - functions
LICENSE= BSD3CLAUSE
-USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0
+USE_CABAL= data-pprint dia-base mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/graphics/hs-dia-functions/files/patch-dia-functions.cabal b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
new file mode 100644
index 000000000000..dba41c304907
--- /dev/null
+++ b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
@@ -0,0 +1,11 @@
+--- dia-functions.cabal.orig 2017-07-11 15:29:54 UTC
++++ dia-functions.cabal
+@@ -30,7 +30,7 @@ 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,
+ xhtml >= 3000.2 && < 3000.3,
+ mtl >= 2.0 && < 2.3,
diff --git a/graphics/hs-graphviz/Makefile b/graphics/hs-graphviz/Makefile
new file mode 100644
index 000000000000..14ff0e73eaf3
--- /dev/null
+++ b/graphics/hs-graphviz/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= graphviz
+PORTVERSION= 2999.19.0.0
+CATEGORIES= graphics haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This library provides bindings for the Dot language used by the Graphviz
+
+LICENSE= BSD3CLAUSE
+
+USES= pkgconfig
+USE_CABAL= colour dlist fgl polyparse temporary text wl-pprint-text
+
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libxdot.pc:graphics/graphviz
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/graphics/hs-graphviz/distinfo b/graphics/hs-graphviz/distinfo
new file mode 100644
index 000000000000..dc7d055f6df9
--- /dev/null
+++ b/graphics/hs-graphviz/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499541633
+SHA256 (cabal/graphviz-2999.19.0.0.tar.gz) = af0a7ff197c9de3f23e6653541446f755c824083ced04b629df6d19523fe04ea
+SIZE (cabal/graphviz-2999.19.0.0.tar.gz) = 223144
diff --git a/graphics/hs-graphviz/pkg-descr b/graphics/hs-graphviz/pkg-descr
new file mode 100644
index 000000000000..8a2425ea321c
--- /dev/null
+++ b/graphics/hs-graphviz/pkg-descr
@@ -0,0 +1,5 @@
+This library provides bindings for the Dot language used by the Graphviz
+(http://graphviz.org/) suite of programs for visualising graphs, as well
+as functions to call those programs.
+
+WWW: http://projects.haskell.org/graphviz
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 76321bb68045..e8f6b69f6750 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= svgcairo
-PORTVERSION= 0.13.0.3
+PORTVERSION= 0.13.1.1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Binding to the libsvg-cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text
+USE_CABAL= cairo glib mtl text
USE_GNOME= librsvg2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-svgcairo/distinfo b/graphics/hs-svgcairo/distinfo
index ceb1c30a8d16..160bf9ee3de6 100644
--- a/graphics/hs-svgcairo/distinfo
+++ b/graphics/hs-svgcairo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/svgcairo-0.13.0.3.tar.gz) = 9fd94d9aad09a26c4b6d4abf979d68d12b7265fbc8171093db448c620df96c49
-SIZE (cabal/svgcairo-0.13.0.3.tar.gz) = 14349
+TIMESTAMP = 1501530095
+SHA256 (cabal/svgcairo-0.13.1.1.tar.gz) = cda662acf9084ef1d16da987bde2fa01c9efc87101e7179da0f566ab05c3a54f
+SIZE (cabal/svgcairo-0.13.1.1.tar.gz) = 5311
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 53c73a7afc82..1ab40a2ca9ac 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ghc
-PORTVERSION= 7.10.2
-PORTREVISION= 3
+PORTVERSION= ${GHC_VERSION}
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
LOCAL/pgj/:boot
@@ -17,96 +16,93 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= i386 amd64
-MAKE_JOBS_NUMBER_LIMIT= 4
-NO_CCACHE= yes
-
-GHC_VERSION= ${PORTVERSION}
-HSCOLOUR_VERSION= 1.23
-LLVM_VERSION= 35
+GHC_VERSION= 8.0.2
+HSCOLOUR_VERSION= 1.24.1
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.*
+CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.*
LIB_DEPENDS+= libgmp.so:math/gmp
-USES= autoreconf gmake iconv:translit ncurses perl5 tar:xz
+USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz
USE_LOCALE= en_US.UTF-8
-USE_PERL5= build
+USE_PERL5= build
# The configure process accepts,filters and canonicalises
# the CONFIGURE_TARGET variable. You can read the files
# ${WRKSRC}/configure and ${WRKSRC}/config.sub.
-# This is better fixed in the ${WRKSRC}/mk/build.mk.
-# You can view below.
+# This is better fixed in files/build.mk.in
GNU_CONFIGURE= yes
-OPTIONS_DEFINE= PROFILE DYNAMIC LLVM DOCS
-OPTIONS_SINGLE= C_Compiler
-OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG
+CONFIGURE_ARGS= --with-ld=${LD} \
+ --with-gmp-includes=${LOCALBASE}/include \
+ --with-gmp-libraries=${LOCALBASE}/lib \
+ --with-iconv-includes=${LOCALBASE}/include \
+ --with-iconv-libraries=${LOCALBASE}/lib
+
+SUB_FILES= build.mk \
+ build.boot.mk
+SUB_LIST= GHC_VERSION=${GHC_VERSION} \
+ NCURSESINC="${NCURSESINC}" NCURSESLIB="${NCURSESLIB}" \
+ CFLAGS="${CFLAGS}"
+
+OPTIONS_GROUP= BOOTSTRAP
+BOOTSTRAP_DESC= Bootsrap using installed ghc
+OPTIONS_GROUP_BOOTSTRAP=BOOT BOOTH
+OPTIONS_DEFINE= DYNAMIC PROFILE DOCS
+OPTIONS_SUB= yes
-OPTIONS_DEFAULT= PROFILE DYNAMIC GCC
+OPTIONS_DEFAULT= PROFILE DYNAMIC
BOOT_DESC= Use installed GHC for bootstrapping
BOOTH_DESC= Use installed HsColour for bootstrapping
-PCLANG_DESC= Build with Clang from ports
-BCLANG_DESC= Build with Clang from base
PROFILE_DESC= Add support for performance profiling
DYNAMIC_DESC= Add support for dynamic linking
-LLVM_DESC= Add support for generating code via LLVM
DOCS_DESC= Install HTML documentation
-LOCALBASE?= /usr/local
+DYNAMIC_CONFIGURE_ARGS= --with-system-libffi \
+ --with-ffi-includes=${LOCALBASE}/include \
+ --with-ffi-libraries=${LOCALBASE}/lib
+# The version number is needed as lang/gcc installs a different version
+DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi
-.if exists(${LOCALBASE}/bin/ghc)
-OPTIONS_DEFINE+= BOOT
-.endif
+# Append substitutions for build.mk -- the files uses '#' as comments
+BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs
+BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS}
-.if exists(${LOCALBASE}/bin/HsColour)
-OPTIONS_DEFINE+= BOOTH
-.endif
+DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
-.include <bsd.port.options.mk>
+DYNAMIC_SUB_LIST= WITH_DYNAMIC=""
+DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="\#"
-.if ${PORT_OPTIONS:MDYNAMIC}
-# The version number is needed as lang/gcc installs a different version
-LIB_DEPENDS+= libffi.so.6:devel/libffi
-.endif
+PROFILE_SUB_LIST= WITH_PROFILE=""
+PROFILE_SUB_LIST_OFF= WITH_PROFILE="\#"
-.if empty(PORT_OPTIONS:MBOOT)
+DOCS_SUB_LIST= WITH_DOCS="YES"
+DOCS_SUB_LIST_OFF= WITH_DOCS="NO"
+LOCALBASE?= /usr/local
+
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MBOOT)
BOOT_GHC_VERSION= 7.10.2
DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
-
.endif # MBOOT
-.if ${PORT_OPTIONS:MPCLANG}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
-RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
-CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
-CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
-LDFLAGS+= -B${LOCALBASE}/bin
-CFLAGS+= -Qunused-arguments
-CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC}
-USE_BINUTILS= yes
-.if empty(PORT_OPTIONS:MBOOT)
-CONFIGURE_ARGS_BOOT+= --with-clang=${CC} --with-gcc=${CC}
-.endif
-.elif ${PORT_OPTIONS:MBCLANG}
-CC= /usr/bin/clang
-CXX= /usr/bin/clang++
-CPP= /usr/bin/clang-cpp
-CFLAGS+= -Qunused-arguments
-CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC}
-.else # GCC
-USE_GCC= yes
-CONFIGURE_ARGS+= --with-gcc=${CC}
+# LLVM is still not properly supported, further it does not make sense to have
+# to depend on old llvm ports that will be removed from the ports soon.
+# So for now, stick to GCC.
+# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
+# We should however investigate whether base's clang is enough to build ghc&co.
+# This will likely require some modifications to compiler/main/*hs
+USE_GCC= yes
+CONFIGURE_ARGS+= -with-gcc=${CC}
.if empty(PORT_OPTIONS:MBOOT)
CONFIGURE_ARGS_BOOT+= --with-gcc=${CC}
.endif
-.endif
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
@@ -114,31 +110,9 @@ GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION}
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
-HACKAGE_SITE?= http://hackage.haskell.org/package/
-
-CONFIGURE_ARGS+= --with-ld=${LD} \
- --with-gmp-includes=${LOCALBASE}/include \
- --with-gmp-libraries=${LOCALBASE}/lib
-
-CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \
- --with-iconv-libraries=${LOCALBASE}/lib
-
-.if ${PORT_OPTIONS:MDYNAMIC}
-CONFIGURE_ARGS+= --with-system-libffi \
- --with-ffi-includes=${LOCALBASE}/include \
- --with-ffi-libraries=${LOCALBASE}/lib
-.endif
-
-.if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-RUN_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-
-CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt${LLVM_VERSION} \
- --with-llc=${LOCALBASE}/bin/llc${LLVM_VERSION}
-.endif
+HACKAGE_SITE?= http://hackage.haskell.org/package/
.if empty(PORT_OPTIONS:MBOOT)
-
BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
@@ -148,19 +122,11 @@ SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD}
CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
-
.else # MBOOT
-
-SLAVE_CMD= # empty
-
+SLAVE_CMD= # empty
CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc
-
.endif # MBOOT
-# libgmp:
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include
-
# override TMPDIR because /tmp often doesn't have enough space
# to build some of the larger libraries.
TMPDIR= ${WRKSRC}/tmp
@@ -173,16 +139,16 @@ TMPDIR= ${WRKSRC}/tmp
.if ${PORT_OPTIONS:MDOCS}
-.if empty(PORT_OPTIONS:MBOOTH)
+. if empty(PORT_OPTIONS:MBOOTH)
MASTER_SITES+= ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs
DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g}
-.endif # MBOOTH
+. endif # MBOOTH
-.if empty(PORT_OPTIONS:MBOOTH)
+. if empty(PORT_OPTIONS:MBOOTH)
SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
@@ -190,87 +156,49 @@ SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
-.endif # MBOOTH
+. endif # MBOOTH
-BUILD_DEPENDS+= docbook-xsl>0:textproc/docbook-xsl \
- ${LOCALBASE}/bin/xsltproc:textproc/libxslt
-.endif
+.endif # MDOCS
post-extract:
- @${ECHO} >> ${WRKSRC}/mk/build.mk "docdir = ${PREFIX}/share/doc/ghc-${GHC_VERSION}"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "htmldir = ${PREFIX}/share/doc/ghc-${GHC_VERSION}"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "mandir = ${PREFIX}/man"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "infodir = ${PREFIX}/info"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays = v"
-.if ${PORT_OPTIONS:MPROFILE}
- @${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += p"
-.endif
-.if ${PORT_OPTIONS:MDYNAMIC}
- @${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += dyn"
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${ECHO} >> ${WRKSRC}/mk/build.mk "XMLDocWays = html"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS = YES"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS = YES"
-.else
- @${ECHO} >> ${WRKSRC}/mk/build.mk "XMLDocWays ="
- @${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS ="
- @${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS ="
-.endif
-.if ${PORT_OPTIONS:MBOOT}
- @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${LOCALBASE}/bin/hsc2hs"
-.else
- @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
-.endif
- @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-.if ${PORT_OPTIONS:MPCLANG}
- @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -optl=-B${LOCALBASE}/bin"
-.endif
- @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${LOCALBASE}/include"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}"
- @${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0"
-.if ${PORT_OPTIONS:MBCLANG} || ${PORT_OPTIONS:MPCLANG}
- @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${WRKSRC}/settings.in
-.if empty(PORT_OPTIONS:MBOOT)
- @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${BOOT_DIR}/settings.in
-.endif
-.endif
.if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031
@${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in
.endif
+# %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html
post-install-script:
- @${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \
- '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/d' -e \
- 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
- @${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E -e \
- '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/d' -e \
- '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/d' -e \
- '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/d' -e \
- 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+ ${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \
+ -e 's,^${STAGEDIR}${PREFIX}/?,,' \
+ -e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \
+ >> ${TMPPLIST}
+ ${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E \
+ -e 's,^${STAGEDIR}${PREFIX}/?,,' \
+ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/s|^|@comment |g' \
+ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/s|^|@comment|g' \
+ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/s|^|@comment |g' \
+ >> ${TMPPLIST}
.if ${PORT_OPTIONS:MDOCS}
# Cleanup the indexen created by gen_contents_index
- @${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
- @${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
- @${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
+ ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
+ ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
+ ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
.endif
- @${ECHO} '@unexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
- @${ECHO} "@exec %D/bin/ghc-pkg recache" >>${TMPPLIST}
+ ${ECHO} '@postunexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
+ ${ECHO} "@postexec %D/bin/ghc-pkg recache" >>${TMPPLIST}
.if ${PORT_OPTIONS:MDOCS}
- @${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
+ ${ECHO} '@postexec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+ ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
s|%%AR%%|${AR}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-pre-configure:
+pre-configure: apply-slist
+ # Copy the subbed build.mk to the proper position
+ ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
+
@${MKDIR} ${TMPDIR}
.if empty(PORT_OPTIONS:MBOOTH) && ${OPSYS} == FreeBSD && \
${OSVERSION} >= 1200031
@@ -307,13 +235,44 @@ pre-configure:
${SLAVE_CMD} ./Setup install)
.endif
+_EXECUTABLES= ${STAGEDIR}${PREFIX}/bin/hp2ps \
+ ${GHC_LIBDIR}/bin/unlit \
+ ${GHC_LIBDIR}/bin/hpc \
+ ${GHC_LIBDIR}/bin/ghc-iserv \
+ ${GHC_LIBDIR}/bin/ghc-pkg \
+ ${GHC_LIBDIR}/bin/hsc2hs \
+ ${GHC_LIBDIR}/bin/runghc \
+ ${GHC_LIBDIR}/bin/ghc
+
+.if ${PORT_OPTIONS:MPROFILE}
+_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof
+.endif
+.if ${PORT_OPTIONS:MDYNAMIC}
+_EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+_EXECUTABLES+= ${GHC_LIBDIR}/bin/haddock
+.endif
+
post-install:
- @${RM} ${STAGEDIR}${PREFIX}/bin/haddock
+ ${RM} ${STAGEDIR}${PREFIX}/bin/haddock
.if ${PORT_OPTIONS:MDOCS}
- @${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
+ ${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
.endif
- @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit \
- $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \
- ${STRIP_CMD} $$f; done)
+ (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so'); do \
+ ${STRIP_CMD} $$f; done)
.include <bsd.port.mk>
+
+# Create a bootstrap compiler tar ball: run this in an interactive poudriere jail
+.PHONY: create-bootstrap
+create-bootstrap:
+ @${ECHO} "TODO: https://github.com/freebsd-haskell/ports/wiki/Updating-the-Bootstrap-Compiler"
+ cd ${WRKSCR} \
+ && ${CP} ${WRKDIR}/build.boot.mk mk \
+ && setenv ${CONFIGURE_ENV} ./configure --with-iconv-includes=${LOCALBASE}/include \
+ --with-iconv-libraries=${LOCALBASE}/lib \
+ --with-gcc=${CC} \
+ --with-ld=${LD} \
+ && make binary-dist TAR_COMP=xz \\
+ && mv ghc-${GHC_VERSION}-boot-${GHC_ARCH}-unknown-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-${ARCH}-freebsd${FREEBSD_MAJOR_VERSION}-boot.tar.xz
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index c031e7b26d06..7cc0a1d3e7ce 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -1,4 +1,4 @@
-#
+
# $FreeBSD$
#
# bsd.cabal.mk -- Support for ports based on Haskell Cabal.
@@ -32,8 +32,12 @@ SETUP_CMD?= ./setup
ALEX_CMD?= ${LOCALBASE}/bin/alex
HAPPY_CMD?= ${LOCALBASE}/bin/happy
C2HS_CMD?= ${LOCALBASE}/bin/c2hs
+CPPHS_CMD?= ${LOCALBASE}/bin/cpphs
-CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
+# ./usr/local/lib/cabal/ghc-8.0.2/x86_64-freebsd-ghc-8.0.2/libHStransformers-compat-0.5.1.4-IuF
+CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} \
+ ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
+ ${CABAL_LIBDIR}/${CABAL_ARCHSUBDIR} \
${DOCSDIR}
GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
@@ -50,10 +54,19 @@ GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries
CABAL_LIBDIR= ${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
CABAL_LIBSUBDIR= ${PACKAGE}
+CABAL_ARCH= x86_64
+.if ("${ARCH}" == "i386")
+CABAL_ARCH= i386
+.endif
+CABAL_ARCHSUBDIR= ${CABAL_ARCH}-freebsd-ghc-${GHC_VERSION}
CABAL_LIBDIR_REL= ${CABAL_LIBDIR:S,^${PREFIX}/,,}
CONFIGURE_ARGS+= --libdir=${CABAL_LIBDIR} --libsubdir=${CABAL_LIBSUBDIR}
+# Inherited via lang/ghc we need to depend on iconv and libgmp.so (stage q/a)
+USES+= iconv:translit
+LIB_DEPENDS+= libgmp.so:math/gmp
+
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTNAME=${PORTNAME} \
PORTVERSION=${PORTVERSION} \
@@ -83,35 +96,15 @@ BUILD_DEPENDS+= ghc:lang/ghc
BUILD_DEPENDS+= ghc>=${GHC_VERSION}:lang/ghc
.endif
-
-.if ${PORT_OPTIONS:MPCLANG}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
-RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
-CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
-CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
-CFLAGS+= -Qunused-arguments
-LDFLAGS+= -B${LOCALBASE}/bin
-CONFIGURE_ARGS+= --ghc-option=-optl=-B${LOCALBASE}/bin
-USE_BINUTILS= yes
-.elif ${PORT_OPTIONS:MBCLANG}
-CC= /usr/bin/clang
-CXX= /usr/bin/clang++
-CPP= /usr/bin/clang-cpp
-CFLAGS+= -Qunused-arguments
-.else # GCC
+# LLVM is still not properly supported, further it does not make sense to have
+# to depend on old llvm ports that will be removed from the ports soon.
+# So for now, stick to GCC -- this might change with ghc-8.4.
+# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
+# We should however investigate whether base's clang is enough to build ghc&co.
USE_GCC= yes
-.endif
-CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR}
-
-.if ${PORT_OPTIONS:MLLVM}
-CONFIGURE_ARGS+= --ghc-option=-fllvm \
- --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt${LLVM_VERSION} \
- --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc${LLVM_VERSION}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-.endif
+CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR}
.if defined(USE_ALEX)
BUILD_DEPENDS+= ${ALEX_CMD}:devel/hs-alex
@@ -128,66 +121,72 @@ BUILD_DEPENDS+= ${C2HS_CMD}:devel/hs-c2hs
CONFIGURE_ARGS+= --with-c2hs=${C2HS_CMD}
.endif
-.if defined(EXECUTABLE)
-LIB_DEPENDS+= libgmp.so:math/gmp
-USES+= iconv
+.if defined(USE_CPPHS)
+BUILD_DEPENDS+= ${CPPHS_CMD}:devel/hs-cpphs
+CONFIGURE_ARGS+= --with-cpphs=${CPPHS_CMD}
+.endif
+.if defined(EXECUTABLE)
CONFIGURE_ARGS+= --enable-executable-stripping
.endif
.if defined(USE_CABAL)
.include "bsd.hackage.mk"
-.for cabal_package in ${USE_CABAL}
+. for cabal_package in ${USE_CABAL}
__u_h_r_package= ${cabal_package:C/[<=>].*$//g}
__u_h_r_port= ${${__u_h_r_package}_port}
__u_h_r_name= ${__u_h_r_port:C/.*\///g}
-.if empty(__u_h_r_port)
-IGNORE?= dependency fails: ${cabal_package:C/[<=>].*$//g} is not known as a port
-.endif
+. if empty(__u_h_r_port)
+IGNORE?= dependency fails: ${cabal_package} -> ${__u_h_r_package} is not known as a port
+. endif
-.if ${__u_h_r_package} == ${cabal_package}
+. if ${__u_h_r_port} != ${STAGE2_DUMMY}
+. if ${__u_h_r_package} == ${cabal_package}
__u_h_r_version:= >=0
-.else
+. else
__u_h_r_version:= ${cabal_package:C/^[^<=>]*//g}
-.endif
+. endif
dependencies:= ${dependencies} \
${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${__u_h_r_port}
-.endfor
+. else
+IGNORE?= dependency fail: ${__u_h_r_package} is part of lang/ghc
+. endif
+. endfor
BUILD_DEPENDS+= ${dependencies}
-.if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
+. if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
RUN_DEPENDS+= ${dependencies}
-.endif
+. endif
.endif
.if ${PORT_OPTIONS:MDOCS}
-.if !defined(XMLDOCS)
+. if !defined(XMLDOCS)
-.if defined(HADDOCK_AVAILABLE)
+. if defined(HADDOCK_AVAILABLE)
HADDOCK_OPTS= # empty
-.if ${PORT_OPTIONS:MHSCOLOUR}
+. if ${PORT_OPTIONS:MHSCOLOUR}
BUILD_DEPENDS+= HsColour:print/hs-hscolour
HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif # HSCOLOUR
-.endif # HADDOCK_AVAILABLE
+. endif # HSCOLOUR
+. endif # HADDOCK_AVAILABLE
-.endif
+. endif
-.if defined(XMLDOCS)
+. if defined(XMLDOCS)
BUILD_DEPENDS+= docbook-xsl>0:textproc/docbook-xsl \
${LOCALBASE}/bin/xsltproc:textproc/libxslt
USES+= gmake
-.endif # !XMLDOCS
+. endif # !XMLDOCS
.endif # DOCS
@@ -206,7 +205,7 @@ CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic
.if ${PORT_OPTIONS:MPROFILE}
CONFIGURE_ARGS+= --enable-executable-profiling --enable-library-profiling
.else
-CONFIGURE_ARGS+= --disable-executable-profiling --disable-library-profiling
+CONFIGURE_ARGS+= --disable-profiling --disable-library-profiling
.endif
.SILENT:
@@ -220,7 +219,7 @@ post-patch::
_BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make
.if !defined(METAPORT)
-.if !target(do-configure)
+. if !target(do-configure)
do-configure:
@${MKDIR} ${TMPDIR}
@if [ -f ${WRKSRC}/Setup.hs ]; then \
@@ -237,112 +236,115 @@ do-configure:
exit 1; \
fi
-.if ${PORT_OPTIONS:MDOCS}
-.if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
+. if ${PORT_OPTIONS:MDOCS}
+. if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
-.endif
-.endif # DOCS
-.endif # target(do-configure)
+. endif
+. endif # DOCS
+. endif # target(do-configure)
.endif # !METAPORT
.if !defined(METAPORT)
-.if !target(do-build)
+. if !target(do-build)
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build
-.if !defined(STANDALONE)
+. if !defined(STANDALONE)
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
-.endif
+. endif
-.if ${PORT_OPTIONS:MDOCS}
-.if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
+. if ${PORT_OPTIONS:MDOCS}
+. if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS}
-.endif # STANDALONE
-.if defined(XMLDOCS)
+. endif # STANDALONE
+. if defined(XMLDOCS)
@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
-.endif # XMLDOCS
-.endif # DOCS
-.endif # target(do-build)
+. endif # XMLDOCS
+. endif # DOCS
+. endif # target(do-build)
.endif # !METAPORT
.for sect in 1 2 3 4 5 6 7 8 9
-.if defined(MAN${sect}PAGES)
-.for man in ${MAN${sect}PAGES}
+. if defined(MAN${sect}PAGES)
+. for man in ${MAN${sect}PAGES}
PLIST_FILES+= man/man${sect}/${man}.gz
-.endfor
-.endif
+. endfor
+. endif
.endfor
.if !defined(METAPORT)
-.if !target(do-install)
+. if !target(do-install)
do-install:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR}
-.if !defined(STANDALONE)
+. if !defined(STANDALONE)
@${MKDIR} ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
-.endif
+. endif
-.if !empty(INSTALL_PORTDATA)
+. if !empty(INSTALL_PORTDATA)
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_PORTDATA}
-.endif
+. endif
-.if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES}
+. if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_PORTEXAMPLES}
-.endif
+. endif
-.for sect in 1 2 3 4 5 6 7 8 9
-.if defined(MAN${sect}SRC)
-.for man in ${MAN${sect}PAGES}
+. for sect in 1 2 3 4 5 6 7 8 9
+. if defined(MAN${sect}SRC)
+. for man in ${MAN${sect}PAGES}
@${INSTALL_MAN} ${WRKSRC}/${MAN${sect}SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man${sect}
-.endfor
-.endif # MAN${sect}SRC
-.endfor
+. endfor
+. endif # MAN${sect}SRC
+. endfor
-.if ${PORT_OPTIONS:MDOCS}
-.if !empty(XMLDOCS)
-.for xmldoc in ${XMLDOCS}
+. if ${PORT_OPTIONS:MDOCS}
+. if !empty(XMLDOCS)
+. for xmldoc in ${XMLDOCS}
@(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g})
-.endfor
-.endif # XMLDOCS
-.endif # DOCS
-.endif # target(do-install)
+. endfor
+. endif # XMLDOCS
+. endif # DOCS
+. endif # target(do-install)
.endif # !METAPORT
.if !target(post-install-script)
post-install-script:
-.if defined(EXECUTABLE)
-.for exe in ${EXECUTABLE}
- @${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
-.endfor
-.endif # EXECUTABLE
- @for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
+. if defined(EXECUTABLE)
+. for exe in ${EXECUTABLE}
+ ${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
+. endfor
+. endif # EXECUTABLE
+ for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
-type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; done
+ @${ECHO} "================ CONTENTS OF TMPPLIST =================== "
+ cat ${TMPPLIST}
+ @${ECHO} "========================================================= "
.endif # target(post-install-script)
.if !defined(METAPORT)
add-plist-post: add-plist-cabal
add-plist-cabal:
-.if !defined(STANDALONE)
- @${ECHO_CMD} '@unexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
-.endif
-
-.if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
- @(${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE}' ; \
- ${ECHO_CMD} '@unexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
- ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
-.endif
-
-.if !defined(STANDALONE)
- @${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
-.endif
+. if !defined(STANDALONE)
+ @${ECHO_CMD} '@postunexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
+. endif
-.if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
- @(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE} && \
+. if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
+# GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries
+ (${ECHO} '@postexec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE} && \
cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
-.endif
+ (${ECHO} '@postunexec ${RM} -r ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${PACKAGE}' ; \
+ ${ECHO} '@postunexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
+ ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
+# Don't install index files
+ ${ECHO} "@comment share/doc/ghc-%%GHC_VERSION%%/html/libraries/index.html" >> ${TMPPLIST}
+. endif
+
+. if !defined(STANDALONE)
+ @${ECHO_CMD} '@postexec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
+. endif
.endif # !METAPORT
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 1829f6948d9e..aa64e85c9ecc 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -18,21 +18,13 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION?= 7.10.2
-LLVM_VERSION= 35
+GHC_VERSION?= 8.0.2
-HSCOLOUR_VERSION= 1.23
+HSCOLOUR_VERSION= 1.24.1
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
DYNAMIC_DESC?= Add support for dynamic linking
PROFILE_DESC?= Add support for profiling
-LLVM_DESC?= Use the LLVM backend for code generation
-PCLANG_DESC= Build with Clang from ports
-BCLANG_DESC= Build with Clang from base
-
-OPTIONS_SINGLE+= C_Compiler
-OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG
-OPTIONS_DEFAULT+= GCC
.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts-ghc${GHC_VERSION}.so)) && !defined(IGNORE_DYNAMIC)
OPTIONS_DEFINE+= DYNAMIC
@@ -43,10 +35,6 @@ OPTIONS_DEFAULT+= DYNAMIC
OPTIONS_DEFINE+= PROFILE
.endif
-.if !defined(IGNORE_LLVM)
-OPTIONS_DEFINE+= LLVM
-.endif
-
.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(IGNORE_DOCS)
OPTIONS_DEFINE+= DOCS
HADDOCK_AVAILABLE= yes
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 41d8ac475a74..4b48785a2cb9 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -9,493 +9,598 @@
# Maintained by: haskell@FreeBSD.org
#
+# List of packages installed by lang/ghc (stage2 packages).
+# In the future we could think of installing only ghc and base packages,
+# and using unbundles versions for the rest of these
+# ghc-8.0.2 provides: Cabal-1.24.2.0 array-0.5.1.1 base-4.9.1.0 binary-0.8.3.0
+# bytestring-0.10.8.1 containers-0.5.7.1 deepseq-1.4.2.0
+# directory-1.3.0.0 filepath-1.4.1.1 ghc-8.0.2
+# ghc-boot-8.0.2 ghc-boot-th-8.0.2 ghc-prim-0.5.0.0
+# ghci-8.0.2 haskeline-0.7.3.0 hoopl-3.10.2.1 hpc-0.6.0.3
+# integer-gmp-1.0.0.1 pretty-1.1.3.3 process-1.4.3.0
+# template-haskell-2.11.1.0 terminfo-0.4.0.2 time-1.6.0.1
+# transformers-0.5.2.0 unix-2.7.2.1 xhtml-3000.2.1
+# Note: it's important to make sure that the versions for the hs-* ports are
+# compatible with these, i.e. sometimes we cannot pick the newest one.
+GHC_STAGE2_PACKAGES= Cabal \
+ array \
+ base \
+ binary \
+ bytestring \
+ containers \
+ deepseq \
+ directory \
+ filepath \
+ ghc \
+ ghc-boot \
+ ghc-boot-th \
+ ghc-prim \
+ ghci \
+ haskeline \
+ hoopl \
+ hpc \
+ integer-gmp \
+ pretty \
+ process \
+ template-haskell \
+ terminfo \
+ time \
+ transformers \
+ unix \
+ xhtml
+STAGE2_DUMMY= lang/ghc
+.for _ghc_stage2_package in ${GHC_STAGE2_PACKAGES} ; do
+# Define dummy dependency, so that we can filter it easily and produce a warning
+# in bsd.cabal.mk it these depdencies are added to USE_CABAL.
+${_ghc_stage2_package}_port= ${STAGE2_DUMMY}
+.endfor
+
# KEEP THE LIST ALPHABETICALLY SORTED!
-abstract-deque_port= devel/hs-abstract-deque
-abstract-par_port= devel/hs-abstract-par
-activehs_port= www/hs-activehs # executable
-activehs-base_port= devel/hs-activehs-base
-adjunctions_port= math/hs-adjunctions
-aeson_port= converters/hs-aeson
-aeson-pretty_port= converters/hs-aeson-pretty # executable
-Agda_port= math/hs-Agda # executable
-alex_port= devel/hs-alex # executable
-ALUT_port= audio/hs-ALUT
-angel_port= sysutils/hs-angel # executable
-ansi-terminal_port= devel/hs-ansi-terminal
-ansi-wl-pprint_port= devel/hs-ansi-wl-pprint
-appar_port= textproc/hs-appar
-arrows_port= devel/hs-arrows
-asn1-data_port= devel/hs-asn1-data
-asn1-encoding_port= devel/hs-asn1-encoding
-asn1-parse_port= devel/hs-asn1-parse
-asn1-types_port= devel/hs-asn1-types
-async_port= devel/hs-async
-atomic-primops_port= devel/hs-atomic-primops
-attoparsec_port= textproc/hs-attoparsec
-attoparsec-enumerator_port= textproc/hs-attoparsec-enumerator
-authenticate_port= www/hs-authenticate
-auto-update_port= devel/hs-auto-update
-aws_port= net/hs-aws
-base-orphans_port= devel/hs-base-orphans
-base-unicode-symbols_port= devel/hs-base-unicode-symbols
-base16-bytestring_port= devel/hs-base16-bytestring
-base64-bytestring_port= devel/hs-base64-bytestring
-basic-prelude_port= devel/hs-basic-prelude
-bencode_port= textproc/hs-bencode
-bifunctors_port= devel/hs-bifunctors
-bio_port= science/hs-bio # executable
-bits-atomic_port= devel/hs-bits-atomic
-blaze-builder_port= devel/hs-blaze-builder
-blaze-builder-enumerator_port= devel/hs-blaze-builder-enumerator
-blaze-html_port= textproc/hs-blaze-html
-blaze-markup_port= textproc/hs-blaze-markup
-blaze-textual_port= devel/hs-blaze-textual
-bloomfilter_port= devel/hs-bloomfilter
-BNFC_port= devel/hs-BNFC # executable
-Boolean_port= devel/hs-Boolean
-BoundedChan_port= devel/hs-BoundedChan
-boxes_port= devel/hs-boxes
-brainfuck_port= lang/hs-brainfuck # executable
-bsd-sysctl_port= devel/hs-bsd-sysctl
-byteable_port= devel/hs-byteable
-byteorder_port= devel/hs-byteorder
-bytestring-csv_port= textproc/hs-bytestring-csv
-bytestring-lexing_port= devel/hs-bytestring-lexing
-bytestring-mmap_port= devel/hs-bytestring-mmap
-bytestring-nums_port= devel/hs-bytestring-nums # executable
-bytestring-show_port= devel/hs-bytestring-show
-c2hs_port= devel/hs-c2hs # executable
-cabal-install_port= devel/hs-cabal-install # executable
-cairo_port= graphics/hs-cairo
-case-insensitive_port= textproc/hs-case-insensitive
-cassava_port= textproc/hs-cassava
-categories_port= math/hs-categories
-cereal_port= devel/hs-cereal
-certificate_port= security/hs-certificate
-cgi_port= www/hs-cgi
-checkers_port= devel/hs-checkers
-chunked-data_port= devel/hs-chunked-data
-cipher-aes_port= security/hs-cipher-aes
-cipher-aes128_port= security/hs-cipher-aes128
-cipher-blowfish_port= security/hs-cipher-blowfish
-cipher-camellia_port= security/hs-cipher-camellia
-cipher-des_port= security/hs-cipher-des
-cipher-rc4_port= security/hs-cipher-rc4
-citeproc-hs_port= textproc/hs-citeproc-hs
-classy-prelude_port= devel/hs-classy-prelude
-classy-prelude-conduit_port= devel/hs-classy-prelude-conduit
-clientsession_port= security/hs-clientsession
-cmark_port= textproc/hs-cmark
-cmdargs_port= devel/hs-cmdargs
-comonad_port= math/hs-comonad
-conduit_port= devel/hs-conduit
-conduit-combinators_port= devel/hs-conduit-combinators
-conduit-extra_port= devel/hs-conduit-extra
-ConfigFile_port= devel/hs-ConfigFile
-configurator_port= devel/hs-configurator
-connection_port= net/hs-connection
-constraints_port= devel/hs-constraints
-contravariant_port= math/hs-contravariant
-convertible_port= devel/hs-convertible
-cookie_port= www/hs-cookie
-cpphs_port= devel/hs-cpphs # executable
-cprng-aes_port= security/hs-cprng-aes
-cpu_port= sysutils/hs-cpu
-criterion_port= benchmarks/hs-criterion
-Crypto_port= security/hs-Crypto
-crypto-api_port= security/hs-crypto-api
-crypto-cipher-types_port= security/hs-crypto-cipher-types
-crypto-conduit_port= security/hs-crypto-conduit
-crypto-numbers_port= security/hs-crypto-numbers
-crypto-pubkey_port= security/hs-crypto-pubkey
-crypto-pubkey-types_port= security/hs-crypto-pubkey-types
-crypto-random_port= security/hs-crypto-random
-crypto-random-api_port= security/hs-crypto-random-api
-cryptocipher_port= security/hs-cryptocipher
-cryptohash_port= security/hs-cryptohash
-cryptohash-conduit_port= security/hs-cryptohash-conduit
-cryptohash-cryptoapi_port= security/hs-cryptohash-cryptoapi
-cryptonite_port= security/hs-cryptonite
-css-text_port= www/hs-css-text
-csv_port= textproc/hs-csv
-curl_port= ftp/hs-curl # lib_depends
-darcs_port= devel/hs-darcs # executable
-data-default_port= devel/hs-data-default
-data-default-class_port= devel/hs-data-default-class
-data-default-instances-base_port= devel/hs-data-default-instances-base
-data-default-instances-containers_port= devel/hs-data-default-instances-containers
-data-default-instances-dlist_port= devel/hs-data-default-instances-dlist
-data-default-instances-old-locale_port= devel/hs-data-default-instances-old-locale
-data-hash_port= devel/hs-data-hash
-data-lens_port= math/hs-data-lens
-data-lens-template_port= math/hs-data-lens-template
-data-ordlist_port= devel/hs-data-ordlist
-data-pprint_port= devel/hs-data-pprint
-dataenc_port= converters/hs-dataenc
-date-cache_port= devel/hs-date-cache
-datetime_port= devel/hs-datetime
-DAV_port= www/hs-DAV # executable
-deepseq-generics_port= devel/hs-deepseq-generics
-dia-base_port= graphics/hs-dia-base
-dia-functions_port= graphics/hs-dia-functions
-Diff_port= textproc/hs-Diff
-digest_port= security/hs-digest
-directory_port= devel/hs-directory
-directory-tree_port= devel/hs-directory-tree
-distributive_port= math/hs-distributive
-dlist_port= devel/hs-dlist
-dlist-instances_port= devel/hs-dlist-instances
-dns_port= dns/hs-dns
-double-conversion_port= textproc/hs-double-conversion
-DRBG_port= security/hs-DRBG
-easy-file_port= devel/hs-easy-file
-edit-distance_port= devel/hs-edit-distance
-either_port= devel/hs-either
-ekg_port= sysutils/hs-ekg
-ekg-core_port= sysutils/hs-ekg-core
-ekg-json_port= sysutils/hs-ekg-json
-email-validate_port= mail/hs-email-validate
-enclosed-exceptions_port= devel/hs-enclosed-exceptions
-entropy_port= security/hs-entropy
-enumerator_port= devel/hs-enumerator
-equivalence_port= devel/hs-equivalence
-erf_port= math/hs-erf
-errors_port= devel/hs-errors
-esqueleto_port= databases/hs-esqueleto
-exceptions_port= devel/hs-exceptions
-extensible-exceptions_port= devel/hs-extensible-exceptions
-extra_port= devel/hs-extra
-fast-logger_port= devel/hs-fast-logger
-fastcgi_port= www/hs-fastcgi # lib_depends
-feed_port= textproc/hs-feed
-fgl_port= devel/hs-fgl
-file-embed_port= devel/hs-file-embed
-filemanip_port= devel/hs-filemanip
-filestore_port= devel/hs-filestore
-free_port= devel/hs-free
-fsnotify_port= devel/hs-fsnotify
-gconf_port= devel/hs-gconf
-generic-deriving_port= devel/hs-generic-deriving
-geniplate-mirror_port= devel/hs-geniplate-mirror
-ghc-events_port= devel/hs-ghc-events # executable
-ghc-mtl_port= devel/hs-ghc-mtl
-ghc-paths_port= devel/hs-ghc-paths
-gio_port= devel/hs-gio
-git-annex_port= devel/hs-git-annex # executable
-gitit_port= www/hs-gitit # executable
-glib_port= devel/hs-glib
-Glob_port= devel/hs-Glob
-GLURaw_port= x11-toolkits/hs-GLURaw
-GLUT_port= x11-toolkits/hs-GLUT
-gnuidn_port= dns/hs-gnuidn # lib_depends
-gnutls_port= security/hs-gnutls # lib_depends
-gsasl_port= net/hs-gsasl # lib_depends
-gtk_port= x11-toolkits/hs-gtk
-gtk2hs_port= x11-toolkits/hs-gtk2hs # metaport
-gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable
-gtksourceview2_port= x11-toolkits/hs-gtksourceview2
-haddock_port= devel/hs-haddock # executable
-haddock-api_port= devel/hs-haddock-api
-haddock-library_port= devel/hs-haddock-library
-happstack_port= www/hs-happstack # executable
-happstack-server_port= www/hs-happstack-server
-happy_port= devel/hs-happy # executable
-hashable_port= devel/hs-hashable
-hashed-storage_port= devel/hs-hashed-storage
-hashtables_port= devel/hs-hashtables
-haskell-src_port= devel/hs-haskell-src
-haskell-src-exts_port= devel/hs-haskell-src-exts
-haskell-xmpp_port= net-im/hs-haskell-xmpp
-hasktags_port= devel/hs-hasktags # executable
-hastache_port= devel/hs-hastache
-HaXml_port= textproc/hs-HaXml # executable
-hedis_port= databases/hs-hedis
-heist_port= www/hs-heist
-hex_port= devel/hs-hex
-hexpat_port= textproc/hs-hexpat
-HGL_port= graphics/hs-HGL
-highlighting-kate_port= textproc/hs-highlighting-kate
-hinotify_port= devel/hs-hinotify # lib_depends
-hint_port= devel/hs-hint
-hjsmin_port= www/hs-hjsmin # executable
-hlibev_port= devel/hs-hlibev # lib_depends
-hlint_port= devel/hs-hlint # executable
-hoauth2_port= net/hs-hoauth2
-hoogle_port= devel/hs-hoogle # executable
-hostname_port= net/hs-hostname
-hourglass_port= devel/hs-hourglass
-hs-bibutils_port= textproc/hs-hs-bibutils
-hS3_port= www/hs-hS3 # executable
-hsb2hs_port= devel/hs-hsb2hs
-hscolour_port= print/hs-hscolour # executable
-hslogger_port= devel/hs-hslogger
-hslua_port= devel/hs-hslua
-HsOpenSSL_port= security/hs-HsOpenSSL
-hspec_port= devel/hs-hspec # executable
-hspec-core_port= devel/hs-hspec-core
-hspec-discover_port= devel/hs-hspec-discover # executable
-hspec-expectations_port= devel/hs-hspec-expectations
-HStringTemplate_port= textproc/hs-HStringTemplate
-html_port= textproc/hs-html
-html-conduit_port= textproc/hs-html-conduit
-HTTP_port= www/hs-HTTP
-http-client_port= www/hs-http-client
-http-client-tls_port= www/hs-http-client-tls
-http-conduit_port= www/hs-http-conduit
-http-date_port= www/hs-http-date
-http-reverse-proxy_port= www/hs-http-reverse-proxy
-http-server_port= www/hs-http-server
-http-types_port= www/hs-http-types
-http2_port= www/hs-http2
-HUnit_port= devel/hs-HUnit
-hxt_port= textproc/hs-hxt
-hxt-charproperties_port= textproc/hs-hxt-charproperties
-hxt-regex-xmlschema_port= textproc/hs-hxt-regex-xmlschema
-hxt-unicode_port= textproc/hs-hxt-unicode
-ieee754_port= math/hs-ieee754
-IfElse_port= devel/hs-IfElse
-iproute_port= net/hs-iproute
-js-flot_port= devel/hs-js-flot
-js-jquery_port= devel/hs-js-jquery
-json_port= converters/hs-json
-JuicyPixels_port= graphics/hs-JuicyPixels
-kan-extensions_port= math/hs-kan-extensions
-keys_port= devel/hs-keys
-kqueue_port= devel/hs-kqueue
-language-c_port= devel/hs-language-c
-language-javascript_port= devel/hs-language-javascript
-largeword_port= devel/hs-largeword
-lazysmallcheck_port= devel/hs-lazysmallcheck
-lens_port= devel/hs-lens
-lhs2tex_port= textproc/hs-lhs2tex # executable
-libmpd_port= audio/hs-libmpd
-libxml_port= textproc/hs-libxml
-libxml-sax_port= textproc/hs-libxml-sax # lib_depends
-lifted-async_port= devel/hs-lifted-async
-lifted-base_port= devel/hs-lifted-base
-List_port= devel/hs-List
-logict_port= devel/hs-logict
-maccatcher_port= net/hs-maccatcher
-map-syntax_port= devel/hs-map-syntax
-math-functions_port= math/hs-math-functions
-memory_port= devel/hs-memory
-MemoTrie_port= devel/hs-MemoTrie
-mime_port= mail/hs-mime
-mime-mail_port= mail/hs-mime-mail
-mime-types_port= mail/hs-mime-types
-MissingH_port= devel/hs-MissingH
-mmap_port= devel/hs-mmap
-mmorph_port= devel/hs-mmorph
-monad-control_port= devel/hs-monad-control
-monad-logger_port= devel/hs-monad-logger
-monad-loops_port= devel/hs-monad-loops
-monad-par_port= devel/hs-monad-par
-monad-par-extras_port= devel/hs-monad-par-extras
-MonadCatchIO-mtl_port= devel/hs-MonadCatchIO-mtl
-MonadCatchIO-transformers_port= devel/hs-MonadCatchIO-transformers
-monadcryptorandom_port= security/hs-monadcryptorandom
-MonadRandom_port= devel/hs-MonadRandom
-monads-tf_port= devel/hs-monads-tf
-mono-traversable_port= devel/hs-mono-traversable
-mtl_port= devel/hs-mtl
-mueval_port= devel/hs-mueval # executable
-multipart_port= www/hs-multipart
-murmur-hash_port= devel/hs-murmur-hash
-mutable-containers_port= devel/hs-mutable-containers
-mwc-random_port= math/hs-mwc-random
-mysql_port= databases/hs-mysql
-ncurses_port= devel/hs-ncurses # lib_depends
-network_port= net/hs-network
-network-info_port= net/hs-network-info
-network-multicast_port= net/hs-network-multicast
-network-protocol-xmpp_port= net/hs-network-protocol-xmpp
-network-uri_port= net/hs-network-uri
-newtype_port= devel/hs-newtype
-nonce_port= security/hs-nonce
-NumInstances_port= math/hs-NumInstances
-ObjectName_port= devel/hs-ObjectName
-oeis_port= www/hs-oeis
-old-locale_port= devel/hs-old-locale
-old-time_port= devel/hs-old-time
-OpenAL_port= audio/hs-OpenAL
-OpenGL_port= x11-toolkits/hs-OpenGL
-OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw
-optparse-applicative_port= devel/hs-optparse-applicative
-pandoc_port= textproc/hs-pandoc # executable
-pandoc-citeproc_port= textproc/hs-pandoc-citeproc # executable
-pandoc-types_port= textproc/hs-pandoc-types
-pango_port= x11-toolkits/hs-pango
-parallel_port= devel/hs-parallel
-parsec_port= textproc/hs-parsec
-path-pieces_port= www/hs-path-pieces
-pcap_port= net/hs-pcap
-pcre-light_port= devel/hs-pcre-light # lib_depends
-pem_port= security/hs-pem
-persistent_port= databases/hs-persistent
-persistent-sqlite_port= databases/hs-persistent-sqlite
-persistent-template_port= databases/hs-persistent-template
-pointed_port= math/hs-pointed
-polyparse_port= textproc/hs-polyparse
-porte_port= ports-mgmt/hs-porte # executable
-prelude-extras_port= devel/hs-prelude-extras
-preprocessor-tools_port= devel/hs-preprocessor-tools
-prettyclass_port= devel/hs-prettyclass
-primitive_port= devel/hs-primitive
-probability_port= math/hs-probability
-profunctors_port= devel/hs-profunctors
-project-template_port= devel/hs-project-template
-PSQueue_port= devel/hs-PSQueue
-publicsuffixlist_port= net/hs-publicsuffixlist
-pureMD5_port= security/hs-pureMD5
-pwstore-fast_port= security/hs-pwstore-fast
-QuickCheck_port= devel/hs-QuickCheck
-quickcheck-io_port= devel/hs-quickcheck-io
-random_port= devel/hs-random
-ReadArgs_port= devel/hs-ReadArgs # executable
-readline_port= devel/hs-readline
-recaptcha_port= www/hs-recaptcha
-reflection_port= devel/hs-reflection
-regex-applicative_port= textproc/hs-regex-applicative
-regex-base_port= textproc/hs-regex-base
-regex-compat_port= textproc/hs-regex-compat
-regex-compat-tdfa_port= textproc/hs-regex-compat-tdfa
-regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin # lib_depends
-regex-posix_port= textproc/hs-regex-posix
-regex-tdfa_port= textproc/hs-regex-tdfa
-resource-pool_port= devel/hs-resource-pool
-resourcet_port= devel/hs-resourcet
-rfc5051_port= textproc/hs-rfc5051
-RSA_port= security/hs-RSA
-safe_port= devel/hs-safe
-SafeSemaphore_port= devel/hs-SafeSemaphore
-sandi_port= converters/hs-sandi
-scientific_port= devel/hs-scientific
-scroll_port= games/hs-scroll # executable
-securemem_port= devel/hs-securemem
-semigroupoids_port= math/hs-semigroupoids
-semigroups_port= math/hs-semigroups
-sendfile_port= net/hs-sendfile
-setenv_port= devel/hs-setenv
-setlocale_port= devel/hs-setlocale
-SHA_port= security/hs-SHA # executable
-shake_port= devel/hs-shake # executable
-shakespeare_port= www/hs-shakespeare
-ShellCheck_port= devel/hs-ShellCheck # executable
-shelly_port= shells/hs-shelly
-show_port= devel/hs-show
-silently_port= devel/hs-silently
-simple-reflect_port= devel/hs-simple-reflect
-simple-sendfile_port= net/hs-simple-sendfile
-skein_port= security/hs-skein
-smallcheck_port= devel/hs-smallcheck
-snap_port= www/hs-snap # executable
-snap-core_port= www/hs-snap-core
-snap-server_port= www/hs-snap-server # lib_depends
-socks_port= net/hs-socks
-split_port= devel/hs-split
-StateVar_port= devel/hs-StateVar
-statistics_port= math/hs-statistics
-stm_port= devel/hs-stm
-stm-chans_port= devel/hs-stm-chans
-STMonadTrans_port= devel/hs-STMonadTrans
-Stream_port= devel/hs-Stream
-streaming-commons_port= devel/hs-streaming-commons
-strict_port= devel/hs-strict
-stringsearch_port= textproc/hs-stringsearch
-svgcairo_port= graphics/hs-svgcairo
-syb_port= devel/hs-syb
-syb-with-class_port= devel/hs-syb-with-class
-syb-with-class-instances-text_port= devel/hs-syb-with-class-instances-text
-system-fileio_port= devel/hs-system-fileio
-system-filepath_port= devel/hs-system-filepath
-tagged_port= devel/hs-tagged
-tagsoup_port= textproc/hs-tagsoup # executable
-tagstream-conduit_port= textproc/hs-tagstream-conduit
-tar_port= archivers/hs-tar
-temporary_port= devel/hs-temporary
-test-framework_port= devel/hs-test-framework
-test-framework-hunit_port= devel/hs-test-framework-hunit
-test-framework-quickcheck2_port= devel/hs-test-framework-quickcheck2
-texmath_port= textproc/hs-texmath # executable
-text_port= devel/hs-text
-text-icu_port= devel/hs-text-icu # lib_depends
-tf-random_port= devel/hs-tf-random
-threads_port= devel/hs-threads
-threadscope_port= devel/hs-threadscope # executable
-time-compat_port= devel/hs-time-compat
-time-locale-compat_port= devel/hs-time-locale-compat
-timezone-olson_port= devel/hs-timezone-olson
-timezone-series_port= devel/hs-timezone-series
-tls_port= security/hs-tls
-torrent_port= net-p2p/hs-torrent
-transformers-base_port= devel/hs-transformers-base
-transformers-compat_port= devel/hs-transformers-compat
-TypeCompose_port= devel/hs-TypeCompose
-unamb_port= devel/hs-unamb
-uniplate_port= devel/hs-uniplate
-unix-compat_port= devel/hs-unix-compat
-unix-time_port= devel/hs-unix-time
-unlambda_port= lang/hs-unlambda # executable
-unordered-containers_port= devel/hs-unordered-containers
-uri_port= textproc/hs-uri
-url_port= www/hs-url
-utf8-light_port= devel/hs-utf8-light
-utf8-string_port= devel/hs-utf8-string
-utility-ht_port= devel/hs-utility-ht
-uuagc_port= devel/hs-uuagc # executable
-uuagc-bootstrap_port= devel/hs-uuagc-bootstrap # executable
-uuagc-cabal_port= devel/hs-uuagc-cabal
-uuid_port= devel/hs-uuid
-uuid-types_port= devel/hs-uuid-types
-uulib_port= devel/hs-uulib
-vault_port= devel/hs-vault
-vector_port= devel/hs-vector
-vector-algorithms_port= devel/hs-vector-algorithms
-vector-binary-instances_port= devel/hs-vector-binary-instances
-vector-instances_port= devel/hs-vector-instances
-vector-space_port= math/hs-vector-space
-vector-th-unbox_port= devel/hs-vector-th-unbox
-void_port= devel/hs-void
-vte_port= x11-toolkits/hs-vte
-wai_port= www/hs-wai
-wai-app-static_port= www/hs-wai-app-static # executable
-wai-extra_port= www/hs-wai-extra
-wai-logger_port= www/hs-wai-logger
-warp_port= www/hs-warp
-warp-tls_port= www/hs-warp-tls
-webkit_port= www/hs-webkit # lib_depends
-word8_port= devel/hs-word8
-wx_port= x11-toolkits/hs-wx
-wxc_port= x11-toolkits/hs-wxc # lib_depends
-wxcore_port= x11-toolkits/hs-wxcore # lib_depends
-wxdirect_port= x11-toolkits/hs-wxdirect # executable
-X11_port= x11/hs-X11 # lib_depends
-X11-xft_port= x11/hs-X11-xft
-x509_port= security/hs-x509
-x509-store_port= security/hs-x509-store
-x509-system_port= security/hs-x509-system
-x509-validation_port= security/hs-x509-validation
-xml_port= textproc/hs-xml
-xml-conduit_port= textproc/hs-xml-conduit
-xml-hamlet_port= textproc/hs-xml-hamlet
-xml-types_port= textproc/hs-xml-types
-xmlhtml_port= textproc/hs-xmlhtml
-xmobar_port= x11/hs-xmobar # executable
-xmonad_port= x11-wm/hs-xmonad # executable
-xmonad-contrib_port= x11-wm/hs-xmonad-contrib
-xss-sanitize_port= www/hs-xss-sanitize
-yaml_port= textproc/hs-yaml # executable
-yesod_port= www/hs-yesod
-yesod-auth_port= www/hs-yesod-auth
-yesod-auth-hashdb_port= www/hs-yesod-auth-hashdb
-yesod-bin_port= www/hs-yesod-bin # executable
-yesod-core_port= www/hs-yesod-core
-yesod-form_port= www/hs-yesod-form
-yesod-persistent_port= www/hs-yesod-persistent
-yesod-static_port= www/hs-yesod-static
-yesod-test_port= www/hs-yesod-test
-zip-archive_port= archivers/hs-zip-archive
-zlib_port= archivers/hs-zlib
-zlib-bindings_port= archivers/hs-zlib-bindings
-zlib-enum_port= archivers/hs-zlib-enum
+abstract-deque_port?= devel/hs-abstract-deque
+abstract-par_port?= devel/hs-abstract-par
+activehs_port?= www/hs-activehs # executable
+activehs-base_port?= devel/hs-activehs-base
+adjunctions_port?= math/hs-adjunctions
+aeson_port?= converters/hs-aeson
+aeson-compat_port?= converters/hs-aeson-compat
+aeson-pretty_port?= converters/hs-aeson-pretty # executable
+Agda_port?= math/hs-Agda # executable
+alex_port?= devel/hs-alex # executable
+ALUT_port?= audio/hs-ALUT
+angel_port?= sysutils/hs-angel # executable
+ansi-terminal_port?= devel/hs-ansi-terminal
+ansi-wl-pprint_port?= devel/hs-ansi-wl-pprint
+appar_port?= textproc/hs-appar
+arrows_port?= devel/hs-arrows
+asn1-data_port?= devel/hs-asn1-data
+asn1-encoding_port?= devel/hs-asn1-encoding
+asn1-parse_port?= devel/hs-asn1-parse
+asn1-types_port?= devel/hs-asn1-types
+async_port?= devel/hs-async
+atomic-primops_port?= devel/hs-atomic-primops
+attoparsec_port?= textproc/hs-attoparsec
+attoparsec-enumerator_port?= textproc/hs-attoparsec-enumerator
+attoparsec-iso8601_port?= textproc/hs-attoparsec-iso8601
+authenticate_port?= www/hs-authenticate
+auto-update_port?= devel/hs-auto-update
+aws_port?= net/hs-aws
+base-compat_port?= devel/hs-base-compat
+base-orphans_port?= devel/hs-base-orphans
+base-unicode-symbols_port?= devel/hs-base-unicode-symbols
+base16-bytestring_port?= devel/hs-base16-bytestring
+base64-bytestring_port?= devel/hs-base64-bytestring
+basic-prelude_port?= devel/hs-basic-prelude
+bencode_port?= textproc/hs-bencode
+bifunctors_port?= devel/hs-bifunctors
+bio_port?= science/hs-bio # executable
+bits-atomic_port?= devel/hs-bits-atomic
+blaze-builder_port?= devel/hs-blaze-builder
+blaze-builder-enumerator_port?= devel/hs-blaze-builder-enumerator
+blaze-html_port?= textproc/hs-blaze-html
+blaze-markup_port?= textproc/hs-blaze-markup
+blaze-textual_port?= devel/hs-blaze-textual
+bloomfilter_port?= devel/hs-bloomfilter
+BNFC_port?= devel/hs-BNFC # executable
+Boolean_port?= devel/hs-Boolean
+BoundedChan_port?= devel/hs-BoundedChan
+boxes_port?= devel/hs-boxes
+brainfuck_port?= lang/hs-brainfuck # executable
+bsd-sysctl_port?= devel/hs-bsd-sysctl
+byteable_port?= devel/hs-byteable
+byteorder_port?= devel/hs-byteorder
+bytestring-csv_port?= textproc/hs-bytestring-csv
+bytestring-lexing_port?= devel/hs-bytestring-lexing
+bytestring-mmap_port?= devel/hs-bytestring-mmap
+bytestring-nums_port?= devel/hs-bytestring-nums # executable
+bytestring-show_port?= devel/hs-bytestring-show
+c2hs_port?= devel/hs-c2hs # executable
+cabal-install_port?= devel/hs-cabal-install # executable
+call-stack_port?= devel/hs-call-stack
+cairo_port?= graphics/hs-cairo
+case-insensitive_port?= textproc/hs-case-insensitive
+cassava_port?= textproc/hs-cassava
+categories_port?= math/hs-categories
+cereal_port?= devel/hs-cereal
+certificate_port?= security/hs-certificate
+cgi_port?= www/hs-cgi
+checkers_port?= devel/hs-checkers
+chunked-data_port?= devel/hs-chunked-data
+cipher-aes_port?= security/hs-cipher-aes
+cipher-aes128_port?= security/hs-cipher-aes128
+cipher-blowfish_port?= security/hs-cipher-blowfish
+cipher-camellia_port?= security/hs-cipher-camellia
+cipher-des_port?= security/hs-cipher-des
+cipher-rc4_port?= security/hs-cipher-rc4
+classy-prelude_port?= devel/hs-classy-prelude
+classy-prelude-conduit_port?= devel/hs-classy-prelude-conduit
+clientsession_port?= security/hs-clientsession
+clock_port?= devel/hs-clock
+cmark_port?= textproc/hs-cmark
+cmdargs_port?= devel/hs-cmdargs
+code-page_port?= devel/hs-code-page
+colour_port?= devel/hs-colour
+comonad_port?= math/hs-comonad
+concurrent-output_port?= devel/hs-concurrent-output
+conduit_port?= devel/hs-conduit
+conduit-combinators_port?= devel/hs-conduit-combinators
+conduit-extra_port?= devel/hs-conduit-extra
+ConfigFile_port?= devel/hs-ConfigFile
+configurator_port?= devel/hs-configurator
+connection_port?= net/hs-connection
+constraints_port?= devel/hs-constraints
+contravariant_port?= math/hs-contravariant
+convertible_port?= devel/hs-convertible
+cookie_port?= www/hs-cookie
+cpphs_port?= devel/hs-cpphs # executable
+cprng-aes_port?= security/hs-cprng-aes
+cpu_port?= sysutils/hs-cpu
+criterion_port?= benchmarks/hs-criterion
+Crypto_port?= security/hs-Crypto
+crypto-api_port?= security/hs-crypto-api
+crypto-cipher-types_port?= security/hs-crypto-cipher-types
+crypto-conduit_port?= security/hs-crypto-conduit
+crypto-numbers_port?= security/hs-crypto-numbers
+crypto-pubkey_port?= security/hs-crypto-pubkey
+crypto-pubkey-types_port?= security/hs-crypto-pubkey-types
+crypto-random_port?= security/hs-crypto-random
+crypto-random-api_port?= security/hs-crypto-random-api
+cryptocipher_port?= security/hs-cryptocipher
+cryptohash_port?= security/hs-cryptohash
+cryptohash-md5_port?= security/hs-cryptohash-md5
+cryptohash-sha1_port?= security/hs-cryptohash-sha1
+cryptohash-sha256_port?= security/hs-cryptohash-sha256
+cryptohash-conduit_port?= security/hs-cryptohash-conduit
+cryptohash-cryptoapi_port?= security/hs-cryptohash-cryptoapi
+cryptonite_port?= security/hs-cryptonite
+css-text_port?= www/hs-css-text
+csv_port?= textproc/hs-csv
+curl_port?= ftp/hs-curl # lib_depends
+darcs_port?= devel/hs-darcs # executable
+data-default_port?= devel/hs-data-default
+data-default-class_port?= devel/hs-data-default-class
+data-default-instances-base_port?= devel/hs-data-default-instances-base
+data-default-instances-containers_port?= devel/hs-data-default-instances-containers
+data-default-instances-dlist_port?= devel/hs-data-default-instances-dlist
+data-default-instances-old-locale_port?= devel/hs-data-default-instances-old-locale
+data-endian_port?= devel/hs-data-endian
+data-hash_port?= devel/hs-data-hash
+data-lens_port?= math/hs-data-lens
+data-lens-template_port?= math/hs-data-lens-template
+data-ordlist_port?= devel/hs-data-ordlist
+data-pprint_port?= devel/hs-data-pprint
+dataenc_port?= converters/hs-dataenc
+date-cache_port?= devel/hs-date-cache
+datetime_port?= devel/hs-datetime
+DAV_port?= www/hs-DAV # executable
+dbus_port?= devel/hs-dbus
+deepseq-generics_port?= devel/hs-deepseq-generics
+dia-base_port?= graphics/hs-dia-base
+dia-functions_port?= graphics/hs-dia-functions
+Diff_port?= textproc/hs-Diff
+digest_port?= security/hs-digest
+directory-tree_port?= devel/hs-directory-tree
+disk-free-space_port?= sysutils/hs-disk-free-space
+distributive_port?= math/hs-distributive
+dlist_port?= devel/hs-dlist
+dlist-instances_port?= devel/hs-dlist-instances
+dns_port?= dns/hs-dns
+doctemplates_port?= textproc/hs-doctemplates
+double-conversion_port?= textproc/hs-double-conversion
+DRBG_port?= security/hs-DRBG
+ed25519_port?= security/hs-ed25519
+easy-file_port?= devel/hs-easy-file
+EdisonAPI_port?= devel/hs-EdisonAPI
+EdisonCore_port?= devel/hs-EdisonCore
+edit-distance_port?= devel/hs-edit-distance
+either_port?= devel/hs-either
+ekg_port?= sysutils/hs-ekg
+ekg-core_port?= sysutils/hs-ekg-core
+ekg-json_port?= sysutils/hs-ekg-json
+email-validate_port?= mail/hs-email-validate
+enclosed-exceptions_port?= devel/hs-enclosed-exceptions
+entropy_port?= security/hs-entropy
+enumerator_port?= devel/hs-enumerator
+equivalence_port?= devel/hs-equivalence
+erf_port?= math/hs-erf
+errors_port?= devel/hs-errors
+esqueleto_port?= databases/hs-esqueleto
+exceptions_port?= devel/hs-exceptions
+extensible-exceptions_port?= devel/hs-extensible-exceptions
+extra_port?= devel/hs-extra
+fast-logger_port?= devel/hs-fast-logger
+fastcgi_port?= www/hs-fastcgi # lib_depends
+feed_port?= textproc/hs-feed
+fdo-notify_port?= deskutils/hs-fdo-notify
+fgl_port?= devel/hs-fgl
+file-embed_port?= devel/hs-file-embed
+filemanip_port?= devel/hs-filemanip
+filestore_port?= devel/hs-filestore
+fixed_port?= math/hs-fixed
+foundation_port?= devel/hs-foundation
+fmlist_port?= devel/hs-fmlist
+free_port?= devel/hs-free
+fsnotify_port?= devel/hs-fsnotify
+gconf_port?= devel/hs-gconf
+generic-deriving_port?= devel/hs-generic-deriving
+geniplate-mirror_port?= devel/hs-geniplate-mirror
+ghc-events_port?= devel/hs-ghc-events # executable
+ghc-mtl_port?= devel/hs-ghc-mtl
+ghc-paths_port?= devel/hs-ghc-paths
+gio_port?= devel/hs-gio
+git-annex_port?= devel/hs-git-annex # executable
+gitit_port?= www/hs-gitit # executable
+gitrev_port?= devel/hs-gitrev
+glib_port?= devel/hs-glib
+Glob_port?= devel/hs-Glob
+GLURaw_port?= x11-toolkits/hs-GLURaw
+GLUT_port?= x11-toolkits/hs-GLUT
+gnuidn_port?= dns/hs-gnuidn # lib_depends
+gnutls_port?= security/hs-gnutls # lib_depends
+graphviz_port?= graphics/hs-graphviz
+gsasl_port?= net/hs-gsasl # lib_depends
+gtk_port?= x11-toolkits/hs-gtk
+gtk2hs_port?= x11-toolkits/hs-gtk2hs # metaport
+gtk2hs-buildtools_port?= devel/hs-gtk2hs-buildtools # executable
+gtksourceview2_port?= x11-toolkits/hs-gtksourceview2
+hackage-security_port?= security/hs-hackage-security
+haddock_port?= devel/hs-haddock # executable
+haddock-api_port?= devel/hs-haddock-api
+haddock-library_port?= devel/hs-haddock-library
+half_port?= math/hs-half
+happstack_port?= www/hs-happstack # executable
+happstack-server_port?= www/hs-happstack-server
+happy_port?= devel/hs-happy # executable
+hashable_port?= devel/hs-hashable
+hashed-storage_port?= devel/hs-hashed-storage
+hashtables_port?= devel/hs-hashtables
+haskell-lexer_port?= devel/hs-haskell-lexer
+haskell-src_port?= devel/hs-haskell-src
+haskell-src-exts_port?= devel/hs-haskell-src-exts
+haskell-xmpp_port?= net-im/hs-haskell-xmpp
+hasktags_port?= devel/hs-hasktags # executable
+hastache_port?= devel/hs-hastache
+HaXml_port?= textproc/hs-HaXml # executable
+hedis_port?= databases/hs-hedis
+heist_port?= www/hs-heist
+hex_port?= devel/hs-hex
+hexpat_port?= textproc/hs-hexpat
+HGL_port?= graphics/hs-HGL
+highlighting-kate_port?= textproc/hs-highlighting-kate
+hinotify_port?= devel/hs-hinotify # lib_depends
+hint_port?= devel/hs-hint
+hjsmin_port?= www/hs-hjsmin # executable
+hlibev_port?= devel/hs-hlibev # lib_depends
+hlint_port?= devel/hs-hlint # executable
+hoauth2_port?= net/hs-hoauth2
+hoogle_port?= devel/hs-hoogle # executable
+hostname_port?= net/hs-hostname
+hourglass_port?= devel/hs-hourglass
+hs-bibutils_port?= textproc/hs-hs-bibutils
+hS3_port?= www/hs-hS3 # executable
+hsb2hs_port?= devel/hs-hsb2hs
+hscolour_port?= print/hs-hscolour # executable
+hslogger_port?= devel/hs-hslogger
+hslua_port?= devel/hs-hslua
+HsOpenSSL_port?= security/hs-HsOpenSSL
+hspec_port?= devel/hs-hspec # executable
+hspec-core_port?= devel/hs-hspec-core
+hspec-discover_port?= devel/hs-hspec-discover # executable
+hspec-expectations_port?= devel/hs-hspec-expectations
+HStringTemplate_port?= textproc/hs-HStringTemplate
+html_port?= textproc/hs-html
+html-conduit_port?= textproc/hs-html-conduit
+HTTP_port?= www/hs-HTTP
+http-api-data_port?= www/hs-http-api-data
+http-client_port?= www/hs-http-client
+http-client-tls_port?= www/hs-http-client-tls
+http-conduit_port?= www/hs-http-conduit
+http-date_port?= www/hs-http-date
+http-reverse-proxy_port?= www/hs-http-reverse-proxy
+http-server_port?= www/hs-http-server
+http-types_port?= www/hs-http-types
+http2_port?= www/hs-http2
+HUnit_port?= devel/hs-HUnit
+hxt_port?= textproc/hs-hxt
+hxt-charproperties_port?= textproc/hs-hxt-charproperties
+hxt-regex-xmlschema_port?= textproc/hs-hxt-regex-xmlschema
+hxt-unicode_port?= textproc/hs-hxt-unicode
+ieee754_port?= math/hs-ieee754
+IfElse_port?= devel/hs-IfElse
+integer-logarithms_port?= math/hs-integer-logarithms
+io-streams_port?= devel/hs-io-streams
+io-streams-haproxy_port?= devel/hs-io-streams-haproxy
+iproute_port?= net/hs-iproute
+js-flot_port?= devel/hs-js-flot
+js-jquery_port?= devel/hs-js-jquery
+json_port?= converters/hs-json
+JuicyPixels_port?= graphics/hs-JuicyPixels
+kan-extensions_port?= math/hs-kan-extensions
+keys_port?= devel/hs-keys
+kqueue_port?= devel/hs-kqueue
+language-c_port?= devel/hs-language-c
+language-javascript_port?= devel/hs-language-javascript
+largeword_port?= devel/hs-largeword
+lazysmallcheck_port?= devel/hs-lazysmallcheck
+lens_port?= devel/hs-lens
+lhs2tex_port?= textproc/hs-lhs2tex # executable
+libmpd_port?= audio/hs-libmpd
+libxml_port?= textproc/hs-libxml
+libxml-sax_port?= textproc/hs-libxml-sax # lib_depends
+lifted-async_port?= devel/hs-lifted-async
+lifted-base_port?= devel/hs-lifted-base
+List_port?= devel/hs-List
+ListLike_port?= devel/hs-ListLike
+logict_port?= devel/hs-logict
+maccatcher_port?= net/hs-maccatcher
+magic_port?= textproc/hs-magic
+map-syntax_port?= devel/hs-map-syntax
+math-functions_port?= math/hs-math-functions
+memory_port?= devel/hs-memory
+MemoTrie_port?= devel/hs-MemoTrie
+microlens_port?= devel/hs-microlens
+microlens-th_port?= devel/hs-microlens-th
+microstache_port?= devel/hs-microstache
+mime_port?= mail/hs-mime
+mime-mail_port?= mail/hs-mime-mail
+mime-types_port?= mail/hs-mime-types
+MissingH_port?= devel/hs-MissingH
+mmap_port?= devel/hs-mmap
+mmorph_port?= devel/hs-mmorph
+monad-control_port?= devel/hs-monad-control
+monad-logger_port?= devel/hs-monad-logger
+monad-loops_port?= devel/hs-monad-loops
+monad-par_port?= devel/hs-monad-par
+monad-par-extras_port?= devel/hs-monad-par-extras
+monad-unlift_port?= devel/hs-monad-unlift
+monadcryptorandom_port?= security/hs-monadcryptorandom
+monadplus_port?= devel/hs-monadplus
+MonadRandom_port?= devel/hs-MonadRandom
+monads-tf_port?= devel/hs-monads-tf
+mono-traversable_port?= devel/hs-mono-traversable
+mono-traversable-instances_port?= devel/hs-mono-traversable-instances
+mountpoints_port?= sysutils/hs-mountpoints
+mtl_port?= devel/hs-mtl
+mueval_port?= devel/hs-mueval # executable
+multipart_port?= www/hs-multipart
+murmur-hash_port?= devel/hs-murmur-hash
+mutable-containers_port?= devel/hs-mutable-containers
+mwc-random_port?= math/hs-mwc-random
+mysql_port?= databases/hs-mysql
+ncurses_port?= devel/hs-ncurses # lib_depends
+network_port?= net/hs-network
+network-info_port?= net/hs-network-info
+network-multicast_port?= net/hs-network-multicast
+network-protocol-xmpp_port?= net/hs-network-protocol-xmpp
+network-uri_port?= net/hs-network-uri
+newtype_port?= devel/hs-newtype
+newtype-generics_port?= devel/hs-newtype-generics
+nonce_port?= security/hs-nonce
+NumInstances_port?= math/hs-NumInstances
+ObjectName_port?= devel/hs-ObjectName
+oeis_port?= www/hs-oeis
+old-locale_port?= devel/hs-old-locale
+old-time_port?= devel/hs-old-time
+Only_port?= devel/hs-Only
+OpenAL_port?= audio/hs-OpenAL
+OpenGL_port?= x11-toolkits/hs-OpenGL
+OpenGLRaw_port?= x11-toolkits/hs-OpenGLRaw
+optparse-applicative_port?= devel/hs-optparse-applicative
+pandoc_port?= textproc/hs-pandoc # executable
+pandoc-citeproc_port?= textproc/hs-pandoc-citeproc # executable
+pandoc-types_port?= textproc/hs-pandoc-types
+pango_port?= x11-toolkits/hs-pango
+parallel_port?= devel/hs-parallel
+parsec_port?= textproc/hs-parsec
+path-pieces_port?= www/hs-path-pieces
+pcap_port?= net/hs-pcap
+pcre-light_port?= devel/hs-pcre-light # lib_depends
+pem_port?= security/hs-pem
+persistent_port?= databases/hs-persistent
+persistent-sqlite_port?= databases/hs-persistent-sqlite
+persistent-template_port?= databases/hs-persistent-template
+pointed_port?= math/hs-pointed
+polyparse_port?= textproc/hs-polyparse
+porte_port?= ports-mgmt/hs-porte # executable
+prelude-extras_port?= devel/hs-prelude-extras
+preprocessor-tools_port?= devel/hs-preprocessor-tools
+pretty-show_port?= textproc/hs-pretty-show
+prettyclass_port?= devel/hs-prettyclass
+primitive_port?= devel/hs-primitive
+probability_port?= math/hs-probability
+process-extras_port?= devel/hs-process-extras
+profunctors_port?= devel/hs-profunctors
+project-template_port?= devel/hs-project-template
+PSQueue_port?= devel/hs-PSQueue
+psqueues_port?= devel/hs-psqueues
+publicsuffixlist_port?= net/hs-publicsuffixlist
+pureMD5_port?= security/hs-pureMD5
+pwstore-fast_port?= security/hs-pwstore-fast
+QuickCheck_port?= devel/hs-QuickCheck
+quickcheck-io_port?= devel/hs-quickcheck-io
+random_port?= devel/hs-random
+ReadArgs_port?= devel/hs-ReadArgs # executable
+readable_port?= devel/hs-readable
+readline_port?= devel/hs-readline
+recaptcha_port?= www/hs-recaptcha
+refact_port?= devel/hs-refact
+reflection_port?= devel/hs-reflection
+regex-applicative_port?= textproc/hs-regex-applicative
+regex-base_port?= textproc/hs-regex-base
+regex-compat_port?= textproc/hs-regex-compat
+regex-compat-tdfa_port?= textproc/hs-regex-compat-tdfa
+regex-pcre_port?= textproc/hs-regex-pcre
+regex-pcre-builtin_port?= textproc/hs-regex-pcre-builtin # lib_depends
+regex-posix_port?= textproc/hs-regex-posix
+regex-tdfa_port?= textproc/hs-regex-tdfa
+resource-pool_port?= devel/hs-resource-pool
+resourcet_port?= devel/hs-resourcet
+rfc5051_port?= textproc/hs-rfc5051
+RSA_port?= security/hs-RSA
+safe_port?= devel/hs-safe
+safe-exceptions_port?= devel/hs-safe-exceptions
+SafeSemaphore_port?= devel/hs-SafeSemaphore
+sandi_port?= converters/hs-sandi
+say_port?= devel/hs-say
+scanner_port?= textproc/hs-scanner
+scientific_port?= devel/hs-scientific
+scroll_port?= games/hs-scroll # executable
+securemem_port?= devel/hs-securemem
+semigroupoids_port?= math/hs-semigroupoids
+semigroups_port?= math/hs-semigroups
+sendfile_port?= net/hs-sendfile
+setenv_port?= devel/hs-setenv
+setlocale_port?= devel/hs-setlocale
+SHA_port?= security/hs-SHA # executable
+shake_port?= devel/hs-shake # executable
+shakespeare_port?= www/hs-shakespeare
+ShellCheck_port?= devel/hs-ShellCheck # executable
+shelly_port?= shells/hs-shelly
+show_port?= devel/hs-show
+silently_port?= devel/hs-silently
+simple-reflect_port?= devel/hs-simple-reflect
+simple-sendfile_port?= net/hs-simple-sendfile
+skein_port?= security/hs-skein
+skylighting_port?= textproc/hs-skylighting
+smallcheck_port?= devel/hs-smallcheck
+snap_port?= www/hs-snap # executable
+snap-core_port?= www/hs-snap-core
+snap-server_port?= www/hs-snap-server # lib_depends
+socks_port?= net/hs-socks
+split_port?= devel/hs-split
+StateVar_port?= devel/hs-StateVar
+statistics_port?= math/hs-statistics
+stm_port?= devel/hs-stm
+stm-chans_port?= devel/hs-stm-chans
+STMonadTrans_port?= devel/hs-STMonadTrans
+Stream_port?= devel/hs-Stream
+streaming-commons_port?= devel/hs-streaming-commons
+strict_port?= devel/hs-strict
+stringsearch_port?= textproc/hs-stringsearch
+svgcairo_port?= graphics/hs-svgcairo
+syb_port?= devel/hs-syb
+syb-with-class_port?= devel/hs-syb-with-class
+system-fileio_port?= devel/hs-system-fileio
+system-filepath_port?= devel/hs-system-filepath
+tagged_port?= devel/hs-tagged
+tagsoup_port?= textproc/hs-tagsoup # executable
+tagstream-conduit_port?= textproc/hs-tagstream-conduit
+tar_port?= archivers/hs-tar
+temporary_port?= devel/hs-temporary
+terminal-size_port?= devel/hs-terminal-size
+test-framework_port?= devel/hs-test-framework
+test-framework-hunit_port?= devel/hs-test-framework-hunit
+test-framework-quickcheck2_port?= devel/hs-test-framework-quickcheck2
+texmath_port?= textproc/hs-texmath # executable
+text_port?= devel/hs-text
+text-icu_port?= devel/hs-text-icu # lib_depends
+text-short_port?= devel/hs-text-short
+tf-random_port?= devel/hs-tf-random
+th-abstraction_port?= devel/hs-th-abstraction
+th-lift_port?= devel/hs-th-lift
+th-lift-instances_port?= devel/hs-th-lift-instances
+threads_port?= devel/hs-threads
+threadscope_port?= devel/hs-threadscope # executable
+time-compat_port?= devel/hs-time-compat
+time-locale-compat_port?= devel/hs-time-locale-compat
+timezone-olson_port?= devel/hs-timezone-olson
+timezone-series_port?= devel/hs-timezone-series
+tls_port?= security/hs-tls
+tls-session-manager_port?= security/hs-tls-session-manager
+torrent_port?= net-p2p/hs-torrent
+transformers-base_port?= devel/hs-transformers-base
+transformers-compat_port?= devel/hs-transformers-compat
+TypeCompose_port?= devel/hs-TypeCompose
+typed-process_port?= devel/hs-typed-process
+unamb_port?= devel/hs-unamb
+unexceptionalio_port?= devel/hs-unexceptionalio
+uniplate_port?= devel/hs-uniplate
+unix-compat_port?= devel/hs-unix-compat
+unix-time_port?= devel/hs-unix-time
+unlambda_port?= lang/hs-unlambda # executable
+unordered-containers_port?= devel/hs-unordered-containers
+uri_port?= textproc/hs-uri
+uri-bytestring_port?= textproc/hs-uri-bytestring
+uri-bytestring-aeson_port?= textproc/hs-uri-bytestring-aeson
+url_port?= www/hs-url
+utf8-light_port?= devel/hs-utf8-light
+utf8-string_port?= devel/hs-utf8-string
+utility-ht_port?= devel/hs-utility-ht
+uuagc_port?= devel/hs-uuagc # executable
+uuagc-bootstrap_port?= devel/hs-uuagc-bootstrap # executable
+uuagc-cabal_port?= devel/hs-uuagc-cabal
+uuid_port?= devel/hs-uuid
+uuid-types_port?= devel/hs-uuid-types
+uulib_port?= devel/hs-uulib
+vault_port?= devel/hs-vault
+vector_port?= devel/hs-vector
+vector-algorithms_port?= devel/hs-vector-algorithms
+vector-binary-instances_port?= devel/hs-vector-binary-instances
+vector-instances_port?= devel/hs-vector-instances
+vector-space_port?= math/hs-vector-space
+vector-th-unbox_port?= devel/hs-vector-th-unbox
+void_port?= devel/hs-void
+vte_port?= x11-toolkits/hs-vte
+wai_port?= www/hs-wai
+wai-app-static_port?= www/hs-wai-app-static # executable
+wai-extra_port?= www/hs-wai-extra
+wai-logger_port?= www/hs-wai-logger
+warp_port?= www/hs-warp
+warp-tls_port?= www/hs-warp-tls
+webkit_port?= www/hs-webkit # lib_depends
+wl-pprint-text_port?= devel/hs-wl-pprint-text
+word8_port?= devel/hs-word8
+wx_port?= x11-toolkits/hs-wx
+wxc_port?= x11-toolkits/hs-wxc # lib_depends
+wxcore_port?= x11-toolkits/hs-wxcore # lib_depends
+wxdirect_port?= x11-toolkits/hs-wxdirect # executable
+X11_port?= x11/hs-X11 # lib_depends
+X11-xft_port?= x11/hs-X11-xft
+x509_port?= security/hs-x509
+x509-store_port?= security/hs-x509-store
+x509-system_port?= security/hs-x509-system
+x509-validation_port?= security/hs-x509-validation
+xhtml_port?= textproc/hs-xhtml
+xml_port?= textproc/hs-xml
+xml-conduit_port?= textproc/hs-xml-conduit
+xml-hamlet_port?= textproc/hs-xml-hamlet
+xml-types_port?= textproc/hs-xml-types
+xmlhtml_port?= textproc/hs-xmlhtml
+xmobar_port?= x11/hs-xmobar # executable
+xmonad_port?= x11-wm/hs-xmonad # executable
+xmonad-contrib_port?= x11-wm/hs-xmonad-contrib
+xss-sanitize_port?= www/hs-xss-sanitize
+yaml_port?= textproc/hs-yaml # executable
+yesod_port?= www/hs-yesod
+yesod-auth_port?= www/hs-yesod-auth
+yesod-auth-hashdb_port?= www/hs-yesod-auth-hashdb
+yesod-bin_port?= www/hs-yesod-bin # executable
+yesod-core_port?= www/hs-yesod-core
+yesod-form_port?= www/hs-yesod-form
+yesod-persistent_port?= www/hs-yesod-persistent
+yesod-static_port?= www/hs-yesod-static
+yesod-test_port?= www/hs-yesod-test
+zip-archive_port?= archivers/hs-zip-archive
+zlib_port?= archivers/hs-zlib
+zlib-bindings_port?= archivers/hs-zlib-bindings
+zlib-enum_port?= archivers/hs-zlib-enum
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 04c2eab3129c..53d94da1c513 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,8 +1,9 @@
-SHA256 (ghc-7.10.2-src.tar.xz) = 54cd73755b784d78e2f13d5eb161bfa38d3efee9e8a56f7eb6cd9f2d6e2615f5
-SIZE (ghc-7.10.2-src.tar.xz) = 11113204
-SHA256 (hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0
-SIZE (hscolour-1.23.tar.gz) = 26027
+TIMESTAMP = 1499672924
+SHA256 (ghc-8.0.2-src.tar.xz) = 11625453e1d0686b3fa6739988f70ecac836cadc30b9f0c8b49ef9091d6118b1
+SIZE (ghc-8.0.2-src.tar.xz) = 10687760
SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a
SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716
SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8
SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224
+SHA256 (hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8
+SIZE (hscolour-1.24.1.tar.gz) = 28717
diff --git a/lang/ghc/files/build.boot.mk.in b/lang/ghc/files/build.boot.mk.in
new file mode 100644
index 000000000000..557732a69a03
--- /dev/null
+++ b/lang/ghc/files/build.boot.mk.in
@@ -0,0 +1,8 @@
+GhcLibWays = v
+XMLDocWays =
+HADDOCK_DOCS =
+HSCOLOUR_SRCS =
+INTEGER_LIBRARY = integer-simple
+DYNAMIC_GHC_PROGRAMS =
+BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot
+BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar
diff --git a/lang/ghc/files/build.mk.in b/lang/ghc/files/build.mk.in
new file mode 100644
index 000000000000..8bbbb04ae120
--- /dev/null
+++ b/lang/ghc/files/build.mk.in
@@ -0,0 +1,19 @@
+docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+mandir = %%PREFIX%%/man
+infodir = %%PREFIX%%/info
+GhcLibWays = v
+%%WITH_PROFILE%%GhcLibWays += p
+%%WITH_DYNAMIC%%GhcLibWays += dyn
+DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%YES
+HADDOCK_DOCS = %%WITH_DOCS%%
+HSCOLOUR_SRCS = %%WITH_DOCS%%
+BSD_PATH_TO_HSC2HS = %%HSC2HS%%
+SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
+SRC_CC_OPTS += %%CFLAGS%%
+EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib
+EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib
+libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%%
+V = 0
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
deleted file mode 100644
index 550ec1adc5ef..000000000000
--- a/lang/ghc/files/patch-aclocal.m4
+++ /dev/null
@@ -1,39 +0,0 @@
---- aclocal.m4.orig 2015-07-21 13:52:50 UTC
-+++ aclocal.m4
-@@ -1718,36 +1718,6 @@ int main(int argc, char *argv[])
- }
- alarm(1);
-
-- if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &ev, &timer) != 0) {
-- fprintf(stderr,"No CLOCK_PROCESS_CPUTIME_ID timer\n");
-- exit(1);
-- }
--
-- it.it_value.tv_sec = 0;
-- it.it_value.tv_nsec = 1;
-- it.it_interval = it.it_value;
-- if (timer_settime(timer, 0, &it, NULL) != 0) {
-- fprintf(stderr,"settime problem\n");
-- exit(4);
-- }
--
-- tock = 0;
--
-- for(n = 3; n < 20000; n++){
-- for(m = 2; m <= n/2; m++){
-- if (!(n%m)) count++;
-- if (tock) goto out;
-- }
-- }
--out:
--
-- if (!tock) {
-- fprintf(stderr,"no CLOCK_PROCESS_CPUTIME_ID signal\n");
-- exit(5);
-- }
--
-- timer_delete(timer);
--
- if (timer_create(CLOCK_REALTIME, &ev, &timer) != 0) {
- fprintf(stderr,"No CLOCK_REALTIME timer\n");
- exit(2);
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index ddffa1650ae5..8906fbb875dd 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2015-07-21 19:50:11 UTC
+--- configure.ac.orig 2017-01-04 14:17:17 UTC
+++ configure.ac
-@@ -383,6 +383,9 @@ AC_SUBST([SplitObjsBroken])
+@@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken])
dnl ** Building a cross compiler?
dnl --------------------------------------------------------------
CrossCompiling=NO
@@ -8,5 +8,17 @@
+build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`
+
# If 'host' and 'target' differ, then this means we are building a cross-compiler.
- if test "$target" != "$host" ; then
+ if test "$TargetPlatform" != "$HostPlatform" ; then
CrossCompiling=YES
+@@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
+ use_large_address_space=yes
+ elif test "$ghc_host_os" = "openbsd" ; then
+ # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE.
++ # The flag MAP_NORESERVE is supported for source compatibility reasons,
++ # but is completely ignored by OS mmap
++ use_large_address_space=no
++ elif test "$ghc_host_os" = "freebsd" ; then
++ # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250.
+ # The flag MAP_NORESERVE is supported for source compatibility reasons,
+ # but is completely ignored by OS mmap
+ use_large_address_space=no
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 5467a7ae909b..8ffda7a16712 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,6 +1,6 @@
---- ./ghc.mk.orig 2014-07-10 06:27:16.000000000 +0200
-+++ ./ghc.mk 2014-07-11 10:28:11.000000000 +0200
-@@ -96,6 +96,7 @@
+--- ghc.mk.orig 2017-01-03 15:59:18 UTC
++++ ghc.mk
+@@ -96,6 +96,7 @@ endif
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
else ifeq "$(MAKE_RESTARTS)" "1"
@@ -8,3 +8,14 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
endif
+@@ -465,10 +466,7 @@ PACKAGES_STAGE1 += ghc-boot
+ PACKAGES_STAGE1 += template-haskell
+ PACKAGES_STAGE1 += hoopl
+ PACKAGES_STAGE1 += transformers
+-
+-ifeq "$(HADDOCK_DOCS)" "YES"
+ PACKAGES_STAGE1 += xhtml
+-endif
+
+ ifeq "$(Windows_Target)" "NO"
+ ifneq "$(TargetOS_CPP)" "ios"
diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
index 53cf700d7ccc..c7ddc4addf4f 100644
--- a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
+++ b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
@@ -1,6 +1,6 @@
---- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2015-04-01 00:24:45 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2017-01-03 15:59:20 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -875,7 +875,7 @@ getRPaths lbi clbi | supportRPaths hostO
+@@ -996,7 +996,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do
supportRPaths Linux   = True
supportRPaths Windows = False
supportRPaths OSX   = True
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index 7a4425743eaa..daf5ea981ba1 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -1,27 +1,38 @@
---- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2015-06-19 10:36:50 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-01-03 15:59:20 UTC
+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-@@ -261,10 +261,13 @@ alexProgram = (simpleProgram "alex") {
+@@ -54,6 +54,8 @@ import Distribution.Compat.Exception
+ import Distribution.Verbosity
+ import Distribution.Version
+
++import System.FilePath (takeDirectory)
++
+ import Data.Char
+ ( isDigit )
+ import qualified Data.Map as Map
+@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") {
+
gccProgram :: Program
gccProgram = (simpleProgram "gcc") {
- programFindVersion = findProgramVersion "-dumpversion" id
-+ , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
- }
+- programFindVersion = findProgramVersion "-dumpversion" id
+- }
++ programFindLocation = \v p -> findProgramOnSearchPath v p "cc"
++}
arProgram :: Program
-arProgram = simpleProgram "ar"
+arProgram = (simpleProgram "ar") {
-+ programFindLocation = \_v _p -> return (Just "%%AR%%")
-+ }
++ programFindLocation = \v p -> findProgramOnSearchPath v p "ar"
++}
stripProgram :: Program
stripProgram = (simpleProgram "strip") {
-@@ -336,7 +339,9 @@ greencardProgram :: Program
+@@ -311,7 +315,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
-ldProgram = simpleProgram "ld"
+ldProgram = (simpleProgram "ld") {
-+ programFindLocation = \_v _p -> return (Just "%%LD%%")
++ programFindLocation = \v p -> findProgramOnSearchPath v p "ld"
+ }
tarProgram :: Program
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index bddc4c6a5ce7..5f7bb8be6046 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -3,14 +3,15 @@ bin/ghci
bin/ghc-pkg
bin/runhaskell
bin/runghc
+%%DOCS%%bin/haddock
bin/hp2ps
bin/hpc
bin/hsc2hs
bin/ghc-%%GHC_VERSION%%
bin/ghci-%%GHC_VERSION%%
bin/ghc-pkg-%%GHC_VERSION%%
-bin/haddock-ghc-%%GHC_VERSION%%
+%%DOCS%%bin/haddock-ghc-%%GHC_VERSION%%
bin/runghc-%%GHC_VERSION%%
-%%PORTDOCS%%man/man1/ghc.1.gz
-@exec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true
-@unexec /bin/rm -f %D/bin/haddock || return true
+%%DOCS%%man/man1/ghc.1.gz
+%%DOCS%%@postexec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true
+%%DOCS%%@postunexec /bin/rm -f %D/bin/haddock || return true
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index e8dbdfdeb560..5605e5237b7e 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= brainfuck
-PORTVERSION= 0.1.0.2
+PORTVERSION= 0.1.0.3
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-brainfuck/distinfo b/lang/hs-brainfuck/distinfo
index 91ac64bdf787..fe86e7fb843f 100644
--- a/lang/hs-brainfuck/distinfo
+++ b/lang/hs-brainfuck/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/brainfuck-0.1.0.2.tar.gz) = e9ff5626ceaca4913506a6b854f7d1375a5642e0fd33984d3fc30a58e906b7a3
-SIZE (cabal/brainfuck-0.1.0.2.tar.gz) = 11886
+TIMESTAMP = 1499450677
+SHA256 (cabal/brainfuck-0.1.0.3.tar.gz) = 0db5370311ec8a3a1673fd04e502fd10e0afa0df5ee25d3a917937d3d9668bf6
+SIZE (cabal/brainfuck-0.1.0.3.tar.gz) = 11872
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index fc58a536e33f..0d448a0366d6 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unlambda
-PORTVERSION= 0.1.4.1
+PORTVERSION= 0.1.4.2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/distinfo b/lang/hs-unlambda/distinfo
index 9d453c85d06b..6356afba67bb 100644
--- a/lang/hs-unlambda/distinfo
+++ b/lang/hs-unlambda/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unlambda-0.1.4.1.tar.gz) = 07a5525d1333264e6909732d3c0872a9b2b6d7612f61d387448c3f400a656007
-SIZE (cabal/unlambda-0.1.4.1.tar.gz) = 9631
+TIMESTAMP = 1499450617
+SHA256 (cabal/unlambda-0.1.4.2.tar.gz) = 523f0ea20464fc6fc055526c3fe6f9de03826ae89fb96a8fa68bd56cddfcfeaa
+SIZE (cabal/unlambda-0.1.4.2.tar.gz) = 9622
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index ebdd78b1d07b..8d7102ea1653 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 2.1.3
+PORTVERSION= 2.3
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index efb687c5f810..e70f72ac996a 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/email-validate-2.1.3.tar.gz) = 5b967999717a8216639b39de1583a87e8c8ec471c416386229215c233d2c81cb
-SIZE (cabal/email-validate-2.1.3.tar.gz) = 7784
+TIMESTAMP = 1499623071
+SHA256 (cabal/email-validate-2.3.tar.gz) = c149b4a2d4d91c5263f9883944498446ac41258347bdf29908240fa536d6a6fe
+SIZE (cabal/email-validate-2.3.tar.gz) = 9648
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 8764d803bf08..bbbb5881bc17 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mime-mail
-PORTVERSION= 0.4.9
+PORTVERSION= 0.4.13.1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo
index 9da4480908c9..fab5f3109438 100644
--- a/mail/hs-mime-mail/distinfo
+++ b/mail/hs-mime-mail/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mime-mail-0.4.9.tar.gz) = 641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0
-SIZE (cabal/mime-mail-0.4.9.tar.gz) = 7815
+TIMESTAMP = 1499623071
+SHA256 (cabal/mime-mail-0.4.13.1.tar.gz) = 9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917
+SIZE (cabal/mime-mail-0.4.13.1.tar.gz) = 9538
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 1d123a3b687b..10b4d81ba1b7 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mime-types
-PORTVERSION= 0.1.0.6
+PORTVERSION= 0.1.0.7
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
index 01853128b38a..68db9e141379 100644
--- a/mail/hs-mime-types/distinfo
+++ b/mail/hs-mime-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mime-types-0.1.0.6.tar.gz) = fc8a933f75970dc90d4623f834f35d028a994178481b66ab1a4420916e1b1f24
-SIZE (cabal/mime-types-0.1.0.6.tar.gz) = 11135
+TIMESTAMP = 1499623072
+SHA256 (cabal/mime-types-0.1.0.7.tar.gz) = 83164a24963a7ef37543349df095155b30116c208e602a159a5cd3722f66e9b9
+SIZE (cabal/mime-types-0.1.0.7.tar.gz) = 11363
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index 82bba770fe2f..1bf11e8916e0 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mime
PORTVERSION= 0.4.0.2
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime/distinfo b/mail/hs-mime/distinfo
index d9c37ba206ae..2c0e27b2284e 100644
--- a/mail/hs-mime/distinfo
+++ b/mail/hs-mime/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623071
SHA256 (cabal/mime-0.4.0.2.tar.gz) = e7fa283e5caa6371d5b3978e152412a2dd2489eec43aee722caca9dc14ea3875
SIZE (cabal/mime-0.4.0.2.tar.gz) = 9438
diff --git a/math/Makefile b/math/Makefile
index 931b5268a1a8..daf7140b9145 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -218,7 +218,10 @@
SUBDIR += hs-data-lens-template
SUBDIR += hs-distributive
SUBDIR += hs-erf
+ SUBDIR += hs-fixed
+ SUBDIR += hs-half
SUBDIR += hs-ieee754
+ SUBDIR += hs-integer-logarithms
SUBDIR += hs-kan-extensions
SUBDIR += hs-math-functions
SUBDIR += hs-mwc-random
diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile
index 5dc454168d49..2a2923c4d023 100644
--- a/math/hs-Agda-stdlib/Makefile
+++ b/math/hs-Agda-stdlib/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Agda-stdlib
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.13
DISTVERSIONPREFIX= v
CATEGORIES= math haskell
diff --git a/math/hs-Agda-stdlib/distinfo b/math/hs-Agda-stdlib/distinfo
index 7fbcd93815be..6389d83a9e26 100644
--- a/math/hs-Agda-stdlib/distinfo
+++ b/math/hs-Agda-stdlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/agda-agda-stdlib-v0.9_GH0.tar.gz) = 923b487876235863e4f778aa40c508984b26636d50d531f0f31ca9dc45ab3717
-SIZE (cabal/agda-agda-stdlib-v0.9_GH0.tar.gz) = 248895
+TIMESTAMP = 1499623372
+SHA256 (cabal/agda-agda-stdlib-v0.13_GH0.tar.gz) = e7cffc2b8b168c3584b6d1e760d2b49850835444e4777caa69eb29b3677ef8bb
+SIZE (cabal/agda-agda-stdlib-v0.13_GH0.tar.gz) = 264701
diff --git a/math/hs-Agda-stdlib/files/patch-lib.cabal b/math/hs-Agda-stdlib/files/patch-lib.cabal
deleted file mode 100644
index b2ee3bb15f56..000000000000
--- a/math/hs-Agda-stdlib/files/patch-lib.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib.cabal.orig 2014-11-14 23:18:11 UTC
-+++ lib.cabal
-@@ -7,12 +7,12 @@ description: Helper programs.
- executable GenerateEverything
- hs-source-dirs: .
- main-is: GenerateEverything.hs
-- build-depends: base >= 4.2 && < 4.8,
-+ build-depends: base >= 4.2 && < 4.9,
- filemanip == 0.3.*,
-- filepath >= 1.1 && < 1.4
-+ filepath >= 1.1 && < 1.5
-
- executable AllNonAsciiChars
- hs-source-dirs: .
- main-is: AllNonAsciiChars.hs
-- build-depends: base >= 4.2 && < 4.8,
-+ build-depends: base >= 4.2 && < 4.9,
- filemanip == 0.3.*
diff --git a/math/hs-Agda-stdlib/files/patch-src_Size.agda b/math/hs-Agda-stdlib/files/patch-src_Size.agda
deleted file mode 100644
index 7b141b5a8577..000000000000
--- a/math/hs-Agda-stdlib/files/patch-src_Size.agda
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Size.agda.orig 2014-11-14 23:18:11 UTC
-+++ src/Size.agda
-@@ -6,13 +6,8 @@
-
- module Size where
-
--postulate
-- Size : Set
-- Size<_ : Size → Set
-- ↑_ : Size → Size
-- ∞ : Size
--
--{-# BUILTIN SIZE Size #-}
--{-# BUILTIN SIZELT Size<_ #-}
--{-# BUILTIN SIZESUC ↑_ #-}
--{-# BUILTIN SIZEINF ∞ #-}
-+{-# BUILTIN SIZEUNIV SizeUniv #-} -- sort SizeUniv
-+{-# BUILTIN SIZE Size #-} -- Size : SizeUniv
-+{-# BUILTIN SIZELT Size<_ #-} -- Size<_ : Size → SizeUniv
-+{-# BUILTIN SIZESUC ↑_ #-} -- ↑_ : Size → Size
-+{-# BUILTIN SIZEINF ∞ #-} -- ∞ : Size
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index c6ac1f1ad953..7568b0e790a6 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,36 +2,28 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.4.2.3
+PORTVERSION= 2.5.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
-USE_CABAL= base-orphans>=0.3.1 boxes>=0.1.3 cpphs data-hash>=0.2.0.0 \
- edit-distance>=0.2.1.2 equivalence>=0.2.5 \
- geniplate-mirror>=0.6.0.6 hashable>=1.1.2.3 hashtables>=1.0 \
- haskell-src-exts>=1.16.0.1 mtl>=2.1.1 parallel QuickCheck>=2.8 \
- strict>=0.3.2 text>=0.11 transformers-compat>=0.3.3.2 \
- unordered-containers>=0.2 zlib>=0.4.0.1
+USE_CABAL= EdisonCore boxes data-hash edit-distance equivalence \
+ geniplate-mirror gitrev hashable hashtables ieee754 \
+ monadplus mtl murmur-hash parallel regex-tdfa strict \
+ text unordered-containers zlib
USE_ALEX= yes
USE_HAPPY= yes
+USE_CPPHS= yes
USES= iconv:translit
EXECUTABLE= agda-mode agda
-_PRIMITIVE= Primitive.agdai
-
-INSTALL_PORTDATA= ${INSTALL_DATA} \
- ${DISTDIR}/${DIST_SUBDIR}/${_PRIMITIVE}.${PORTVERSION} \
- ${STAGEDIR}${DATADIR}/lib/prim/Agda/${_PRIMITIVE}
-
FLAGS_ENABLE= cpphs
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-
-MASTER_SITES+= LOCAL/pgj:primitive
-DISTFILES+= ${_PRIMITIVE}.${PORTVERSION}:primitive
+SUB_FILES= pkg-install pkg-deinstall
+SUB_LIST= DATADIR=${DATADIR}
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index 35fced2f5b13..5d6083b21fd5 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,4 +1,3 @@
-SHA256 (cabal/Agda-2.4.2.3.tar.gz) = bc6def45e32498f51863d67acfbe048c039d630c6a36761ed27e99a5f68d7b27
-SIZE (cabal/Agda-2.4.2.3.tar.gz) = 990268
-SHA256 (cabal/Primitive.agdai.2.4.2.3) = a5b2353a50256f24c87f20b7892faabc99b9bad8f9b5cc68c24343707c1accf8
-SIZE (cabal/Primitive.agdai.2.4.2.3) = 2627
+TIMESTAMP = 1500999185
+SHA256 (cabal/Agda-2.5.2.tar.gz) = d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439
+SIZE (cabal/Agda-2.5.2.tar.gz) = 1240885
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index f6be142036d6..a7e0d60526de 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,17 +1,11 @@
---- Agda.cabal.orig 2015-05-25 16:22:38 UTC
+--- Agda.cabal.orig 2016-12-22 12:18:52 UTC
+++ Agda.cabal
-@@ -85,12 +85,12 @@ library
- -- even though it builds with older GHCs.
- , bytestring >= 0.9.2.1 && < 0.11
- , containers >= 0.4.2.1 && < 0.6
-- , data-hash == 0.2.0.0
-+ , data-hash == 0.2.0.*
- , deepseq >= 1.3.0.0 && < 1.5
- , edit-distance >= 0.2.1.2 && < 0.3
- , equivalence >= 0.2.5 && < 0.4
- , filepath >= 1.3.0.0 && < 1.5
-- , geniplate-mirror >= 0.6.0.6 && < 0.7
-+ , geniplate-mirror >= 0.6.0.6 && < 0.8
- -- hashable 1.2.0.10 makes library-test 10x slower. The issue was
- -- fixed in hashable 1.2.1.0.
- -- https://github.com/tibbe/hashable/issues/57.
+@@ -160,7 +160,7 @@ library
+ -- some cases.
+ , hashtables >= 1.0.1.8 && < 1.2 || >= 1.2.0.2 && < 1.3
+ , haskeline >= 0.7.1.3 && < 0.8
+- , ieee754 >= 0.7.8 && < 0.8
++ , ieee754 >= 0.7.8 && < 0.9
+ , monadplus >= 1.4 && < 1.5
+ -- mtl-2.1 contains a severe bug.
+ --
diff --git a/math/hs-Agda/files/pkg-deinstall.in b/math/hs-Agda/files/pkg-deinstall.in
new file mode 100644
index 000000000000..2b2d2656ddf5
--- /dev/null
+++ b/math/hs-Agda/files/pkg-deinstall.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PKG_DATADIR=%%DATADIR%%
+
+if [ "$2" = "POST-DEINSTALL" ]; then
+ for ai in $(find ${PKG_DATADIR}/lib/prim/Agda -name '*.agdai'); do
+ rm $ai
+ done
+fi
diff --git a/math/hs-Agda/files/pkg-install.in b/math/hs-Agda/files/pkg-install.in
new file mode 100644
index 000000000000..7e5bff441da7
--- /dev/null
+++ b/math/hs-Agda/files/pkg-install.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PKG_DATADIR=%%DATADIR%%
+
+if [ "$2" = "POST-INSTALL" ]; then
+ for a in $(find ${PKG_DATADIR}/lib/prim/Agda -name '*.agda'); do
+ ${PKG_PREFIX}/bin/agda $a
+ done
+fi
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index dc82288b2042..69b4f66a57ab 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,6 +2,7 @@
PORTNAME= NumInstances
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-NumInstances/distinfo b/math/hs-NumInstances/distinfo
index 95affd463640..161cbb5a61ae 100644
--- a/math/hs-NumInstances/distinfo
+++ b/math/hs-NumInstances/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623372
SHA256 (cabal/NumInstances-1.4.tar.gz) = cbdb2a49346f59ceb5ab38592d7bc52e5205580d431d0ac6d852fd9880e59679
SIZE (cabal/NumInstances-1.4.tar.gz) = 4749
diff --git a/math/hs-adjunctions/Makefile b/math/hs-adjunctions/Makefile
index 571e5ddcfa97..a78640a8ca00 100644
--- a/math/hs-adjunctions/Makefile
+++ b/math/hs-adjunctions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= adjunctions
-PORTVERSION= 4.2.1
+PORTVERSION= 4.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-adjunctions/distinfo b/math/hs-adjunctions/distinfo
index 1f9a02439161..2b0978e81400 100644
--- a/math/hs-adjunctions/distinfo
+++ b/math/hs-adjunctions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/adjunctions-4.2.1.tar.gz) = 65a64cd42dcf356c2b44fffc4360f8cbf494702f7574b5a1e57e1864b0f8f46f
-SIZE (cabal/adjunctions-4.2.1.tar.gz) = 14314
+TIMESTAMP = 1499623373
+SHA256 (cabal/adjunctions-4.3.tar.gz) = b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc
+SIZE (cabal/adjunctions-4.3.tar.gz) = 15651
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 5e4a770cd8e5..40e8b9936330 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -2,6 +2,7 @@
PORTNAME= categories
PORTVERSION= 1.0.7
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 1751ffd3f5b9..59c7a9aec241 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623373
SHA256 (cabal/categories-1.0.7.tar.gz) = c29dcec070073f3fdb13f0265e2efc4f2f88522292189690351a70f24cd830a2
SIZE (cabal/categories-1.0.7.tar.gz) = 9211
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 5c5c2df980d3..1d112dcc83d7 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 4.2.7.2
+PORTVERSION= 5.0.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index bba10c9a1da4..19dd26099e89 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/comonad-4.2.7.2.tar.gz) = b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b
-SIZE (cabal/comonad-4.2.7.2.tar.gz) = 16430
+TIMESTAMP = 1499543660
+SHA256 (cabal/comonad-5.0.1.tar.gz) = 561ffd697d9d38467d0d426947e0bade25a05e3c507235eca29ec800ad3f463d
+SIZE (cabal/comonad-5.0.1.tar.gz) = 18218
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 9ab88f103961..f0435f253c13 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= contravariant
-PORTVERSION= 1.3.2
+PORTVERSION= 1.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT= Contravariant functors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.15.2 StateVar>=1.1 tagged>=0.4.4 \
- transformers-compat>=0.3 void>=0.6
+USE_CABAL= semigroups StateVar transformers-compat void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index 49fac5f0ec0a..b3abd5062bc1 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/contravariant-1.3.2.tar.gz) = 52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639
-SIZE (cabal/contravariant-1.3.2.tar.gz) = 9442
+TIMESTAMP = 1499537771
+SHA256 (cabal/contravariant-1.4.tar.gz) = e1666df1373ed784baa7d1e8e963bbc2d1f3c391578ac550ae74e7399173ee84
+SIZE (cabal/contravariant-1.4.tar.gz) = 11652
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index c959706bc629..1e82d9e83534 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= data-lens-template
-PORTVERSION= 2.1.9
+PORTVERSION= 2.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/distinfo b/math/hs-data-lens-template/distinfo
index eb198e83c509..67e1b998e603 100644
--- a/math/hs-data-lens-template/distinfo
+++ b/math/hs-data-lens-template/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-lens-template-2.1.9.tar.gz) = cf94f5d81569ad8f0ce4194649f5920226adf990d4012728958516d9821af236
-SIZE (cabal/data-lens-template-2.1.9.tar.gz) = 3341
+TIMESTAMP = 1499623374
+SHA256 (cabal/data-lens-template-2.2.tar.gz) = f50b0f5364c5d8a11278722ccb2faf2b7c4451001b34b4f55150599484182af0
+SIZE (cabal/data-lens-template-2.2.tar.gz) = 3339
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index ba6d40b9b429..74c7ec71f694 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= data-lens
-PORTVERSION= 2.10.7
+PORTVERSION= 2.11.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Used to be Haskell 98 Lenses
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4.0 semigroupoids>=4.0
+USE_CABAL= comonad semigroupoids
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-data-lens/distinfo b/math/hs-data-lens/distinfo
index 9f662c9fca29..0d95442ea5f2 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-lens-2.10.7.tar.gz) = 3b198a84158d757d074b6cf71fe16c8ad900e24991d9813d0b6361a1fd97e050
-SIZE (cabal/data-lens-2.10.7.tar.gz) = 6078
+TIMESTAMP = 1499623374
+SHA256 (cabal/data-lens-2.11.1.tar.gz) = fbbe0bb7d754fa9bced7c89a0629146618ab204cbe7a7ea26b1fa9746ac73c32
+SIZE (cabal/data-lens-2.11.1.tar.gz) = 6208
diff --git a/math/hs-data-lens/files/patch-data-lens.cabal b/math/hs-data-lens/files/patch-data-lens.cabal
new file mode 100644
index 000000000000..77e39858d90c
--- /dev/null
+++ b/math/hs-data-lens/files/patch-data-lens.cabal
@@ -0,0 +1,11 @@
+--- data-lens.cabal.orig 2017-07-10 16:11:36 UTC
++++ data-lens.cabal
+@@ -23,7 +23,7 @@ library
+ base >= 4 && < 5,
+ comonad >= 4.0 && < 5.1,
+ containers >= 0.3 && < 0.6,
+- semigroupoids >= 4.0 && < 5.2,
++ semigroupoids >= 4.0 && < 5.3,
+ transformers >= 0.4 && < 0.6
+
+ extensions: CPP
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 50fbd2215376..70d19b7ff6a9 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.4.4
-PORTREVISION= 2
+PORTVERSION= 0.5.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Distributive functors -- Dual to Traversable
LICENSE= BSD3CLAUSE
-USE_CABAL= tagged>=0.7 transformers-compat>=0.3
+USE_CABAL= base-orphans>=0.5 tagged>=0.7 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index 78fbbd2194ba..91eba5cc0bbd 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/distributive-0.4.4.tar.gz) = 82d1f53495fe9c25e4e974825666b4a6232af7452784e145cc04aeb365b25468
-SIZE (cabal/distributive-0.4.4.tar.gz) = 6686
+TIMESTAMP = 1499537738
+SHA256 (cabal/distributive-0.5.2.tar.gz) = ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9
+SIZE (cabal/distributive-0.5.2.tar.gz) = 11824
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 5bf4b52002a3..9700eaa8082d 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-erf/distinfo b/math/hs-erf/distinfo
index a88885b0142f..0606c455890c 100644
--- a/math/hs-erf/distinfo
+++ b/math/hs-erf/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623375
SHA256 (cabal/erf-2.0.0.0.tar.gz) = 24f0b79c7e1d25cb2cd44c2258d7a464bf6db8079775b50b60b54a254616b337
SIZE (cabal/erf-2.0.0.0.tar.gz) = 1918
diff --git a/math/hs-fixed/Makefile b/math/hs-fixed/Makefile
new file mode 100644
index 000000000000..fad801826842
--- /dev/null
+++ b/math/hs-fixed/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= fixed
+PORTVERSION= 0.2.1.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Signed 15.16 precision fixed point arithmetic
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-fixed/distinfo b/math/hs-fixed/distinfo
new file mode 100644
index 000000000000..7f714cc8436b
--- /dev/null
+++ b/math/hs-fixed/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499459722
+SHA256 (cabal/fixed-0.2.1.1.tar.gz) = 24a9e1e251998c9d06037bb771d9eab2980a91132de59a19d0166a1c51e715e2
+SIZE (cabal/fixed-0.2.1.1.tar.gz) = 4346
diff --git a/math/hs-fixed/pkg-descr b/math/hs-fixed/pkg-descr
new file mode 100644
index 000000000000..0550114c68d2
--- /dev/null
+++ b/math/hs-fixed/pkg-descr
@@ -0,0 +1,3 @@
+Signed 15.16 precision fixed point arithmetic
+
+WWW: https://hackage.haskell.org/package/fixed
diff --git a/math/hs-half/Makefile b/math/hs-half/Makefile
new file mode 100644
index 000000000000..631df3c399bb
--- /dev/null
+++ b/math/hs-half/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= half
+PORTVERSION= 0.2.2.3
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Half-precision floating-point
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-half/distinfo b/math/hs-half/distinfo
new file mode 100644
index 000000000000..fd10684b386f
--- /dev/null
+++ b/math/hs-half/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499451861
+SHA256 (cabal/half-0.2.2.3.tar.gz) = 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
+SIZE (cabal/half-0.2.2.3.tar.gz) = 6050
diff --git a/math/hs-half/pkg-descr b/math/hs-half/pkg-descr
new file mode 100644
index 000000000000..7931199f2694
--- /dev/null
+++ b/math/hs-half/pkg-descr
@@ -0,0 +1,3 @@
+Half-precision floating-point
+
+WWW: https://hackage.haskell.org/package/half
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 3b3b7e2a489f..062c92d94a9b 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ieee754
-PORTVERSION= 0.7.6
+PORTVERSION= 0.8.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/distinfo b/math/hs-ieee754/distinfo
index 28edfb045b49..f4ad1b92f7e9 100644
--- a/math/hs-ieee754/distinfo
+++ b/math/hs-ieee754/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ieee754-0.7.6.tar.gz) = 5840644e8adbb243adc63d112c8bec3c3996af21a6c1262ce30c1e2b1034450f
-SIZE (cabal/ieee754-0.7.6.tar.gz) = 16787
+TIMESTAMP = 1499623375
+SHA256 (cabal/ieee754-0.8.0.tar.gz) = 0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1
+SIZE (cabal/ieee754-0.8.0.tar.gz) = 17564
diff --git a/math/hs-integer-logarithms/Makefile b/math/hs-integer-logarithms/Makefile
new file mode 100644
index 000000000000..f37b53c1e076
--- /dev/null
+++ b/math/hs-integer-logarithms/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= integer-logarithms
+PORTVERSION= 1.0.2
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The integer-logarithms package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-integer-logarithms/distinfo b/math/hs-integer-logarithms/distinfo
new file mode 100644
index 000000000000..7c4820709e72
--- /dev/null
+++ b/math/hs-integer-logarithms/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499448646
+SHA256 (cabal/integer-logarithms-1.0.2.tar.gz) = 31069ccbff489baf6c4a93cb7475640aabea9366eb0b583236f10714a682b570
+SIZE (cabal/integer-logarithms-1.0.2.tar.gz) = 8854
diff --git a/math/hs-integer-logarithms/pkg-descr b/math/hs-integer-logarithms/pkg-descr
new file mode 100644
index 000000000000..221590c22f3f
--- /dev/null
+++ b/math/hs-integer-logarithms/pkg-descr
@@ -0,0 +1,7 @@
+Math.NumberTheory.Logarithms and Math.NumberTheory.Powers.Integer from the
+arithmoi package.
+
+Also provides GHC.Integer.Logarithms.Compat and Math.NumberTheory.Power.Natural
+modules, as well as some additional functions in migrated modules.
+
+WWW: https://hackage.haskell.org/package/integer-logarithms
diff --git a/math/hs-kan-extensions/Makefile b/math/hs-kan-extensions/Makefile
index 796ea110e6bb..50e58d48039a 100644
--- a/math/hs-kan-extensions/Makefile
+++ b/math/hs-kan-extensions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= kan-extensions
-PORTVERSION= 4.2.2
+PORTVERSION= 5.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,8 @@ COMMENT= Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)d
LICENSE= BSD3CLAUSE
-USE_CABAL= adjunctions>=4.2 comonad>=4 contravariant>=1 \
- distributive>=0.2.2 free>=4 mtl>=2.0.1 semigroupoids>=4 \
- tagged>=0.7.2
+USE_CABAL= adjunctions comonad contravariant distributive free mtl \
+ semigroupoids tagged
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-kan-extensions/distinfo b/math/hs-kan-extensions/distinfo
index 57d214706e7b..d737ba37a20f 100644
--- a/math/hs-kan-extensions/distinfo
+++ b/math/hs-kan-extensions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/kan-extensions-4.2.2.tar.gz) = e51d6dd583045b22bcffe5d0054616f2da5880187e4d7261890d7d987fa61837
-SIZE (cabal/kan-extensions-4.2.2.tar.gz) = 19235
+TIMESTAMP = 1499623376
+SHA256 (cabal/kan-extensions-5.0.2.tar.gz) = 1c9ede8595424209944e59fd46c1d2edb654758be9a45c1c48a4d3cedf42482e
+SIZE (cabal/kan-extensions-5.0.2.tar.gz) = 19957
diff --git a/math/hs-kan-extensions/files/patch-kan-extensions.cabal b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
new file mode 100644
index 000000000000..2d2a1bee65f6
--- /dev/null
+++ b/math/hs-kan-extensions/files/patch-kan-extensions.cabal
@@ -0,0 +1,10 @@
+--- kan-extensions.cabal.orig 2017-07-09 21:09:48 UTC
++++ kan-extensions.cabal
+@@ -47,7 +47,6 @@ library
+ containers >= 0.4 && < 0.6,
+ contravariant >= 1 && < 2,
+ distributive >= 0.2.2 && < 1,
+- fail >= 4.9 && < 5,
+ free >= 4 && < 5,
+ mtl >= 2.0.1 && < 2.3,
+ semigroupoids >= 4 && < 6,
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 4363f1d60181..2cd2d0f0713d 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= math-functions
-PORTVERSION= 0.1.5.2
-PORTREVISION= 2
+PORTVERSION= 0.2.1.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Special functions and Chebyshev polynomials
LICENSE= BSD3CLAUSE
-USE_CABAL= erf>=2 vector>=0.7 vector-th-unbox
+USE_CABAL= 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 53429c2bf281..cc2656d82b44 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/math-functions-0.1.5.2.tar.gz) = 9ec9b809d33c3b4deebc07d8e776cb3f81866e99906ed84f9c4145fe8eb39f89
-SIZE (cabal/math-functions-0.1.5.2.tar.gz) = 28490
+TIMESTAMP = 1499614804
+SHA256 (cabal/math-functions-0.2.1.0.tar.gz) = f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb
+SIZE (cabal/math-functions-0.2.1.0.tar.gz) = 40272
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index 1795daee55d0..a7e58bd2dea4 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mwc-random
-PORTVERSION= 0.13.3.2
+PORTVERSION= 0.13.6.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Fast, high-quality pseudo random number generation
LICENSE= BSD3CLAUSE
-USE_CABAL= primitive vector>=0.7
+USE_CABAL= math-functions primitive vector>=0.7
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
diff --git a/math/hs-mwc-random/distinfo b/math/hs-mwc-random/distinfo
index 8bf42632b4b7..7aa59c649f31 100644
--- a/math/hs-mwc-random/distinfo
+++ b/math/hs-mwc-random/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mwc-random-0.13.3.2.tar.gz) = 2cb1e354ec8b31400d14716920f38eedd5161003249deedfd49cda290aae5806
-SIZE (cabal/mwc-random-0.13.3.2.tar.gz) = 22290
+TIMESTAMP = 1499623376
+SHA256 (cabal/mwc-random-0.13.6.0.tar.gz) = 065f334fc13c057eb03ef0b6aa3665ff193609d9bfcad8068bdd260801f44716
+SIZE (cabal/mwc-random-0.13.6.0.tar.gz) = 23256
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 8e048657d07e..bf2b1ce5ec8d 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 4.2.0.2
+PORTVERSION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Pointed and copointed data
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4.0 data-default-class>=0.0.1 hashable>=1.1 \
- kan-extensions>=4.2 semigroupoids>=4 semigroups>=0.8.3.1 \
- stm>=2.1.2.1 tagged>=0.5 unordered-containers>=0.2
+USE_CABAL= comonad data-default-class hashable \
+ kan-extensions semigroupoids semigroups \
+ stm tagged unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 218f9372204e..58d4c08e273e 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pointed-4.2.0.2.tar.gz) = 4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a
-SIZE (cabal/pointed-4.2.0.2.tar.gz) = 4333
+TIMESTAMP = 1499623377
+SHA256 (cabal/pointed-5.tar.gz) = 8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17
+SIZE (cabal/pointed-5.tar.gz) = 4873
diff --git a/math/hs-pointed/files/patch-git_55eab0 b/math/hs-pointed/files/patch-git_55eab0
new file mode 100644
index 000000000000..3db41e66d335
--- /dev/null
+++ b/math/hs-pointed/files/patch-git_55eab0
@@ -0,0 +1,22 @@
+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-probability/Makefile b/math/hs-probability/Makefile
index c72b5c1766df..a894952d4241 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= probability
-PORTVERSION= 0.2.4.1
-PORTREVISION= 2
+PORTVERSION= 0.2.5.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-probability/distinfo b/math/hs-probability/distinfo
index 7f8ddae0d826..448e24f4f12f 100644
--- a/math/hs-probability/distinfo
+++ b/math/hs-probability/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/probability-0.2.4.1.tar.gz) = 6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a
-SIZE (cabal/probability-0.2.4.1.tar.gz) = 27023
+TIMESTAMP = 1499450528
+SHA256 (cabal/probability-0.2.5.1.tar.gz) = d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d
+SIZE (cabal/probability-0.2.5.1.tar.gz) = 27278
diff --git a/math/hs-probability/files/patch-probability.cabal b/math/hs-probability/files/patch-probability.cabal
deleted file mode 100644
index 944d9266206c..000000000000
--- a/math/hs-probability/files/patch-probability.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- probability.cabal.orig 2014-05-29 07:12:14 UTC
-+++ probability.cabal
-@@ -37,7 +37,7 @@ Flag splitBase
- Library
- Build-Depends:
- utility-ht >=0.0.6 && <0.1,
-- transformers >=0.0.1 && <0.4
-+ transformers >=0.0.1 && <0.5
- If flag(splitBase)
- Build-Depends:
- containers >=0.1 && <0.6,
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index d8f91de460ba..d55dea729eab 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 5.0.0.3
+PORTVERSION= 5.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 411ca9725ae3..4b18a65474a7 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/semigroupoids-5.0.0.3.tar.gz) = 17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292
-SIZE (cabal/semigroupoids-5.0.0.3.tar.gz) = 20789
+TIMESTAMP = 1499609808
+SHA256 (cabal/semigroupoids-5.2.tar.gz) = d957f8804ca0dc2b85ef68edcab92dba9cd5d61ea0dddc41c173dda6f97791bc
+SIZE (cabal/semigroupoids-5.2.tar.gz) = 23371
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index b0a88a60baca..6fd52492ee55 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.16.2.2
+PORTVERSION= 0.18.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Anything that associates
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1 text>=0.10 unordered-containers>=0.2
+USE_CABAL= hashable>=1.1 text>=0.10 transformers-compat>=0.3 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index 87eede055a2c..0e75c0f6df0b 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/semigroups-0.16.2.2.tar.gz) = d17e3e42c8e2457286d5c583dad5d0df57678ce4dcf12acc8a7667e80bd8ed57
-SIZE (cabal/semigroups-0.16.2.2.tar.gz) = 15159
+TIMESTAMP = 1499594594
+SHA256 (cabal/semigroups-0.18.3.tar.gz) = 35297c986872406e2efe29620c623727369f8c578e2f9c22998d575996e5a9ca
+SIZE (cabal/semigroups-0.18.3.tar.gz) = 18629
diff --git a/math/hs-semigroups/files/patch-semigroups.cabal b/math/hs-semigroups/files/patch-semigroups.cabal
deleted file mode 100644
index 4c1bf04c9980..000000000000
--- a/math/hs-semigroups/files/patch-semigroups.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- semigroups.cabal.orig 2015-03-07 07:26:45 UTC
-+++ semigroups.cabal
-@@ -86,8 +86,7 @@ library
- Data.Semigroup.Generic
-
- build-depends:
-- base >= 2 && < 5,
-- nats >= 0.1 && < 2
-+ base >= 2 && < 5
-
- if impl(ghc >= 7.4 && < 7.5)
- build-depends: ghc-prim
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index d948006abd3c..662648f147f3 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.13.2.3
+PORTVERSION= 0.14.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,9 @@ COMMENT= Library of statistical types, data, and functions
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6.0.0 erf math-functions>=0.1.5.2 monad-par>=0.3.4 \
+USE_CABAL= aeson>=0.6.0.0 base-orphans erf math-functions>=0.1.5.2 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-algorithms>=0.4 vector-binary-instances>=0.2.1 vector-th-unbox
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 9f46f5e69df5..079fd9ed53b8 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/statistics-0.13.2.3.tar.gz) = d624b1494959d3c64cfd068c9566778a799d3e3f5d6b22ec3e353ba6d6876fbd
-SIZE (cabal/statistics-0.13.2.3.tar.gz) = 79522
+TIMESTAMP = 1499614825
+SHA256 (cabal/statistics-0.14.0.2.tar.gz) = 3495df2da42c9fcc5b594b97f16c02353bfd6616d6e134ac031dac389d7a4778
+SIZE (cabal/statistics-0.14.0.2.tar.gz) = 99683
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 980f77ebdb1f..ba3b85937005 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index 07fa71d62665..62ea2051598f 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-space-0.10.2.tar.gz) = 507dc397e48da9f889d06a314355a82aa31fb0dd785aad278dec1a2e8778e858
-SIZE (cabal/vector-space-0.10.2.tar.gz) = 14002
+TIMESTAMP = 1499623378
+SHA256 (cabal/vector-space-0.10.4.tar.gz) = b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2
+SIZE (cabal/vector-space-0.10.4.tar.gz) = 14249
diff --git a/net-im/hs-haskell-xmpp/Makefile b/net-im/hs-haskell-xmpp/Makefile
index afd534cb0357..31e6b10c399a 100644
--- a/net-im/hs-haskell-xmpp/Makefile
+++ b/net-im/hs-haskell-xmpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-xmpp
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net-p2p/hs-torrent/Makefile b/net-p2p/hs-torrent/Makefile
index 807bf9693114..f092382fc257 100644
--- a/net-p2p/hs-torrent/Makefile
+++ b/net-p2p/hs-torrent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= torrent
-PORTVERSION= 10000.0.0
+PORTVERSION= 10000.1.1
CATEGORIES= net-p2p haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net-p2p/hs-torrent/distinfo b/net-p2p/hs-torrent/distinfo
index 24faf2e0bf67..1df7c8635e82 100644
--- a/net-p2p/hs-torrent/distinfo
+++ b/net-p2p/hs-torrent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/torrent-10000.0.0.tar.gz) = 5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c
-SIZE (cabal/torrent-10000.0.0.tar.gz) = 3549
+TIMESTAMP = 1499623667
+SHA256 (cabal/torrent-10000.1.1.tar.gz) = 2009964210e229ee67254a73fead3413f60299415238887fa7ef30e40e06fa54
+SIZE (cabal/torrent-10000.1.1.tar.gz) = 3977
diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile
index 71f44d33fdf7..d21727a25590 100644
--- a/net/hs-aws/Makefile
+++ b/net/hs-aws/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws
-PORTVERSION= 0.12.1
+PORTVERSION= 0.16
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-aws/distinfo b/net/hs-aws/distinfo
index 92504fa4d92c..2edffbd8be7a 100644
--- a/net/hs-aws/distinfo
+++ b/net/hs-aws/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/aws-0.12.1.tar.gz) = 6c85bac359ea94d78f287b45c6e7e981dc260a1c029a7888ed752a1c0e64d32b
-SIZE (cabal/aws-0.12.1.tar.gz) = 90763
+TIMESTAMP = 1499623590
+SHA256 (cabal/aws-0.16.tar.gz) = 84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c
+SIZE (cabal/aws-0.16.tar.gz) = 99193
diff --git a/net/hs-aws/files/patch-aws.cabal b/net/hs-aws/files/patch-aws.cabal
new file mode 100644
index 000000000000..bbb71f8592a2
--- /dev/null
+++ b/net/hs-aws/files/patch-aws.cabal
@@ -0,0 +1,11 @@
+--- aws.cabal.orig 2017-07-10 15:40:11 UTC
++++ aws.cabal
+@@ -145,7 +145,7 @@ Library
+ unordered-containers >= 0.2,
+ utf8-string >= 0.3 && < 1.1,
+ vector >= 0.10,
+- xml-conduit >= 1.2 && <1.5
++ xml-conduit >= 1.2 && <1.6
+
+ if !impl(ghc >= 7.6)
+ Build-depends: ghc-prim
diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile
index 55510b972653..3854a4716627 100644
--- a/net/hs-connection/Makefile
+++ b/net/hs-connection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= connection
-PORTVERSION= 0.2.5
+PORTVERSION= 0.2.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-connection/distinfo b/net/hs-connection/distinfo
index 6c7a00b4df1d..473b603031b1 100644
--- a/net/hs-connection/distinfo
+++ b/net/hs-connection/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/connection-0.2.5.tar.gz) = 8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124
-SIZE (cabal/connection-0.2.5.tar.gz) = 7576
+TIMESTAMP = 1499623591
+SHA256 (cabal/connection-0.2.8.tar.gz) = 70b1f44e8786320c18b26fc5d4ec115fc8ac016ba1f852fa8137f55d785a93eb
+SIZE (cabal/connection-0.2.8.tar.gz) = 8695
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
index e53b7be2391a..fda329e516c8 100644
--- a/net/hs-gsasl/Makefile
+++ b/net/hs-gsasl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gsasl
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-gsasl/distinfo b/net/hs-gsasl/distinfo
index eed538cf5f9b..2fae5afbea2f 100644
--- a/net/hs-gsasl/distinfo
+++ b/net/hs-gsasl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623591
SHA256 (cabal/gsasl-0.3.6.tar.gz) = 786036025e5d5649c029c1db23c395e1592c073a58848ae4afe4f2797de1f931
SIZE (cabal/gsasl-0.3.6.tar.gz) = 20170
diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile
index b2106bf3be04..adfd9468b59f 100644
--- a/net/hs-hoauth2/Makefile
+++ b/net/hs-hoauth2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hoauth2
-PORTVERSION= 0.4.8
+PORTVERSION= 0.5.9
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT= Haskell OAuth2 authentication
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.7 http-conduit>=2.0 http-types>=0.8 text>=0.11
+USE_CABAL= aeson http-conduit http-types text unordered-containers \
+ wai warp
FLAGS_DISABLE= test
diff --git a/net/hs-hoauth2/distinfo b/net/hs-hoauth2/distinfo
index ca1820dacddf..0ce3cf5c1fed 100644
--- a/net/hs-hoauth2/distinfo
+++ b/net/hs-hoauth2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hoauth2-0.4.8.tar.gz) = 6e489820dee16b926225e58555032e32d345b234b5a798db6e5a1d63d2843093
-SIZE (cabal/hoauth2-0.4.8.tar.gz) = 8599
+TIMESTAMP = 1501281503
+SHA256 (cabal/hoauth2-0.5.9.tar.gz) = ffa512787b4ef5a32260aa8659260fdd7e0fcafae7c2482275dd85e7a202b25e
+SIZE (cabal/hoauth2-0.5.9.tar.gz) = 10864
diff --git a/net/hs-hoauth2/files/patch-hoauth2.cabal b/net/hs-hoauth2/files/patch-hoauth2.cabal
new file mode 100644
index 000000000000..1de01c4d4892
--- /dev/null
+++ b/net/hs-hoauth2/files/patch-hoauth2.cabal
@@ -0,0 +1,83 @@
+--- hoauth2.cabal.orig 2017-04-05 20:01:54 UTC
++++ hoauth2.cabal
+@@ -63,7 +63,7 @@ Library
+ bytestring >= 0.9 && < 0.11,
+ http-conduit >= 2.1 && < 2.3,
+ http-types >= 0.9 && < 0.10,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ unordered-containers >= 0.2.5
+
+
+@@ -87,7 +87,7 @@ Executable test-weibo
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -111,7 +111,7 @@ Executable test-google
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -135,7 +135,7 @@ Executable test-github
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -158,7 +158,7 @@ Executable test-douban
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -181,7 +181,7 @@ Executable test-facebook
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -207,7 +207,7 @@ Executable test-fitbit
+ wai >= 3.2 && < 3.3,
+ warp >= 3.2 && < 3.3,
+ containers >= 0.4 && < 0.6,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+
+@@ -231,7 +231,7 @@ Executable test-stackexchange
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
+@@ -254,7 +254,7 @@ Executable test-dropbox
+ http-conduit >= 2.1 && < 2.3,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.11 && < 1.2,
++ aeson >= 0.11 && < 1.3,
+ hoauth2
+
+ if impl(ghc >= 6.12.0)
diff --git a/net/hs-hoauth2/pkg-descr b/net/hs-hoauth2/pkg-descr
index 878298ecabfa..9bcdafb2f854 100644
--- a/net/hs-hoauth2/pkg-descr
+++ b/net/hs-hoauth2/pkg-descr
@@ -1,3 +1,3 @@
-Haskell OAuth2 authentication.
+Haskell OAuth2 authentication client.
WWW: https://github.com/freizl/hoauth2
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index 55bc6f9a60ac..68c33cd437e6 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hostname/distinfo b/net/hs-hostname/distinfo
index 02db0a5e66e6..c3614627da68 100644
--- a/net/hs-hostname/distinfo
+++ b/net/hs-hostname/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623591
SHA256 (cabal/hostname-1.0.tar.gz) = 9b43dab1b6da521f35685b20555da00738c8e136eb972458c786242406a9cf5c
SIZE (cabal/hostname-1.0.tar.gz) = 1982
diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile
index d276318be63b..91157fe51b01 100644
--- a/net/hs-iproute/Makefile
+++ b/net/hs-iproute/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= iproute
-PORTVERSION= 1.5.0
+PORTVERSION= 1.7.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-iproute/distinfo b/net/hs-iproute/distinfo
index 15154787516c..f9baa1c8af00 100644
--- a/net/hs-iproute/distinfo
+++ b/net/hs-iproute/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/iproute-1.5.0.tar.gz) = e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557
-SIZE (cabal/iproute-1.5.0.tar.gz) = 11570
+TIMESTAMP = 1499623592
+SHA256 (cabal/iproute-1.7.1.tar.gz) = 57b8d03ca8ce92f8ec1334564f3edff53a0621ccbc43c00ba02eaa5007ee3eee
+SIZE (cabal/iproute-1.7.1.tar.gz) = 11974
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index 971217b80cce..f2981fc7f171 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-maccatcher/distinfo b/net/hs-maccatcher/distinfo
index 600eb5dc15a3..77d4ba088ae6 100644
--- a/net/hs-maccatcher/distinfo
+++ b/net/hs-maccatcher/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623592
SHA256 (cabal/maccatcher-2.1.5.tar.gz) = cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c
SIZE (cabal/maccatcher-2.1.5.tar.gz) = 4947
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index 4797f1391686..ba8bf212b12b 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network-info
-PORTVERSION= 0.2.0.7
+PORTVERSION= 0.2.0.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-info/distinfo b/net/hs-network-info/distinfo
index 6f30b63dacfb..489f63f7590a 100644
--- a/net/hs-network-info/distinfo
+++ b/net/hs-network-info/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/network-info-0.2.0.7.tar.gz) = ef36e2c3d60d120c91d07dfe1081c87b73d0917cee858fba42598f284301405d
-SIZE (cabal/network-info-0.2.0.7.tar.gz) = 6023
+TIMESTAMP = 1499623594
+SHA256 (cabal/network-info-0.2.0.8.tar.gz) = ecdff121f3e154c480f363bc8660959a051790bfae5b5fe573810873cedbcd76
+SIZE (cabal/network-info-0.2.0.8.tar.gz) = 5998
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index bce66f51037a..136f10cd21ec 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network-multicast
-PORTVERSION= 0.1.0
+PORTVERSION= 0.2.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/distinfo b/net/hs-network-multicast/distinfo
index 7d9dd5ea1875..152158ef5d42 100644
--- a/net/hs-network-multicast/distinfo
+++ b/net/hs-network-multicast/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/network-multicast-0.1.0.tar.gz) = 18c2db0f8db5b9f4d3b65dbaa19ed77f4ebcf9c97e2d85657b6777f2b0e47a8a
-SIZE (cabal/network-multicast-0.1.0.tar.gz) = 3023
+TIMESTAMP = 1499623594
+SHA256 (cabal/network-multicast-0.2.0.tar.gz) = 0f3b50abc3a401c20cc6a0ec51a49d2a48e5b467d9fbd63b7cf803165fe975f2
+SIZE (cabal/network-multicast-0.2.0.tar.gz) = 2986
diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile
index 3054c174fcf3..dfea70a5fe01 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= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-protocol-xmpp/distinfo b/net/hs-network-protocol-xmpp/distinfo
index 5b933efea04c..dd6a11d3b448 100644
--- a/net/hs-network-protocol-xmpp/distinfo
+++ b/net/hs-network-protocol-xmpp/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623595
SHA256 (cabal/network-protocol-xmpp-0.4.8.tar.gz) = ea7729e00452da11ed489a71f482e0aa082b0fb872eedca2e3722a05fd421e1e
SIZE (cabal/network-protocol-xmpp-0.4.8.tar.gz) = 24289
diff --git a/net/hs-network-uri/Makefile b/net/hs-network-uri/Makefile
index d332dc2aa1f4..baf6d92eb8c0 100644
--- a/net/hs-network-uri/Makefile
+++ b/net/hs-network-uri/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network-uri
-PORTVERSION= 2.6.0.3
+PORTVERSION= 2.6.1.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-uri/distinfo b/net/hs-network-uri/distinfo
index 17a6a11ab8ab..4509413bb10a 100644
--- a/net/hs-network-uri/distinfo
+++ b/net/hs-network-uri/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/network-uri-2.6.0.3.tar.gz) = 0fc2cdff47ca77d826ebeb5cabe6ddac2333ca1504b2b629dd369399c5c28bdf
-SIZE (cabal/network-uri-2.6.0.3.tar.gz) = 26639
+TIMESTAMP = 1499623596
+SHA256 (cabal/network-uri-2.6.1.0.tar.gz) = 423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0
+SIZE (cabal/network-uri-2.6.1.0.tar.gz) = 27262
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 9488f8b51502..f4c5349b6cfb 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network
-PORTVERSION= 2.6.2.1
+PORTVERSION= 2.6.3.2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index 06580ff16573..233727b736c4 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/network-2.6.2.1.tar.gz) = a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa
-SIZE (cabal/network-2.6.2.1.tar.gz) = 118092
+TIMESTAMP = 1499623593
+SHA256 (cabal/network-2.6.3.2.tar.gz) = 354477074eaf2c0e134f4a7ae17694ffc747d484133463e95fae57ecbe48c0b6
+SIZE (cabal/network-2.6.3.2.tar.gz) = 122892
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index fcf980bf1e6e..23126284788c 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-pcap/distinfo b/net/hs-pcap/distinfo
index b6c6b6e7e93b..fd8c65aa0716 100644
--- a/net/hs-pcap/distinfo
+++ b/net/hs-pcap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623596
SHA256 (cabal/pcap-0.4.5.2.tar.gz) = e7e92e6ff4bffa22102335a38dabb97fd0771fdf3b75d45cd7c1708c85e1cd5f
SIZE (cabal/pcap-0.4.5.2.tar.gz) = 49414
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index e59804cf6026..394d5209a937 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= publicsuffixlist
PORTVERSION= 0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-publicsuffixlist/distinfo b/net/hs-publicsuffixlist/distinfo
index 17b7e8d0cb88..8c836299b468 100644
--- a/net/hs-publicsuffixlist/distinfo
+++ b/net/hs-publicsuffixlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623596
SHA256 (cabal/publicsuffixlist-0.1.tar.gz) = b37fbe099748e2a3a5a3b6661911d72749c2ec24d88ee686ae125de91fac7955
SIZE (cabal/publicsuffixlist-0.1.tar.gz) = 72704
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index cfc4cd43ccf2..08854d7c47d3 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/distinfo b/net/hs-sendfile/distinfo
index 56eb2caf27af..6cfd4e9fb9f7 100644
--- a/net/hs-sendfile/distinfo
+++ b/net/hs-sendfile/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499623596
SHA256 (cabal/sendfile-0.7.9.tar.gz) = 102fdf6db8c00f5a5981c6eed5acba1368a2d79b2970ce5b22ceb180aa0fdc42
SIZE (cabal/sendfile-0.7.9.tar.gz) = 10656
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 90a2d0c51ac0..b84fad817ef8 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.21
+PORTVERSION= 0.2.25
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index f495e1140d4f..11ec92b50c80 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/simple-sendfile-0.2.21.tar.gz) = 61239d6c5e94ec76067d88d8a09589b53ca0a5d1806fd9f3e042d007cc67fd77
-SIZE (cabal/simple-sendfile-0.2.21.tar.gz) = 7469
+TIMESTAMP = 1499623597
+SHA256 (cabal/simple-sendfile-0.2.25.tar.gz) = 0ae68821cd828b29772654b5613d514a421b1b1440d82a4b610339e67a92294d
+SIZE (cabal/simple-sendfile-0.2.25.tar.gz) = 343509
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 4b0b02db8278..0df23bbb259c 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= socks
-PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTVERSION= 0.5.5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-socks/distinfo b/net/hs-socks/distinfo
index f084eb06116b..e3fac1b9e90a 100644
--- a/net/hs-socks/distinfo
+++ b/net/hs-socks/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/socks-0.5.4.tar.gz) = e9b5e1ea78592632bb086e5f4d6da523be01921a4a8998ca78552bdc396db4da
-SIZE (cabal/socks-0.5.4.tar.gz) = 8021
+TIMESTAMP = 1499623597
+SHA256 (cabal/socks-0.5.5.tar.gz) = 2647ea93e21ad1dfd77e942c022c8707e468d25e1ff672a88be82508034fc868
+SIZE (cabal/socks-0.5.5.tar.gz) = 10159
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 9a05fbc5bee3..3466ed19ae62 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo
index 4edf4754dfa1..c430a7fca6ef 100644
--- a/print/hs-hscolour/distinfo
+++ b/print/hs-hscolour/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0
-SIZE (cabal/hscolour-1.23.tar.gz) = 26027
+TIMESTAMP = 1499623755
+SHA256 (cabal/hscolour-1.24.1.tar.gz) = e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8
+SIZE (cabal/hscolour-1.24.1.tar.gz) = 28717
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index d978ddb89198..aff9181580c2 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bio
PORTVERSION= 0.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/Makefile b/security/Makefile
index 17a0efaba226..9354e438ec7a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -241,10 +241,15 @@
SUBDIR += hs-cryptohash
SUBDIR += hs-cryptohash-conduit
SUBDIR += hs-cryptohash-cryptoapi
+ SUBDIR += hs-cryptohash-md5
+ SUBDIR += hs-cryptohash-sha1
+ SUBDIR += hs-cryptohash-sha256
SUBDIR += hs-cryptonite
SUBDIR += hs-digest
+ SUBDIR += hs-ed25519
SUBDIR += hs-entropy
SUBDIR += hs-gnutls
+ SUBDIR += hs-hackage-security
SUBDIR += hs-monadcryptorandom
SUBDIR += hs-nonce
SUBDIR += hs-pem
@@ -252,6 +257,7 @@
SUBDIR += hs-pwstore-fast
SUBDIR += hs-skein
SUBDIR += hs-tls
+ SUBDIR += hs-tls-session-manager
SUBDIR += hs-x509
SUBDIR += hs-x509-store
SUBDIR += hs-x509-system
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 3f421c2ec5be..05741227dba8 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-Crypto/distinfo b/security/hs-Crypto/distinfo
index 99ef37f7fdc9..46e64ac08570 100644
--- a/security/hs-Crypto/distinfo
+++ b/security/hs-Crypto/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624166
SHA256 (cabal/Crypto-4.2.5.1.tar.gz) = 6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66
SIZE (cabal/Crypto-4.2.5.1.tar.gz) = 56474
diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile
index fdf9d3278677..82938e6f0a63 100644
--- a/security/hs-DRBG/Makefile
+++ b/security/hs-DRBG/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= DRBG
-PORTVERSION= 0.5.4
+PORTVERSION= 0.5.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-DRBG/distinfo b/security/hs-DRBG/distinfo
index 85127d8414da..5464f75769ba 100644
--- a/security/hs-DRBG/distinfo
+++ b/security/hs-DRBG/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/DRBG-0.5.4.tar.gz) = bd617d0b0458acb810f20343d56ca88a0fc50c12c169a5895e6648356566d30e
-SIZE (cabal/DRBG-0.5.4.tar.gz) = 1548154
+TIMESTAMP = 1499624167
+SHA256 (cabal/DRBG-0.5.5.tar.gz) = 21df3202486cc83c7cc3f867cb139eac9a3f69bd91b5f6b016ae026e03c33bfd
+SIZE (cabal/DRBG-0.5.5.tar.gz) = 1547022
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index e144d0a16f5d..63f18d56620e 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= HsOpenSSL
-PORTVERSION= 0.11.1.1
+PORTVERSION= 0.11.4.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 6510690bede3..988efd22898e 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HsOpenSSL-0.11.1.1.tar.gz) = 4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1
-SIZE (cabal/HsOpenSSL-0.11.1.1.tar.gz) = 72297
+TIMESTAMP = 1499450950
+SHA256 (cabal/HsOpenSSL-0.11.4.9.tar.gz) = ea0fe9bb2a6aa9afe5229dfdc44cae493c3fccf9daffa091d2d1aaa09087b378
+SIZE (cabal/HsOpenSSL-0.11.4.9.tar.gz) = 79689
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 903f45f9feb3..99bb5735d015 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= RSA
-PORTVERSION= 2.1.0.1
+PORTVERSION= 2.3.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-RSA/distinfo b/security/hs-RSA/distinfo
index 458cf746f5d0..b822aaf8e472 100644
--- a/security/hs-RSA/distinfo
+++ b/security/hs-RSA/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/RSA-2.1.0.1.tar.gz) = 1b02096acd61e7fa477ca062773d47b7872e110cab594372699f8cba0632e454
-SIZE (cabal/RSA-2.1.0.1.tar.gz) = 14390
+TIMESTAMP = 1499624168
+SHA256 (cabal/RSA-2.3.0.tar.gz) = eee76dc7f9dd2d2cdeb014af728ff56f2f5d2908212bd3bb8c5e89f5c6485333
+SIZE (cabal/RSA-2.3.0.tar.gz) = 14710
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index 781af35f22f9..99d909c0b55b 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -2,6 +2,7 @@
PORTNAME= SHA
PORTVERSION= 1.6.4.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-SHA/distinfo b/security/hs-SHA/distinfo
index 282b35223c6b..937843a899eb 100644
--- a/security/hs-SHA/distinfo
+++ b/security/hs-SHA/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624168
SHA256 (cabal/SHA-1.6.4.2.tar.gz) = c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c
SIZE (cabal/SHA-1.6.4.2.tar.gz) = 2715266
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index d5921d0629d4..100732314692 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= certificate
PORTVERSION= 1.3.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index 2ae65684d021..f5e88267d436 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624168
SHA256 (cabal/certificate-1.3.9.tar.gz) = e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1
SIZE (cabal/certificate-1.3.9.tar.gz) = 15018
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index f8340228b51b..2cb5ae5ddc1f 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cipher-aes
PORTVERSION= 0.2.11
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
index c0ad9abb6b96..c1a6fb11f246 100644
--- a/security/hs-cipher-aes/distinfo
+++ b/security/hs-cipher-aes/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624168
SHA256 (cabal/cipher-aes-0.2.11.tar.gz) = d3b171895698c73da24d7ce97543f725d26637f038de670c0fd4012ca7f95015
SIZE (cabal/cipher-aes-0.2.11.tar.gz) = 33939
diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile
index f5fcb29316ff..5679867683f0 100644
--- a/security/hs-cipher-aes128/Makefile
+++ b/security/hs-cipher-aes128/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cipher-aes128
-PORTVERSION= 0.7.0.1
+PORTVERSION= 0.7.0.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes128/distinfo b/security/hs-cipher-aes128/distinfo
index 9e20590a15bd..7a17b3ed108e 100644
--- a/security/hs-cipher-aes128/distinfo
+++ b/security/hs-cipher-aes128/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cipher-aes128-0.7.0.1.tar.gz) = 18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662
-SIZE (cabal/cipher-aes128-0.7.0.1.tar.gz) = 25450
+TIMESTAMP = 1499624169
+SHA256 (cabal/cipher-aes128-0.7.0.3.tar.gz) = 6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a
+SIZE (cabal/cipher-aes128-0.7.0.3.tar.gz) = 25276
diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile
index 449626df8548..a8ffe35a065d 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-blowfish/distinfo b/security/hs-cipher-blowfish/distinfo
index 8595bc9d23b6..4f316eb16cf1 100644
--- a/security/hs-cipher-blowfish/distinfo
+++ b/security/hs-cipher-blowfish/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624169
SHA256 (cabal/cipher-blowfish-0.0.3.tar.gz) = 8f41170a851dba6d0b6f07298af3213baca09ab2a8aaf2adb733631feb3b6641
SIZE (cabal/cipher-blowfish-0.0.3.tar.gz) = 12876
diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile
index 2b770ef393a2..48d24ad6cb6c 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-camellia/distinfo b/security/hs-cipher-camellia/distinfo
index 5b49f8f1663f..1b6b6f7cb368 100644
--- a/security/hs-cipher-camellia/distinfo
+++ b/security/hs-cipher-camellia/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624169
SHA256 (cabal/cipher-camellia-0.0.2.tar.gz) = 8d0cd137cdb890646bb5d3bb52b20fa6d74e1b0c35d7d524d60edd9d43ace2a7
SIZE (cabal/cipher-camellia-0.0.2.tar.gz) = 6230
diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile
index 948e8116684c..467bccad0a3c 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-des/distinfo b/security/hs-cipher-des/distinfo
index a077760fe3f9..fcf7ea4df4f5 100644
--- a/security/hs-cipher-des/distinfo
+++ b/security/hs-cipher-des/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624169
SHA256 (cabal/cipher-des-0.0.6.tar.gz) = 85f1bccdec625a120ecf83b861afcb6478f8f899ceaa06fc083e642b54ff4ac7
SIZE (cabal/cipher-des-0.0.6.tar.gz) = 7857
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index 8db20f36824c..26d6e7fe3052 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-rc4/distinfo b/security/hs-cipher-rc4/distinfo
index 415da27b54fd..933530dd3438 100644
--- a/security/hs-cipher-rc4/distinfo
+++ b/security/hs-cipher-rc4/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624169
SHA256 (cabal/cipher-rc4-0.1.4.tar.gz) = c67e731bc9e7f3882e33609c3d9ec97b4e9bbd2f95cd882926acfb621970384d
SIZE (cabal/cipher-rc4-0.1.4.tar.gz) = 4315
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index db70b046b7ba..1283132d5e7b 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= clientsession
-PORTVERSION= 0.9.1.1
+PORTVERSION= 0.9.1.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index c68725e66480..fc222e7bcfd0 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/clientsession-0.9.1.1.tar.gz) = c9563c0bcda1a02cfea2fd39aecec5b9f419901587287f05afdec1e683210022
-SIZE (cabal/clientsession-0.9.1.1.tar.gz) = 7928
+TIMESTAMP = 1499624170
+SHA256 (cabal/clientsession-0.9.1.2.tar.gz) = 5915adc4de26d2a8b03f1a445bac0b0f5d10a5b0380a4eed71b79a20a727d068
+SIZE (cabal/clientsession-0.9.1.2.tar.gz) = 7991
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index d39ce6bd20e1..091c83f6c527 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index 0b44f7ae992b..4f33dc075860 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/cprng-aes-0.6.1.tar.gz) = 64592a01de8c6683c5e29f538dceee918887ffe211d87214a2e38559d72c21f3
SIZE (cabal/cprng-aes-0.6.1.tar.gz) = 4396
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index 85e7691424df..1f16e361315f 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-api
PORTVERSION= 0.13.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/distinfo b/security/hs-crypto-api/distinfo
index 8e7208bf341a..55febda22434 100644
--- a/security/hs-crypto-api/distinfo
+++ b/security/hs-crypto-api/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-api-0.13.2.tar.gz) = 5331d511a9761d5073e6661148234228d88f8ace14e2994171f0bcf5183e82ed
SIZE (cabal/crypto-api-0.13.2.tar.gz) = 47877
diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile
index 75f6ae8875ec..b05582eb46f3 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-cipher-types/distinfo b/security/hs-crypto-cipher-types/distinfo
index 883fc4e7429e..507d67977773 100644
--- a/security/hs-crypto-cipher-types/distinfo
+++ b/security/hs-crypto-cipher-types/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-cipher-types-0.0.9.tar.gz) = 2073f6b70df7916aebe2da49d224497183662d56d19da87b76f70039430c0a0f
SIZE (cabal/crypto-cipher-types-0.0.9.tar.gz) = 8073
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index b4b3cee22527..62d6307cff0c 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-conduit
PORTVERSION= 0.5.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,7 @@ COMMENT= Conduit interface for cryptographic operations (from crypto-api)
LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.3 conduit>=1.0 conduit-extra>=1.1 crypto-api>=0.8 \
- resourcet
+USE_CABAL= cereal conduit conduit-extra crypto-api resourcet
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index 61ead6c6a252..641552ed134a 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-conduit-0.5.5.tar.gz) = ced360b56aba0d669e11af90fa603e68911e802f0e7d44750d5dcc3c64d5a47d
SIZE (cabal/crypto-conduit-0.5.5.tar.gz) = 6883
diff --git a/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal
new file mode 100644
index 000000000000..406550238d35
--- /dev/null
+++ b/security/hs-crypto-conduit/files/patch-crypto-conduit.cabal
@@ -0,0 +1,14 @@
+--- crypto-conduit.cabal.orig 2014-11-12 15:04:14 UTC
++++ crypto-conduit.cabal
+@@ -37,9 +37,9 @@ Library
+ Build-depends:
+ base >= 3 && < 5,
+ bytestring >= 0.9,
+- cereal >= 0.3 && < 0.5,
++ cereal >= 0.3 && < 0.6,
+ conduit >= 1.0 && < 1.3,
+- transformers >= 0.2 && < 0.5,
++ transformers >= 0.2 && < 0.6,
+ resourcet
+ if flag(conduit11)
+ Build-depends: conduit-extra >= 1.1
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index 903357c7ed75..8a23fb5313b8 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-numbers
PORTVERSION= 0.2.7
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-numbers/distinfo b/security/hs-crypto-numbers/distinfo
index f8b221806853..bcbe621c1dc9 100644
--- a/security/hs-crypto-numbers/distinfo
+++ b/security/hs-crypto-numbers/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-numbers-0.2.7.tar.gz) = 420aeb17e9cdcfdf8c950c6c6f10c54503c5524d36f611aa7238e3fd65f189a6
SIZE (cabal/crypto-numbers-0.2.7.tar.gz) = 16064
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 1c0a6fb6089b..2b3ae6391b12 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-pubkey-types
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index 3c6dcb91af55..1e7b566dd183 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-pubkey-types-0.4.3.tar.gz) = 7ed9f52281ec4e34021a91818fe45288e33d65bff937f60334a3f45be5a71c60
SIZE (cabal/crypto-pubkey-types-0.4.3.tar.gz) = 11234
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index eb44ddfaa627..71a43233316b 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-pubkey
PORTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey/distinfo b/security/hs-crypto-pubkey/distinfo
index 81d7fa2cca77..8070014c3177 100644
--- a/security/hs-crypto-pubkey/distinfo
+++ b/security/hs-crypto-pubkey/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-pubkey-0.2.8.tar.gz) = c0ccf2f5c38517de1f1626cb0a2542f35aefad8842f8ad5c1fac0b8c9de8b56e
SIZE (cabal/crypto-pubkey-0.2.8.tar.gz) = 46405
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index 35ac5182d940..fe2e4df1ca14 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= 8
+PORTREVISION= 9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random-api/distinfo b/security/hs-crypto-random-api/distinfo
index 7ffa524456cd..3a8579457a90 100644
--- a/security/hs-crypto-random-api/distinfo
+++ b/security/hs-crypto-random-api/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-random-api-0.2.0.tar.gz) = 56e9777061bd9ce553683d097ba3a11fdc371724060b62ca103f1f291f9f897c
SIZE (cabal/crypto-random-api-0.2.0.tar.gz) = 3397
diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile
index fa6c58233f88..ffffed0ca558 100644
--- a/security/hs-crypto-random/Makefile
+++ b/security/hs-crypto-random/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-random
PORTVERSION= 0.0.9
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random/distinfo b/security/hs-crypto-random/distinfo
index 85b0cb6f639a..9fdfe7b4b73f 100644
--- a/security/hs-crypto-random/distinfo
+++ b/security/hs-crypto-random/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624170
SHA256 (cabal/crypto-random-0.0.9.tar.gz) = 170a7a18441379c2d1c19b502ee5919026a19adc6e78641cd4fb40b1d69a6904
SIZE (cabal/crypto-random-0.0.9.tar.gz) = 9256
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 4a1993899345..1d93baa5932b 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptocipher
PORTVERSION= 0.6.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 835939716d8e..eb039ed32fff 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624171
SHA256 (cabal/cryptocipher-0.6.2.tar.gz) = 34b9e62dee36c4019dd0c0e86576295d0bd1bb573eeb24686ec635a09550e346
SIZE (cabal/cryptocipher-0.6.2.tar.gz) = 2027
diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile
index 5b0610c967cc..f3fce39fe7fb 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= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-conduit/distinfo b/security/hs-cryptohash-conduit/distinfo
index 9e32fd382416..a3f5d6f1e8af 100644
--- a/security/hs-cryptohash-conduit/distinfo
+++ b/security/hs-cryptohash-conduit/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624171
SHA256 (cabal/cryptohash-conduit-0.1.1.tar.gz) = ea516d898d3e34dae6be3e8bc59c9f61a61cb1222233dbfe84a84bb0ded4b4ce
SIZE (cabal/cryptohash-conduit-0.1.1.tar.gz) = 2318
diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile
index f511eae64c2e..d8c15a3c7a04 100644
--- a/security/hs-cryptohash-cryptoapi/Makefile
+++ b/security/hs-cryptohash-cryptoapi/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cryptohash-cryptoapi
-PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTVERSION= 0.1.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-cryptoapi/distinfo b/security/hs-cryptohash-cryptoapi/distinfo
index 3223aa016fc3..a500d1879a1c 100644
--- a/security/hs-cryptohash-cryptoapi/distinfo
+++ b/security/hs-cryptohash-cryptoapi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cryptohash-cryptoapi-0.1.3.tar.gz) = 56f080ba13b891b664bd986db17d6c1240adaea4792a14c173146929c61d4572
-SIZE (cabal/cryptohash-cryptoapi-0.1.3.tar.gz) = 2922
+TIMESTAMP = 1499544840
+SHA256 (cabal/cryptohash-cryptoapi-0.1.4.tar.gz) = 717a8664ebfaa1c31aaec1d78c9b7c776a5adcfdfc50ad88e21a34566f72058e
+SIZE (cabal/cryptohash-cryptoapi-0.1.4.tar.gz) = 3094
diff --git a/security/hs-cryptohash-md5/Makefile b/security/hs-cryptohash-md5/Makefile
new file mode 100644
index 000000000000..019379bf3ad2
--- /dev/null
+++ b/security/hs-cryptohash-md5/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= cryptohash-md5
+PORTVERSION= 0.11.100.1
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A practical incremental and one-pass, pure API to the MD5 hash algorithm
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-md5/distinfo b/security/hs-cryptohash-md5/distinfo
new file mode 100644
index 000000000000..8587424cd8dd
--- /dev/null
+++ b/security/hs-cryptohash-md5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499702500
+SHA256 (cabal/cryptohash-md5-0.11.100.1.tar.gz) = 710bd48770fa3e9a3b05428c6dc77fb72c91956d334a1eb89ded11bb843e18f9
+SIZE (cabal/cryptohash-md5-0.11.100.1.tar.gz) = 10472
diff --git a/security/hs-cryptohash-md5/pkg-descr b/security/hs-cryptohash-md5/pkg-descr
new file mode 100644
index 000000000000..eca0e4ce7c25
--- /dev/null
+++ b/security/hs-cryptohash-md5/pkg-descr
@@ -0,0 +1,16 @@
+A practical incremental and one-pass, pure API to the MD5 hash algorithm
+(including HMAC support) with performance close to the fastest implementations
+available in other languages.
+
+The implementation is made in C with a haskell FFI wrapper that hides the C
+implementation.
+
+NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
+package has been deprecated and so this package continues to satisfy the need
+for a lightweight package providing the MD5 hash algorithm without any
+dependencies on packages other than base and bytestring.
+
+Consequently, this package can be used as a drop-in replacement for cryptohash's
+Crypto.Hash.MD5 module, though with a clearly smaller footprint.
+
+WWW: http://hackage.haskell.org/package/cryptohash-md5
diff --git a/security/hs-cryptohash-sha1/Makefile b/security/hs-cryptohash-sha1/Makefile
new file mode 100644
index 000000000000..ceee2d4258e6
--- /dev/null
+++ b/security/hs-cryptohash-sha1/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= cryptohash-sha1
+PORTVERSION= 0.11.100.1
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-sha1/distinfo b/security/hs-cryptohash-sha1/distinfo
new file mode 100644
index 000000000000..da303336191c
--- /dev/null
+++ b/security/hs-cryptohash-sha1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499702505
+SHA256 (cabal/cryptohash-sha1-0.11.100.1.tar.gz) = 3c79af33542512442f8f87f6abb1faef7cd43bbfb2859260a33251d861eb0dab
+SIZE (cabal/cryptohash-sha1-0.11.100.1.tar.gz) = 10198
diff --git a/security/hs-cryptohash-sha1/pkg-descr b/security/hs-cryptohash-sha1/pkg-descr
new file mode 100644
index 000000000000..1de0fe1e6c2b
--- /dev/null
+++ b/security/hs-cryptohash-sha1/pkg-descr
@@ -0,0 +1,16 @@
+A practical incremental and one-pass, pure API to the SHA-1 hash algorithm
+(including HMAC support) with performance close to the fastest implementations
+available in other languages.
+
+The implementation is made in C with a haskell FFI wrapper that hides the C
+implementation.
+
+NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
+package has been deprecated and so this package continues to satisfy the need
+for a lightweight package providing the SHA1 hash algorithm without any
+dependencies on packages other than base and bytestring.
+
+Consequently, this package can be used as a drop-in replacement for cryptohash's
+Crypto.Hash.SHA1 module, though with a clearly smaller footprint.
+
+WWW: http://hackage.haskell.org/package/cryptohash-sha1
diff --git a/security/hs-cryptohash-sha256/Makefile b/security/hs-cryptohash-sha256/Makefile
new file mode 100644
index 000000000000..e5c83dc2557c
--- /dev/null
+++ b/security/hs-cryptohash-sha256/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= cryptohash-sha256
+PORTVERSION= 0.11.100.1
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-sha256/distinfo b/security/hs-cryptohash-sha256/distinfo
new file mode 100644
index 000000000000..d8533f99127a
--- /dev/null
+++ b/security/hs-cryptohash-sha256/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499788695
+SHA256 (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6
+SIZE (cabal/cryptohash-sha256-0.11.100.1.tar.gz) = 10885
diff --git a/security/hs-cryptohash-sha256/pkg-descr b/security/hs-cryptohash-sha256/pkg-descr
new file mode 100644
index 000000000000..fa0efb2775df
--- /dev/null
+++ b/security/hs-cryptohash-sha256/pkg-descr
@@ -0,0 +1,16 @@
+A practical incremental and one-pass, pure API to the SHA-256 hash algorithm
+(including HMAC support) with performance close to the fastest implementations
+available in other languages.
+
+The implementation is made in C with a haskell FFI wrapper that hides the C
+implementation.
+
+NOTE: This package has been forked off cryptohash-0.11.7 because the cryptohash
+package has been deprecated and so this package continues to satisfy the need for
+a lightweight package providing the SHA256 hash algorithm without any dependencies
+on packages other than base and bytestring.
+
+Consequently, this package can be used as a drop-in replacement for cryptohash's
+Crypto.Hash.SHA256 module, though with a clearly smaller footprint.
+
+WWW: http://hackage.haskell.org/package/cryptohash-sha256
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index a72f7fc376d5..b30aa32bbdcf 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cryptohash
-PORTVERSION= 0.11.6
-PORTREVISION= 2
+PORTVERSION= 0.11.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Collection of crypto hashes, fast, pure, and practical
LICENSE= BSD3CLAUSE
-USE_CABAL= byteable
+USE_CABAL= byteable cryptonite>=0.13
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index de86d7930391..2dc65db6cae4 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cryptohash-0.11.6.tar.gz) = da382334857a88f3e94ce0fb83f425f0a0787b0644100913c61f6e94bb62df37
-SIZE (cabal/cryptohash-0.11.6.tar.gz) = 65798
+TIMESTAMP = 1499538586
+SHA256 (cabal/cryptohash-0.11.9.tar.gz) = c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb
+SIZE (cabal/cryptohash-0.11.9.tar.gz) = 25762
diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile
index 294bb155b2e2..ebc659d4adcf 100644
--- a/security/hs-cryptonite/Makefile
+++ b/security/hs-cryptonite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cryptonite
-PORTVERSION= 0.6
+PORTVERSION= 0.24
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptonite/distinfo b/security/hs-cryptonite/distinfo
index 09f76b311552..be3760b8b491 100644
--- a/security/hs-cryptonite/distinfo
+++ b/security/hs-cryptonite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cryptonite-0.6.tar.gz) = a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853
-SIZE (cabal/cryptonite-0.6.tar.gz) = 319290
+TIMESTAMP = 1499539235
+SHA256 (cabal/cryptonite-0.24.tar.gz) = 17c3312343ef9bbfa87566d1f701d24870c2d34e015b104ff02faf1c9e1b5a86
+SIZE (cabal/cryptonite-0.24.tar.gz) = 579387
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index decfb08b9e39..b3d9ccc9c5cd 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,7 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/distinfo b/security/hs-digest/distinfo
index 567e7d6cbbf8..e79c36a30960 100644
--- a/security/hs-digest/distinfo
+++ b/security/hs-digest/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624171
SHA256 (cabal/digest-0.0.1.2.tar.gz) = 641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11
SIZE (cabal/digest-0.0.1.2.tar.gz) = 3790
diff --git a/security/hs-ed25519/Makefile b/security/hs-ed25519/Makefile
new file mode 100644
index 000000000000..8c1d8844e129
--- /dev/null
+++ b/security/hs-ed25519/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= ed25519
+PORTVERSION= 0.0.5.0
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A simple, fast, self-contained copy of the Ed25519 public-key signature system
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-ed25519/distinfo b/security/hs-ed25519/distinfo
new file mode 100644
index 000000000000..054c0ff16770
--- /dev/null
+++ b/security/hs-ed25519/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499789028
+SHA256 (cabal/ed25519-0.0.5.0.tar.gz) = d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d
+SIZE (cabal/ed25519-0.0.5.0.tar.gz) = 80034
diff --git a/security/hs-ed25519/files/patch-ed25519.cabal b/security/hs-ed25519/files/patch-ed25519.cabal
new file mode 100644
index 000000000000..ede2f9775f8c
--- /dev/null
+++ b/security/hs-ed25519/files/patch-ed25519.cabal
@@ -0,0 +1,11 @@
+--- ed25519.cabal.orig 2017-07-11 16:16:50 UTC
++++ ed25519.cabal
+@@ -60,7 +60,7 @@ flag no-donna
+
+ library
+ build-depends:
+- ghc-prim >= 0.1 && < 0.5,
++ ghc-prim >= 0.1 && < 0.6,
+ base >= 4 && < 5,
+ bytestring >= 0.9 && < 0.11
+
diff --git a/security/hs-ed25519/pkg-descr b/security/hs-ed25519/pkg-descr
new file mode 100644
index 000000000000..22b493743b5c
--- /dev/null
+++ b/security/hs-ed25519/pkg-descr
@@ -0,0 +1,6 @@
+This package provides a simple, fast, self-contained copy of the Ed25519
+public-key signature system with a clean interface. It also includes support
+for detached signatures, and thorough documentation on the design and
+implementation, including usage guidelines.
+
+WWW: http://hackage.haskell.org/package/ed25519
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 1f611e169581..2ebbc1c9830d 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= entropy
-PORTVERSION= 0.3.7
+PORTVERSION= 0.3.8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/distinfo b/security/hs-entropy/distinfo
index fb2160e7730d..be433e5a68d9 100644
--- a/security/hs-entropy/distinfo
+++ b/security/hs-entropy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/entropy-0.3.7.tar.gz) = 1ff020eba2edbb93c4b23297470f8c11d69d0ff1e1642d17cbab9d54a24befef
-SIZE (cabal/entropy-0.3.7.tar.gz) = 6498
+TIMESTAMP = 1499538619
+SHA256 (cabal/entropy-0.3.8.tar.gz) = 743a49d5e17ae9d6118ff077f2cd2d5944c0ea6cff501efeec95b68d5f7474d0
+SIZE (cabal/entropy-0.3.8.tar.gz) = 6573
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index f1cd8ca8d074..3359e2e435e3 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnutls
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-gnutls/distinfo b/security/hs-gnutls/distinfo
index 2f40ad76ba0f..c63bda116f71 100644
--- a/security/hs-gnutls/distinfo
+++ b/security/hs-gnutls/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624171
SHA256 (cabal/gnutls-0.2.tar.gz) = c0e6fddf92d48d1e6ab0d93af8104cc83d250eab7b3d369780ef72801aa8b7b0
SIZE (cabal/gnutls-0.2.tar.gz) = 17272
diff --git a/security/hs-hackage-security/Makefile b/security/hs-hackage-security/Makefile
new file mode 100644
index 000000000000..384e0e95fa62
--- /dev/null
+++ b/security/hs-hackage-security/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= hackage-security
+PORTVERSION= 0.5.2.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The hackage security library provides both server and client utilities for securing the Hackage package server
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base16-bytestring base64-bytestring cryptohash-sha256 ed25519 \
+ mtl network network-uri old-locale old-time parsec tar zlib
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-hackage-security/distinfo b/security/hs-hackage-security/distinfo
new file mode 100644
index 000000000000..4b6cc06aacbc
--- /dev/null
+++ b/security/hs-hackage-security/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499790857
+SHA256 (cabal/hackage-security-0.5.2.2.tar.gz) = 507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41
+SIZE (cabal/hackage-security-0.5.2.2.tar.gz) = 83131
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..9475199655e4
--- /dev/null
+++ b/security/hs-hackage-security/files/patch-hackage-security.cabal
@@ -0,0 +1,10 @@
+--- hackage-security.cabal.orig 2016-08-28 22:57:40 UTC
++++ hackage-security.cabal
+@@ -101,7 +101,6 @@ library
+ bytestring >= 0.9 && < 0.11,
+ Cabal >= 1.14 && < 1.26,
+ containers >= 0.4 && < 0.6,
+- directory >= 1.1.0.2 && < 1.3,
+ ed25519 >= 0.0 && < 0.1,
+ filepath >= 1.2 && < 1.5,
+ mtl >= 2.2 && < 2.3,
diff --git a/security/hs-hackage-security/pkg-descr b/security/hs-hackage-security/pkg-descr
new file mode 100644
index 000000000000..80d3f3cdec9e
--- /dev/null
+++ b/security/hs-hackage-security/pkg-descr
@@ -0,0 +1,15 @@
+The hackage security library provides both server and client utilities for
+securing the Hackage package server (http://hackage.haskell.org/). It is based on
+The Update Framework (http://theupdateframework.com/), a set of recommendations
+developed by security researchers at various universities in the US as well as
+developers on the Tor project (https://www.torproject.org/).
+
+The current implementation supports only index signing, thereby enabling
+untrusted mirrors. It does not yet provide facilities for author package
+signing.
+
+The library has two main entry points: Hackage.Security.Client is the main entry
+point for clients (the typical example being cabal), and Hackage.Security.Server
+is the main entry point for servers (the typical example being hackage-server).
+
+WWW: https://hackage.haskell.org/package/hackage-security
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 1acc7bd1dbd3..06efdfe4299c 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monadcryptorandom
-PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTVERSION= 0.7.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Monad for using CryptoRandomGen
LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2
+USE_CABAL= crypto-api exceptions tagged transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 60b6ac89e57e..3aac0fe2783c 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monadcryptorandom-0.6.1.tar.gz) = 42be5bde4f4d5b2eadbbc9c4a1556b1ac60e366d9aeae76aa41a722c1c902949
-SIZE (cabal/monadcryptorandom-0.6.1.tar.gz) = 4659
+TIMESTAMP = 1499624172
+SHA256 (cabal/monadcryptorandom-0.7.1.tar.gz) = 85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7
+SIZE (cabal/monadcryptorandom-0.7.1.tar.gz) = 4851
diff --git a/security/hs-nonce/Makefile b/security/hs-nonce/Makefile
index f3896b16105b..80097d5250a5 100644
--- a/security/hs-nonce/Makefile
+++ b/security/hs-nonce/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nonce
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Generate cryptographic nonces
LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random text>=0.9
+USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random entropy>=0.3.7 text>=0.9
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-nonce/distinfo b/security/hs-nonce/distinfo
index 53abf7a6f4a4..9479c7ac43c7 100644
--- a/security/hs-nonce/distinfo
+++ b/security/hs-nonce/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/nonce-1.0.2.tar.gz) = 1004184996ea797b43189a0e73eab0b939f129cafc776341ca82289edb329cd0
-SIZE (cabal/nonce-1.0.2.tar.gz) = 2872
+TIMESTAMP = 1499537845
+SHA256 (cabal/nonce-1.0.4.tar.gz) = 51661ae3dda7263f1772d628f9a7c08a319dc221b3936ceabea3b2a50f086ef6
+SIZE (cabal/nonce-1.0.4.tar.gz) = 2788
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 7e684c7e12a8..96805bcbe2f1 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/distinfo b/security/hs-pem/distinfo
index f70c2d2028cc..27e69cb3de5e 100644
--- a/security/hs-pem/distinfo
+++ b/security/hs-pem/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624172
SHA256 (cabal/pem-0.2.2.tar.gz) = 372808c76c6d860aedb4e30171cb4ee9f6154d9f68e3f2310f820bf174995a98
SIZE (cabal/pem-0.2.2.tar.gz) = 4641
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index e38d36784758..64986285c678 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pureMD5
-PORTVERSION= 2.1.2.1
-PORTREVISION= 10
+PORTVERSION= 2.1.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/distinfo b/security/hs-pureMD5/distinfo
index f91dff9b45e3..f3220edd072a 100644
--- a/security/hs-pureMD5/distinfo
+++ b/security/hs-pureMD5/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pureMD5-2.1.2.1.tar.gz) = 6768174686d5eaef76b487f6f8160a932c48012668fbe542e7aba489134956ff
-SIZE (cabal/pureMD5-2.1.2.1.tar.gz) = 5824
+TIMESTAMP = 1499624172
+SHA256 (cabal/pureMD5-2.1.3.tar.gz) = bef3358a5e3a45b649860a5792f052e2f927c0492a7056cf64425116c8a7b17d
+SIZE (cabal/pureMD5-2.1.3.tar.gz) = 6719
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index f73201319cc1..d9c2311d5214 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.4.4
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/distinfo b/security/hs-pwstore-fast/distinfo
index a37818b6f00f..3c391bd684b6 100644
--- a/security/hs-pwstore-fast/distinfo
+++ b/security/hs-pwstore-fast/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624172
SHA256 (cabal/pwstore-fast-2.4.4.tar.gz) = 7219af66b6f762d9dd5376b3b25393d4d6626e390e9d9c9f87f6e3f13ea7fbb2
SIZE (cabal/pwstore-fast-2.4.4.tar.gz) = 8901
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 70c0c780bbc5..bea995dc55a3 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 1.0.9.3
+PORTVERSION= 1.0.9.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index bcda6d027f2d..a09b0bb93746 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/skein-1.0.9.3.tar.gz) = c7bab12dbad3af29fd8d3b10f418198fe22315e8f849539bf9d7efe9495df14c
-SIZE (cabal/skein-1.0.9.3.tar.gz) = 119484
+TIMESTAMP = 1499624173
+SHA256 (cabal/skein-1.0.9.4.tar.gz) = f882ca0cc5ed336ef898fb3c89579e392900259296b2320edf968b9fc16cb8c9
+SIZE (cabal/skein-1.0.9.4.tar.gz) = 134346
diff --git a/security/hs-tls-session-manager/Makefile b/security/hs-tls-session-manager/Makefile
new file mode 100644
index 000000000000..e58c9efde9cd
--- /dev/null
+++ b/security/hs-tls-session-manager/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= tls-session-manager
+PORTVERSION= 0.0.0.0
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= TLS session manager with limitation, automatic pruning, energy saving and replay resistance
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= auto-update clock psqueues tls
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-tls-session-manager/distinfo b/security/hs-tls-session-manager/distinfo
new file mode 100644
index 000000000000..2fda4da7e3f7
--- /dev/null
+++ b/security/hs-tls-session-manager/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499716462
+SHA256 (cabal/tls-session-manager-0.0.0.0.tar.gz) = 7673d405781125733283b9f848c07b600ef0a060b62c0bda605af8c92e886c11
+SIZE (cabal/tls-session-manager-0.0.0.0.tar.gz) = 3066
diff --git a/security/hs-tls-session-manager/pkg-descr b/security/hs-tls-session-manager/pkg-descr
new file mode 100644
index 000000000000..a08b40b3e432
--- /dev/null
+++ b/security/hs-tls-session-manager/pkg-descr
@@ -0,0 +1,3 @@
+TLS session manager with limitation, automatic pruning, energy saving and replay resistance
+
+WWW: http://hackage.haskell.org/package/tls-session-manager
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 799d80979f81..887196ed491f 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index be06dfa90070..44e95bcffc49 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tls-1.3.1.tar.gz) = 747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0
-SIZE (cabal/tls-1.3.1.tar.gz) = 74668
+TIMESTAMP = 1499542268
+SHA256 (cabal/tls-1.3.11.tar.gz) = 3f008eb942874f8114f9a332f9669c44d72825ba39ce0fad89f0f8dfa6fb2703
+SIZE (cabal/tls-1.3.11.tar.gz) = 94342
diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile
index 82af2ef38954..b8b0ae1fbb24 100644
--- a/security/hs-x509-store/Makefile
+++ b/security/hs-x509-store/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= x509-store
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-store/distinfo b/security/hs-x509-store/distinfo
index 63fc08aed54a..701411ef031e 100644
--- a/security/hs-x509-store/distinfo
+++ b/security/hs-x509-store/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/x509-store-1.6.0.tar.gz) = d5b347a80d66b0424b92d5a340108d6c674246ddbdd21c223b586be19f582e22
-SIZE (cabal/x509-store-1.6.0.tar.gz) = 3556
+TIMESTAMP = 1499594984
+SHA256 (cabal/x509-store-1.6.2.tar.gz) = 49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b
+SIZE (cabal/x509-store-1.6.2.tar.gz) = 4326
diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile
index 73edb4ed80ef..ba17721767fe 100644
--- a/security/hs-x509-system/Makefile
+++ b/security/hs-x509-system/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= x509-system
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-system/distinfo b/security/hs-x509-system/distinfo
index c58d9ea0466c..f3cd52ac8b6e 100644
--- a/security/hs-x509-system/distinfo
+++ b/security/hs-x509-system/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/x509-system-1.6.0.tar.gz) = 50f9c24513aba2677d71a1c09cbd4f4d6cb82b5e0bad1ecfdfb407f6f5be1735
-SIZE (cabal/x509-system-1.6.0.tar.gz) = 3833
+TIMESTAMP = 1499624174
+SHA256 (cabal/x509-system-1.6.4.tar.gz) = d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c
+SIZE (cabal/x509-system-1.6.4.tar.gz) = 3443
diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile
index ece75bc58fa6..1e6304babab1 100644
--- a/security/hs-x509-validation/Makefile
+++ b/security/hs-x509-validation/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= x509-validation
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509-validation/distinfo b/security/hs-x509-validation/distinfo
index d344e01e251b..9216fb078f20 100644
--- a/security/hs-x509-validation/distinfo
+++ b/security/hs-x509-validation/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/x509-validation-1.6.0.tar.gz) = cc07c92402e685fafc31f1fc9d825d6e2775a7f5a423fb0b9b3453ede8349f1e
-SIZE (cabal/x509-validation-1.6.0.tar.gz) = 9691
+TIMESTAMP = 1499594943
+SHA256 (cabal/x509-validation-1.6.5.tar.gz) = d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4
+SIZE (cabal/x509-validation-1.6.5.tar.gz) = 10370
diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile
index e5502c26bd0d..de192eb50cc7 100644
--- a/security/hs-x509/Makefile
+++ b/security/hs-x509/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= x509
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-x509/distinfo b/security/hs-x509/distinfo
index f877126ab898..0081dbdf0bd5 100644
--- a/security/hs-x509/distinfo
+++ b/security/hs-x509/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/x509-1.6.0.tar.gz) = 939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b
-SIZE (cabal/x509-1.6.0.tar.gz) = 15606
+TIMESTAMP = 1499543706
+SHA256 (cabal/x509-1.6.5.tar.gz) = b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783
+SIZE (cabal/x509-1.6.5.tar.gz) = 16711
diff --git a/shells/hs-shelly/Makefile b/shells/hs-shelly/Makefile
index 0842c9f93caf..0addba3967e0 100644
--- a/shells/hs-shelly/Makefile
+++ b/shells/hs-shelly/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shelly
-PORTVERSION= 1.6.3.3
+PORTVERSION= 1.6.8.3
CATEGORIES= shells haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/shells/hs-shelly/distinfo b/shells/hs-shelly/distinfo
index f56fe9a80398..a8e76eae8851 100644
--- a/shells/hs-shelly/distinfo
+++ b/shells/hs-shelly/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/shelly-1.6.3.3.tar.gz) = 1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c
-SIZE (cabal/shelly-1.6.3.3.tar.gz) = 70187
+TIMESTAMP = 1499624201
+SHA256 (cabal/shelly-1.6.8.3.tar.gz) = 78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487
+SIZE (cabal/shelly-1.6.8.3.tar.gz) = 98086
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 1fb34464c247..d4761e159407 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -452,9 +452,11 @@
SUBDIR += hptcli
SUBDIR += hs-angel
SUBDIR += hs-cpu
+ SUBDIR += hs-disk-free-space
SUBDIR += hs-ekg
SUBDIR += hs-ekg-core
SUBDIR += hs-ekg-json
+ SUBDIR += hs-mountpoints
SUBDIR += htop
SUBDIR += httplog
SUBDIR += hwstat
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 9cce74e71cef..199d28f03847 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= angel
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-angel/distinfo b/sysutils/hs-angel/distinfo
index d36c1adaa37e..0ec38397172a 100644
--- a/sysutils/hs-angel/distinfo
+++ b/sysutils/hs-angel/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624251
SHA256 (cabal/angel-0.6.2.tar.gz) = caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358
SIZE (cabal/angel-0.6.2.tar.gz) = 20745
diff --git a/sysutils/hs-angel/files/patch-src_Angel_Main.hs b/sysutils/hs-angel/files/patch-src_Angel_Main.hs
new file mode 100644
index 000000000000..4c85f31cbff8
--- /dev/null
+++ b/sysutils/hs-angel/files/patch-src_Angel_Main.hs
@@ -0,0 +1,10 @@
+--- src/Angel/Main.hs.orig 2015-07-17 04:07:17 UTC
++++ src/Angel/Main.hs
+@@ -14,6 +14,7 @@ import Control.Concurrent.STM (TVar,
+ newTVarIO)
+ import Control.Monad (forever)
+ import Control.Monad.Reader
++import Data.Monoid
+ import Options.Applicative
+ import System.Environment (getArgs)
+ import System.Exit (exitFailure,
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 0d8c07176284..8049833a94ba 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-cpu/distinfo b/sysutils/hs-cpu/distinfo
index 3b6ceee75ca6..aa3d0b19c7f0 100644
--- a/sysutils/hs-cpu/distinfo
+++ b/sysutils/hs-cpu/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624251
SHA256 (cabal/cpu-0.1.2.tar.gz) = 5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974
SIZE (cabal/cpu-0.1.2.tar.gz) = 4317
diff --git a/sysutils/hs-disk-free-space/Makefile b/sysutils/hs-disk-free-space/Makefile
new file mode 100644
index 000000000000..5a626e6331f2
--- /dev/null
+++ b/sysutils/hs-disk-free-space/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= disk-free-space
+PORTVERSION= 0.1.0.1
+CATEGORIES= sysutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Retrieve information about disk space usage
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/sysutils/hs-disk-free-space/distinfo b/sysutils/hs-disk-free-space/distinfo
new file mode 100644
index 000000000000..116e842064a3
--- /dev/null
+++ b/sysutils/hs-disk-free-space/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501339283
+SHA256 (cabal/disk-free-space-0.1.0.1.tar.gz) = f17a4f9c3b41083ccbb6c11b2debdbc705f86097b7459ff0f46cc01d2692381f
+SIZE (cabal/disk-free-space-0.1.0.1.tar.gz) = 2771
diff --git a/sysutils/hs-disk-free-space/pkg-descr b/sysutils/hs-disk-free-space/pkg-descr
new file mode 100644
index 000000000000..13e09a8cc289
--- /dev/null
+++ b/sysutils/hs-disk-free-space/pkg-descr
@@ -0,0 +1,4 @@
+A cross-platform library for retrieving information about disk space usage.
+
+WWW: http://hackage.haskell.org/package/disk-free-space
+
diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile
index 1035e92832fb..349833a14917 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.0
+PORTVERSION= 0.1.1.1
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo
index ecd1252c09b4..b4761f240d9c 100644
--- a/sysutils/hs-ekg-core/distinfo
+++ b/sysutils/hs-ekg-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ekg-core-0.1.1.0.tar.gz) = 7ba11eb73ad3b906610cc1ae3889543547c48d1b2f4ca68c288bb3f022a7061e
-SIZE (cabal/ekg-core-0.1.1.0.tar.gz) = 12376
+TIMESTAMP = 1499538190
+SHA256 (cabal/ekg-core-0.1.1.1.tar.gz) = 54de3df4b1b027aa2f3760b64f6a8c8134f3275b6d95bf1cf1fc0e74282939d6
+SIZE (cabal/ekg-core-0.1.1.1.tar.gz) = 12426
diff --git a/sysutils/hs-ekg-json/Makefile b/sysutils/hs-ekg-json/Makefile
index fc201e54428a..8457ad3ab36b 100644
--- a/sysutils/hs-ekg-json/Makefile
+++ b/sysutils/hs-ekg-json/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ekg-json
-PORTVERSION= 0.1.0.0
+PORTVERSION= 0.1.0.5
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-json/distinfo b/sysutils/hs-ekg-json/distinfo
index 075e5766815d..b5c864a87566 100644
--- a/sysutils/hs-ekg-json/distinfo
+++ b/sysutils/hs-ekg-json/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ekg-json-0.1.0.0.tar.gz) = 52c455ee7d1b54f530ba9243027e5bb332925589d9209dcdfc24bd16a5a218da
-SIZE (cabal/ekg-json-0.1.0.0.tar.gz) = 2969
+TIMESTAMP = 1499546477
+SHA256 (cabal/ekg-json-0.1.0.5.tar.gz) = 0cd5ecae57a156a5c779acff70d0fa3b02c52cb05283c0effb62a2902ebe8556
+SIZE (cabal/ekg-json-0.1.0.5.tar.gz) = 3092
diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile
index e512e067443a..acae5957ed80 100644
--- a/sysutils/hs-ekg/Makefile
+++ b/sysutils/hs-ekg/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ekg
-PORTVERSION= 0.4.0.8
+PORTVERSION= 0.4.0.13
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg/distinfo b/sysutils/hs-ekg/distinfo
index e44d53de1793..a35492f70bb6 100644
--- a/sysutils/hs-ekg/distinfo
+++ b/sysutils/hs-ekg/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ekg-0.4.0.8.tar.gz) = 5b0488bab3b3b6309d28f3c73fbde65b9b238f0560c58f4d937711b7ca42e832
-SIZE (cabal/ekg-0.4.0.8.tar.gz) = 169806
+TIMESTAMP = 1499624252
+SHA256 (cabal/ekg-0.4.0.13.tar.gz) = 44b1d5987e8d8061aaf05fd96f9072399ba16b07999caf5186e856c7e47bb48f
+SIZE (cabal/ekg-0.4.0.13.tar.gz) = 171231
diff --git a/sysutils/hs-mountpoints/Makefile b/sysutils/hs-mountpoints/Makefile
new file mode 100644
index 000000000000..85c765bdfc26
--- /dev/null
+++ b/sysutils/hs-mountpoints/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= mountpoints
+PORTVERSION= 1.0.2
+CATEGORIES= sysutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= List mount points
+
+LICENSE= LGPL21
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/sysutils/hs-mountpoints/distinfo b/sysutils/hs-mountpoints/distinfo
new file mode 100644
index 000000000000..7ac130ed9df9
--- /dev/null
+++ b/sysutils/hs-mountpoints/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501336383
+SHA256 (cabal/mountpoints-1.0.2.tar.gz) = 67fcdf64fdb8111f58939c64b168a9dfa519d7068e0f439887d739866f18d5c2
+SIZE (cabal/mountpoints-1.0.2.tar.gz) = 13505
diff --git a/sysutils/hs-mountpoints/pkg-descr b/sysutils/hs-mountpoints/pkg-descr
new file mode 100644
index 000000000000..ca1549fd94e3
--- /dev/null
+++ b/sysutils/hs-mountpoints/pkg-descr
@@ -0,0 +1,5 @@
+Lists currently mounted filesystems.
+
+WWW: http://hackage.haskell.org/package/mountpoints
+
+
diff --git a/textproc/Makefile b/textproc/Makefile
index d4c169c92e6e..421cf6731b95 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -250,15 +250,16 @@
SUBDIR += hs-appar
SUBDIR += hs-attoparsec
SUBDIR += hs-attoparsec-enumerator
+ SUBDIR += hs-attoparsec-iso8601
SUBDIR += hs-bencode
SUBDIR += hs-blaze-html
SUBDIR += hs-blaze-markup
SUBDIR += hs-bytestring-csv
SUBDIR += hs-case-insensitive
SUBDIR += hs-cassava
- SUBDIR += hs-citeproc-hs
SUBDIR += hs-cmark
SUBDIR += hs-csv
+ SUBDIR += hs-doctemplates
SUBDIR += hs-double-conversion
SUBDIR += hs-feed
SUBDIR += hs-hexpat
@@ -273,24 +274,31 @@
SUBDIR += hs-lhs2tex
SUBDIR += hs-libxml
SUBDIR += hs-libxml-sax
+ SUBDIR += hs-magic
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-citeproc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
SUBDIR += hs-polyparse
+ SUBDIR += hs-pretty-show
SUBDIR += hs-regex-applicative
SUBDIR += hs-regex-base
SUBDIR += hs-regex-compat
SUBDIR += hs-regex-compat-tdfa
+ SUBDIR += hs-regex-pcre
SUBDIR += hs-regex-pcre-builtin
SUBDIR += hs-regex-posix
SUBDIR += hs-regex-tdfa
SUBDIR += hs-rfc5051
+ SUBDIR += hs-scanner
+ SUBDIR += hs-skylighting
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
SUBDIR += hs-texmath
SUBDIR += hs-uri
+ SUBDIR += hs-uri-bytestring
+ SUBDIR += hs-uri-bytestring-aeson
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
SUBDIR += hs-xml-hamlet
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index ba7b555983e4..6425649b5e60 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 2ccdc931f36c..55cc518b159f 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Diff-0.3.2.tar.gz) = 7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e
-SIZE (cabal/Diff-0.3.2.tar.gz) = 5024
+TIMESTAMP = 1499624823
+SHA256 (cabal/Diff-0.3.4.tar.gz) = 77b7daec5a79ade779706748f11b4d9b8f805e57a68e7406c3b5a1dee16e0c2f
+SIZE (cabal/Diff-0.3.4.tar.gz) = 7979
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index ace511b41381..db3f1117acbe 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.8.3
+PORTVERSION= 0.8.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 0eb54aa720b0..a37a85f96014 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HStringTemplate-0.8.3.tar.gz) = 63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18
-SIZE (cabal/HStringTemplate-0.8.3.tar.gz) = 16023
+TIMESTAMP = 1499538746
+SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd
+SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 045d81955a2a..3268dd6bfd26 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.25.3
+PORTVERSION= 1.25.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 73216a1045e9..99859277fa2a 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HaXml-1.25.3.tar.gz) = 6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7
-SIZE (cabal/HaXml-1.25.3.tar.gz) = 144189
+TIMESTAMP = 1499624824
+SHA256 (cabal/HaXml-1.25.4.tar.gz) = d77467b8c855ba85d900b5d1a9b771aa498c80d570f9ac60a9f10803cfc01db5
+SIZE (cabal/HaXml-1.25.4.tar.gz) = 144571
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index 8d381913032b..1458759bb48f 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-appar/distinfo b/textproc/hs-appar/distinfo
index 4515d2ce6a34..4b91247aed0f 100644
--- a/textproc/hs-appar/distinfo
+++ b/textproc/hs-appar/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/appar-0.1.4.tar.gz) = 58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26
SIZE (cabal/appar-0.1.4.tar.gz) = 3904
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 611794d1f7a7..11f1f0a3b7cf 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 6708037d8d0a..b8ad5e0d6529 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/attoparsec-enumerator-0.3.4.tar.gz) = be95a763ebbec5529f486e62e49ce6709f14e688138fc36cff5590613690f588
SIZE (cabal/attoparsec-enumerator-0.3.4.tar.gz) = 2485
diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile
new file mode 100644
index 000000000000..bc6035096808
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= attoparsec-iso8601
+PORTVERSION= 1.0.0.0
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parsing of ISO 8601 dates
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec base-compat text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-iso8601/distinfo b/textproc/hs-attoparsec-iso8601/distinfo
new file mode 100644
index 000000000000..7dc90ee0fb6d
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/distinfo
@@ -0,0 +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
diff --git a/textproc/hs-attoparsec-iso8601/pkg-descr b/textproc/hs-attoparsec-iso8601/pkg-descr
new file mode 100644
index 000000000000..ea00a4a91ce5
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/pkg-descr
@@ -0,0 +1,3 @@
+Parsing of ISO 8601 dates, originally from aeson.
+
+WWW: http://hackage.haskell.org/package/attoparsec-iso8601
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index bbe0cf042670..fefabec1c924 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.12.1.6
+PORTVERSION= 0.13.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Fast combinator parsing for bytestrings and text
LICENSE= BSD3CLAUSE
-USE_CABAL= scientific>=0.3.1 text>=1.1.1.3
+USE_CABAL= scientific text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index 6ea728661333..d3dbac0e2561 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/attoparsec-0.12.1.6.tar.gz) = ce0bb68c3a232dc981412b44211395ee04b0c18075777c30493d4e0f1edc06a8
-SIZE (cabal/attoparsec-0.12.1.6.tar.gz) = 65300
+TIMESTAMP = 1499537691
+SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64
+SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
index d38d920cfa7c..17c1d61cec4f 100644
--- a/textproc/hs-bencode/Makefile
+++ b/textproc/hs-bencode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bencode
PORTVERSION= 0.6.0.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-bencode/distinfo b/textproc/hs-bencode/distinfo
index 0b636d3c28f7..9825098b75e4 100644
--- a/textproc/hs-bencode/distinfo
+++ b/textproc/hs-bencode/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/bencode-0.6.0.0.tar.gz) = 3b8efdfecee9bc486d9bcdbb633b7128ca235360f102478a7e0f8c895281f68a
SIZE (cabal/bencode-0.6.0.0.tar.gz) = 4622
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index a351c303092d..7375bdb9b91b 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.8.1.0
+PORTVERSION= 0.9.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 167b0baad58a..2e0b57124cef 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-html-0.8.1.0.tar.gz) = fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31
-SIZE (cabal/blaze-html-0.8.1.0.tar.gz) = 76151
+TIMESTAMP = 1499624824
+SHA256 (cabal/blaze-html-0.9.0.1.tar.gz) = aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64
+SIZE (cabal/blaze-html-0.9.0.1.tar.gz) = 78133
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index c7d3d623b67f..4d95ed195dae 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.7.0.2
+PORTVERSION= 0.8.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index cf064dba4ecc..916db7997dbb 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-markup-0.7.0.2.tar.gz) = e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c
-SIZE (cabal/blaze-markup-0.7.0.2.tar.gz) = 13440
+TIMESTAMP = 1499624825
+SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f
+SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 924cf6cd8d10..07233d25239c 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= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-bytestring-csv/distinfo b/textproc/hs-bytestring-csv/distinfo
index 08fe78053e97..e248f9880483 100644
--- a/textproc/hs-bytestring-csv/distinfo
+++ b/textproc/hs-bytestring-csv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624825
SHA256 (cabal/bytestring-csv-0.1.2.tar.gz) = 19480f2f60c474b18ef507a657daa63b18a40f97a3171883cf9d4b33169df874
SIZE (cabal/bytestring-csv-0.1.2.tar.gz) = 76022
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index d27d846d5fd0..42ac06507fc0 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.2.0.4
+PORTVERSION= 1.2.0.10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index d86563098002..98fbd8a51042 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/case-insensitive-1.2.0.4.tar.gz) = 63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e
-SIZE (cabal/case-insensitive-1.2.0.4.tar.gz) = 53377
+TIMESTAMP = 1499445486
+SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c
+SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
index 5a7f25e28925..1a1f4926e83c 100644
--- a/textproc/hs-cassava/Makefile
+++ b/textproc/hs-cassava/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cassava
-PORTVERSION= 0.4.3.1
+PORTVERSION= 0.5.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= CSV parsing and encoding library
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.2 blaze-builder hashable text \
+USE_CABAL= attoparsec blaze-builder hashable Only text text-short \
unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo
index e8bf358a4254..52788632d2dc 100644
--- a/textproc/hs-cassava/distinfo
+++ b/textproc/hs-cassava/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cassava-0.4.3.1.tar.gz) = e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac
-SIZE (cabal/cassava-0.4.3.1.tar.gz) = 31922
+TIMESTAMP = 1499538420
+SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9
+SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
deleted file mode 100644
index 4aea96d09ef7..000000000000
--- a/textproc/hs-citeproc-hs/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= citeproc-hs
-PORTVERSION= 0.3.10
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Citation Style Language implementation in Haskell
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-
-FLAGS_DEFINE= BIBUTILS EMBED_DATA HEXPAT NETWORK UNICODE_COLLATION
-FLAGS_DEFAULT= BIBUTILS HEXPAT NETWORK
-
-BIBUTILS_DESC= Use Chris Putnam's Bibutils
-BIBUTILS_FLAG_ENABLE= bibutils
-BIBUTILS_FLAG_CABAL= hs-bibutils>=0.3
-
-EMBED_DATA_DESC= Embed locale files into the library
-EMBED_DATA_FLAG_ENABLE= embed_data_files
-EMBED_DATA_FLAG_CABAL= file-embed
-
-HEXPAT_DESC= Use hexpat to parse XML
-HEXPAT_FLAG_ENABLE= hexpat
-HEXPAT_FLAG_CABAL= hexpat>=0.20.2
-
-NETWORK_DESC= Use network and HTTP to retrieve CSL file
-NETWORK_FLAG_ENABLE= network
-NETWORK_FLAG_CABAL= HTTP>=4000.0.9 network>=2.6 network-uri>=2.6
-
-UNICODE_COLLATION_DESC= Use bindings to the ICU libraries
-UNICODE_COLLATION_FLAG_ENABLE= unicode_collation
-UNICODE_COLLATION_FLAG_CABAL= text text-icu
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
deleted file mode 100644
index 3af462d1c746..000000000000
--- a/textproc/hs-citeproc-hs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/citeproc-hs-0.3.10.tar.gz) = 1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9
-SIZE (cabal/citeproc-hs-0.3.10.tar.gz) = 115588
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
deleted file mode 100644
index dc6be7f658d1..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/Text/CSL/Eval.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Eval.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Text.CSL.Eval
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
deleted file mode 100644
index 750e9767af0c..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/Text/CSL/Eval/Names.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Eval/Names.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Text.CSL.Eval.Names
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
deleted file mode 100644
index 16eb7ba2cbb2..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Text/CSL/Test.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Test.hs
-@@ -29,7 +29,6 @@ import Data.List
- import Data.Maybe (isJust)
- import Data.Time
- import System.Directory
--import System.Locale
-
- import Text.ParserCombinators.Parsec
-
diff --git a/textproc/hs-citeproc-hs/pkg-descr b/textproc/hs-citeproc-hs/pkg-descr
deleted file mode 100644
index dbdad31bf085..000000000000
--- a/textproc/hs-citeproc-hs/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-citeproc-hs is a library for rendering bibliographic reference citations
-into a variety of styles using a macro language called Citation Style
-Language (CSL) [1].
-
-[1] http://xbiblio.sourceforge.net/
-
-WWW: http://istitutocolli.org/repos/citeproc-hs/
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
index 63c40dbb29ff..101c4a05f700 100644
--- a/textproc/hs-cmark/Makefile
+++ b/textproc/hs-cmark/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmark
-PORTVERSION= 0.4.0.1
+PORTVERSION= 0.5.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo
index c9f34b62d3ab..0315db4a3824 100644
--- a/textproc/hs-cmark/distinfo
+++ b/textproc/hs-cmark/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cmark-0.4.0.1.tar.gz) = 638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce
-SIZE (cabal/cmark-0.4.0.1.tar.gz) = 175936
+TIMESTAMP = 1499448212
+SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d
+SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 673e8b5faa6e..2c58ad659877 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-csv/distinfo b/textproc/hs-csv/distinfo
index 17dfba59eaeb..b8c499c11b12 100644
--- a/textproc/hs-csv/distinfo
+++ b/textproc/hs-csv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624827
SHA256 (cabal/csv-0.1.2.tar.gz) = 8cf43442325faa1368f9b55ad952beccf677d9980cdffa3d70a7f204a23ae600
SIZE (cabal/csv-0.1.2.tar.gz) = 2923
diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile
new file mode 100644
index 000000000000..4b931d33a871
--- /dev/null
+++ b/textproc/hs-doctemplates/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= doctemplates
+PORTVERSION= 0.1.0.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The doctemplates package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \
+ unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-doctemplates/distinfo b/textproc/hs-doctemplates/distinfo
new file mode 100644
index 000000000000..887a63e2ac97
--- /dev/null
+++ b/textproc/hs-doctemplates/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720884
+SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b
+SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924
diff --git a/textproc/hs-doctemplates/pkg-descr b/textproc/hs-doctemplates/pkg-descr
new file mode 100644
index 000000000000..391688f9983a
--- /dev/null
+++ b/textproc/hs-doctemplates/pkg-descr
@@ -0,0 +1,3 @@
+The doctemplates package
+
+WWW: http://hackage.haskell.org/package/doctemplates
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 2628827a08a8..340ea7d57e5e 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= double-conversion
-PORTVERSION= 2.0.1.0
+PORTVERSION= 2.0.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index c50f94df7cc0..d7bfcd4661c2 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/double-conversion-2.0.1.0.tar.gz) = 0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c
-SIZE (cabal/double-conversion-2.0.1.0.tar.gz) = 7023237
+TIMESTAMP = 1499624828
+SHA256 (cabal/double-conversion-2.0.2.0.tar.gz) = 44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b
+SIZE (cabal/double-conversion-2.0.2.0.tar.gz) = 7023616
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index ea53f0323e50..fcf099403bc6 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.10.0
+PORTVERSION= 0.3.12.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 97525cfe27bc..2925abf966f1 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/feed-0.3.10.0.tar.gz) = 74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094
-SIZE (cabal/feed-0.3.10.0.tar.gz) = 76124
+TIMESTAMP = 1499538656
+SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942
+SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index ff2dd465db08..98fa3c1bff6a 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.9
+PORTVERSION= 0.20.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,6 +9,8 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD3CLAUSE
+LIB_DEPENDS= libexpat.so:textproc/expat2
+
USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 1104bb363362..2acbde20242d 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hexpat-0.20.9.tar.gz) = 5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d
-SIZE (cabal/hexpat-0.20.9.tar.gz) = 132649
+TIMESTAMP = 1499624829
+SHA256 (cabal/hexpat-0.20.13.tar.gz) = 46e1a0e651c1603c1f064c6ca8d4c66cb27e7a66974bfb45ecaa8f9ccc753fd1
+SIZE (cabal/hexpat-0.20.13.tar.gz) = 143733
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 85b83af1af32..baf3691af49a 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.6
+PORTVERSION= 0.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 35cc42038df2..868fbb78a72c 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/highlighting-kate-0.6.tar.gz) = b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398
-SIZE (cabal/highlighting-kate-0.6.tar.gz) = 922847
+TIMESTAMP = 1499624830
+SHA256 (cabal/highlighting-kate-0.6.4.tar.gz) = d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf
+SIZE (cabal/highlighting-kate-0.6.4.tar.gz) = 913575
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 0cab1e280959..eb7a0b3e1c92 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hs-bibutils
PORTVERSION= 5.5
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index c9101693408d..99260edc6f99 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624830
SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d
SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index aca81c22294f..d8d75c798a21 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index eb8e07c6f26c..de9512724c3b 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/html-conduit-1.2.0.tar.gz) = 751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a
-SIZE (cabal/html-conduit-1.2.0.tar.gz) = 3905
+TIMESTAMP = 1499624831
+SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8
+SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125
diff --git a/textproc/hs-html-conduit/files/patch-html-conduit.cabal b/textproc/hs-html-conduit/files/patch-html-conduit.cabal
new file mode 100644
index 000000000000..ae600cca1aca
--- /dev/null
+++ b/textproc/hs-html-conduit/files/patch-html-conduit.cabal
@@ -0,0 +1,11 @@
+--- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC
++++ html-conduit.cabal
+@@ -22,7 +22,7 @@ Library
+ , resourcet >= 0.3 && < 1.2
+ , conduit >= 1.0 && < 1.3
+ , conduit-extra >= 1.1.1
+- , xml-conduit >= 1.3 && < 1.5
++ , xml-conduit >= 1.3 && < 1.6
+ , tagstream-conduit >= 0.5.5.3 && < 0.6
+ , xml-types >= 0.3 && < 0.4
+
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 6d21a027c4bb..00b46aa3ab10 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html/distinfo b/textproc/hs-html/distinfo
index 88edbd8ed597..63111f5c8833 100644
--- a/textproc/hs-html/distinfo
+++ b/textproc/hs-html/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624830
SHA256 (cabal/html-1.0.1.2.tar.gz) = 0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061
SIZE (cabal/html-1.0.1.2.tar.gz) = 11021
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index dc4788c86400..dcfbedadbe10 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.2.0.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index a5398a66046b..bf192261e80c 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624832
SHA256 (cabal/hxt-charproperties-9.2.0.1.tar.gz) = e46614d6bf0390b2a6a1aeeb0771e6d366944da40fb21c12c2f8a94d1f47b4d6
SIZE (cabal/hxt-charproperties-9.2.0.1.tar.gz) = 270767
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 1f968d45464a..bacca8556649 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-regex-xmlschema
-PORTVERSION= 9.2.0.2
+PORTVERSION= 9.2.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index d67f45004f30..4d26a802b048 100644
--- a/textproc/hs-hxt-regex-xmlschema/distinfo
+++ b/textproc/hs-hxt-regex-xmlschema/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2
-SIZE (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 35896
+TIMESTAMP = 1499624833
+SHA256 (cabal/hxt-regex-xmlschema-9.2.0.3.tar.gz) = f4743ba65498d6001cdfcf5cbc3317d4bc43941be5c7030b60beb83408c892b0
+SIZE (cabal/hxt-regex-xmlschema-9.2.0.3.tar.gz) = 35781
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 48f3806a5f11..3791ff828f3b 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index ae28ab31dd61..c670ff7d707c 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624833
SHA256 (cabal/hxt-unicode-9.0.2.4.tar.gz) = 7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466
SIZE (cabal/hxt-unicode-9.0.2.4.tar.gz) = 14010
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index d69aaf0ba9de..196abf0e195b 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.15
+PORTVERSION= 9.3.1.16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index 1b79cee1a4a5..5504031e5c18 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hxt-9.3.1.15.tar.gz) = 723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560
-SIZE (cabal/hxt-9.3.1.15.tar.gz) = 235096
+TIMESTAMP = 1499624832
+SHA256 (cabal/hxt-9.3.1.16.tar.gz) = 0d55e35cc718891d0987b7c8e6c43499efa727c68bc92e88e8b99461dff403e3
+SIZE (cabal/hxt-9.3.1.16.tar.gz) = 223814
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 1272528ce52d..04f28bd4e9b7 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.19
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index e5145cace428..a9984180aefe 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624833
SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e
SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index 3f787ea2cb5c..663962e6866f 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= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml-sax/distinfo b/textproc/hs-libxml-sax/distinfo
index 3b51b84ab854..2cc7158149e0 100644
--- a/textproc/hs-libxml-sax/distinfo
+++ b/textproc/hs-libxml-sax/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624834
SHA256 (cabal/libxml-sax-0.7.5.tar.gz) = 99141784cc0d6c5749f0df618b2d46922391eede09f4f9ccfc36fb58a9c16d51
SIZE (cabal/libxml-sax-0.7.5.tar.gz) = 8916
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index e92cd1af4179..87d20c26c1c5 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/distinfo b/textproc/hs-libxml/distinfo
index 6cac89f65758..ecaedf942aae 100644
--- a/textproc/hs-libxml/distinfo
+++ b/textproc/hs-libxml/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624834
SHA256 (cabal/libxml-0.1.1.tar.gz) = d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07
SIZE (cabal/libxml-0.1.1.tar.gz) = 3959
diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile
new file mode 100644
index 000000000000..6bce86ce7b18
--- /dev/null
+++ b/textproc/hs-magic/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= magic
+PORTVERSION= 1.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Interface to C file/magic library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-magic/distinfo b/textproc/hs-magic/distinfo
new file mode 100644
index 000000000000..0bf125a6066c
--- /dev/null
+++ b/textproc/hs-magic/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501338939
+SHA256 (cabal/magic-1.1.tar.gz) = b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082
+SIZE (cabal/magic-1.1.tar.gz) = 4318
diff --git a/textproc/hs-magic/pkg-descr b/textproc/hs-magic/pkg-descr
new file mode 100644
index 000000000000..649a5ccb2bca
--- /dev/null
+++ b/textproc/hs-magic/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a Haskell interface to the C libmagic library. With it,
+you can determine the type of a file by examining its contents rather than its
+name. The Haskell interface provides a full-featured binding.
+
+WWW: http://hackage.haskell.org/package/magic
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
index 9e6530049fa5..6b08a9b70e6f 100644
--- a/textproc/hs-pandoc-citeproc/Makefile
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-citeproc
-PORTVERSION= 0.7.3.1
+PORTVERSION= 0.10.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
index e6a2590db074..83916a3d8e09 100644
--- a/textproc/hs-pandoc-citeproc/distinfo
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = b2e9b814603dbb60b845fa14d767a154e43a2115a9a81b218a173e9bc1a319f5
-SIZE (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = 298737
+TIMESTAMP = 1499624836
+SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783
+SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993
diff --git a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
new file mode 100644
index 000000000000..26a28052b0e3
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
@@ -0,0 +1,38 @@
+--- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC
++++ pandoc-citeproc.cabal
+@@ -99,7 +99,7 @@ library
+ ghc-prof-options: -fprof-auto-exported
+ build-depends: containers, directory, mtl,
+ bytestring, filepath,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ tagsoup,
+ aeson >= 0.7 && < 1.3,
+@@ -146,7 +146,7 @@ executable pandoc-citeproc
+ ghc-options: -funbox-strict-fields -Wall
+ ghc-prof-options: -fprof-auto-exported -rtsopts
+ build-depends: base >= 4, pandoc-citeproc,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ aeson,
+ aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text,
+@@ -169,7 +169,7 @@ executable test-citeproc
+ else
+ Buildable: False
+ build-depends: base >= 4, aeson, directory, text, mtl,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ filepath,
+ bytestring, pandoc-citeproc, process, temporary >= 1.1,
+@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc
+ Prelude
+ Hs-Source-Dirs: tests, prelude, compat
+ build-depends: base >= 4, aeson, directory, text,
+- pandoc-types >= 1.16 && < 1.18, mtl,
++ pandoc-types >= 1.16 && < 1.20, mtl,
+ pandoc >= 1.16 && < 2.1, filepath,
+ bytestring, pandoc-citeproc, process, temporary >= 1.1,
+ yaml >= 0.8.8.7
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index fd7fc328b7af..1f0f08cfd785 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.12.4.5
+PORTVERSION= 1.19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Types for representing a structured document
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 syb>=0.1
+USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 QuickCheck syb>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 98ee34051a69..76620ce18f88 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-types-1.12.4.5.tar.gz) = 87a1db206be3eccd2e66518363340e90e7592d8e82e2a5f006620cd3e1ac877b
-SIZE (cabal/pandoc-types-1.12.4.5.tar.gz) = 13341
+TIMESTAMP = 1499543994
+SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf
+SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942
diff --git a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
new file mode 100644
index 000000000000..e8741ae401d4
--- /dev/null
+++ b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
@@ -0,0 +1,24 @@
+--- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC
++++ pandoc-types.cabal
+@@ -48,10 +48,10 @@ Library
+ Other-modules: Paths_pandoc_types
+ Build-depends: base >= 4 && < 5,
+ containers >= 0.3,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ ghc-prim >= 0.2,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.6.2 && < 1.2,
++ aeson >= 0.6.2 && < 1.3,
+ QuickCheck >= 2
+ if impl(ghc < 7.10)
+ Build-depends: deepseq-generics >= 0.1 && < 0.2
+@@ -65,7 +65,7 @@ test-suite test-pandoc-types
+ build-depends: base,
+ pandoc-types,
+ syb,
+- aeson >= 0.6.2 && < 1.2,
++ aeson >= 0.6.2 && < 1.3,
+ containers >= 0.3,
+ bytestring >= 0.9 && < 0.11,
+ test-framework >= 0.3 && < 0.9,
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index b9ba79d552d2..c70f46edcd98 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.15.0.6
-PORTREVISION= 1
+PORTVERSION= 1.19.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,16 +10,16 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= aeson>=0.7.0.5 base64-bytestring>=0.1 blaze-html>=0.5 \
- blaze-markup>=0.5.1 cmark>=0.4.0.1 data-default>=0.4 \
- deepseq-generics>=0.1 extensible-exceptions>=0.1 \
- filemanip>=0.3 haddock-library>=1.1 highlighting-kate>=0.6 \
- hslua>=0.3 HTTP>=4000.0.5 JuicyPixels>=3.1.6.1 mtl>=1.1 \
- network>=2.6 network-uri>=2.6 pandoc-types>=1.12.4 parsec>=3.1 \
- random>=1 scientific>=0.2 SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 \
- temporary>=1.1 texmath>=0.8.1 text>=0.11 \
- unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
- yaml>=0.8.8.2 zip-archive>=0.2.3.4 zlib>=0.5
+USE_CABAL= aeson base64-bytestring blaze-html \
+ blaze-markup cmark data-default \
+ deepseq-generics doctemplates extensible-exceptions \
+ filemanip haddock-library highlighting-kate \
+ hslua HTTP JuicyPixels mtl \
+ network network-uri pandoc-types parsec \
+ random scientific SHA skylighting syb tagsoup\
+ temporary texmath text \
+ unordered-containers vector xml \
+ yaml zip-archive zlib
USE_ALEX= yes
USE_HAPPY= yes
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index d7c721bc1184..5f38ab8379a5 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-1.15.0.6.tar.gz) = d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46
-SIZE (cabal/pandoc-1.15.0.6.tar.gz) = 2049870
+TIMESTAMP = 1499624835
+SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801
+SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
new file mode 100644
index 000000000000..07d92a10932a
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -0,0 +1,83 @@
+--- pandoc.cabal.orig 2017-01-31 15:02:20 UTC
++++ pandoc.cabal
+@@ -253,7 +253,7 @@ Flag old-locale
+
+ Library
+ Build-Depends: base >= 4.7 && <5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ containers >= 0.1 && < 0.6,
+ unordered-containers >= 0.2 && < 0.3,
+ array >= 0.3 && < 0.6,
+@@ -270,12 +270,12 @@ Library
+ xml >= 1.3.12 && < 1.4,
+ random >= 1 && < 1.2,
+ extensible-exceptions >= 0.1 && < 0.2,
+- pandoc-types >= 1.17 && < 1.18,
+- aeson >= 0.7 && < 1.2,
++ pandoc-types >= 1.17 && < 1.20,
++ aeson >= 0.7 && < 1.3,
+ tagsoup >= 0.13.7 && < 0.15,
+ base64-bytestring >= 0.1 && < 1.1,
+ zlib >= 0.5 && < 0.7,
+- skylighting >= 0.1.1.4 && < 0.2,
++ skylighting >= 0.1.1.4 && < 0.4,
+ data-default >= 0.4 && < 0.8,
+ temporary >= 1.1 && < 1.3,
+ blaze-html >= 0.5 && < 0.10,
+@@ -283,7 +283,7 @@ Library
+ yaml >= 0.8.8.2 && < 0.9,
+ scientific >= 0.2 && < 0.4,
+ vector >= 0.10 && < 0.13,
+- hslua >= 0.3 && < 0.5,
++ hslua >= 0.3 && < 0.6,
+ binary >= 0.5 && < 0.9,
+ SHA >= 1.6 && < 1.7,
+ haddock-library >= 1.1 && < 1.5,
+@@ -424,15 +424,15 @@ Library
+
+ Executable pandoc
+ Build-Depends: pandoc,
+- pandoc-types >= 1.17 && < 1.18,
++ pandoc-types >= 1.17 && < 1.20,
+ base >= 4.2 && <5,
+ directory >= 1.2 && < 1.4,
+ filepath >= 1.1 && < 1.5,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+ extensible-exceptions >= 0.1 && < 0.2,
+- skylighting >= 0.1.1.3 && < 0.2,
+- aeson >= 0.7.0.5 && < 1.2,
++ skylighting >= 0.1.1.3 && < 0.4,
++ aeson >= 0.7.0.5 && < 1.3,
+ yaml >= 0.8.8.2 && < 0.9,
+ containers >= 0.1 && < 0.6,
+ HTTP >= 4000.0.5 && < 4000.4
+@@ -498,15 +498,15 @@ Test-Suite test-pandoc
+ Hs-Source-Dirs: prelude
+ Other-Modules: Prelude
+ Build-Depends: base >= 4.2 && < 5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ pandoc,
+- pandoc-types >= 1.17 && < 1.18,
++ pandoc-types >= 1.17 && < 1.20,
+ bytestring >= 0.9 && < 0.11,
+ text >= 0.11 && < 1.3,
+ directory >= 1 && < 1.4,
+ filepath >= 1.1 && < 1.5,
+ process >= 1 && < 1.5,
+- skylighting >= 0.1.1.3 && < 0.2,
++ skylighting >= 0.1.1.3 && < 0.4,
+ Diff >= 0.2 && < 0.4,
+ test-framework >= 0.3 && < 0.9,
+ test-framework-hunit >= 0.2 && < 0.4,
+@@ -553,7 +553,7 @@ benchmark benchmark-pandoc
+ Other-Modules: Prelude
+ Build-Depends: pandoc,
+ base >= 4.2 && < 5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ criterion >= 1.0 && < 1.2
+ Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
+ Default-Language: Haskell98
diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
new file mode 100644
index 000000000000..648d7ffa890d
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
@@ -0,0 +1,14 @@
+--- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC
++++ src/Text/Pandoc/Writers/Custom.hs
+@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do
+ setForeignEncoding utf8
+ lua <- Lua.newstate
+ Lua.openlibs lua
++#if MIN_VERSION_hslua(0,5,0)
++ status <- Lua.loadstring lua luaScript
++#else
+ status <- Lua.loadstring lua luaScript luaFile
++#endif
+ -- check for error in lua script (later we'll change the return type
+ -- to handle this more gracefully):
+ when (status /= 0) $
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 34c98c03e1c9..1738037d7104 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.9
+PORTVERSION= 3.1.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index baf11e9f3f50..53ec58aa1cb3 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/parsec-3.1.9.tar.gz) = 71f711d24c89581a43b8bc2d3ed56a1a802bbf1cd0b083bc34636c232b0342c9
-SIZE (cabal/parsec-3.1.9.tar.gz) = 29668
+TIMESTAMP = 1499618976
+SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e
+SIZE (cabal/parsec-3.1.11.tar.gz) = 32412
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 00f428004892..6137b288c30c 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.11
+PORTVERSION= 1.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index 11bf8d704d76..e088304f8c8d 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/polyparse-1.11.tar.gz) = 30ef045a25bd7de0f3507ed1161aab35b5711120d315b15f23558205903b81fc
-SIZE (cabal/polyparse-1.11.tar.gz) = 22978
+TIMESTAMP = 1499543355
+SHA256 (cabal/polyparse-1.12.tar.gz) = f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15
+SIZE (cabal/polyparse-1.12.tar.gz) = 32625
diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile
new file mode 100644
index 000000000000..8e877c5a7a41
--- /dev/null
+++ b/textproc/hs-pretty-show/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= pretty-show
+PORTVERSION= 1.6.13
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Library and an executable for working with derived Show instances
+
+LICENSE= BSD3CLAUSE
+
+EXECUTABLE= ppsh
+USE_CABAL= happy haskell-lexer
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-pretty-show/distinfo b/textproc/hs-pretty-show/distinfo
new file mode 100644
index 000000000000..2dc39c2a8127
--- /dev/null
+++ b/textproc/hs-pretty-show/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720300
+SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd
+SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057
diff --git a/textproc/hs-pretty-show/pkg-descr b/textproc/hs-pretty-show/pkg-descr
new file mode 100644
index 000000000000..93778b2fd703
--- /dev/null
+++ b/textproc/hs-pretty-show/pkg-descr
@@ -0,0 +1,8 @@
+We provide a library and an executable for working with derived Show instances.
+By using the library, we can parse derived Show instances into a generic data
+structure. The ppsh tool uses the library to produce human-readable versions
+of Show instances, which can be quite handy for debugging Haskell programs.
+We can also render complex generic values into an interactive Html page, for
+easier examination.
+
+WWW: http://hackage.haskell.org/package/pretty-show
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
index 4389083f0f9f..a24ea567442e 100644
--- a/textproc/hs-regex-applicative/Makefile
+++ b/textproc/hs-regex-applicative/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= regex-applicative
-PORTVERSION= 0.3.2.1
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-applicative/distinfo b/textproc/hs-regex-applicative/distinfo
index cb736c1f7bad..ca56876d0a63 100644
--- a/textproc/hs-regex-applicative/distinfo
+++ b/textproc/hs-regex-applicative/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/regex-applicative-0.3.2.1.tar.gz) = bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7
-SIZE (cabal/regex-applicative-0.3.2.1.tar.gz) = 13531
+TIMESTAMP = 1499624837
+SHA256 (cabal/regex-applicative-0.3.3.tar.gz) = 6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6
+SIZE (cabal/regex-applicative-0.3.3.tar.gz) = 13834
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index ffadc671e937..c32dab9846d7 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= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/distinfo b/textproc/hs-regex-base/distinfo
index ceb964b610d7..9f7f328d1810 100644
--- a/textproc/hs-regex-base/distinfo
+++ b/textproc/hs-regex-base/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-base-0.93.2.tar.gz) = 20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278
SIZE (cabal/regex-base-0.93.2.tar.gz) = 9156
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
index 8b500fad2728..b86c99243851 100644
--- a/textproc/hs-regex-compat-tdfa/Makefile
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -2,6 +2,7 @@
PORTNAME= regex-compat-tdfa
PORTVERSION= 0.95.1.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/distinfo b/textproc/hs-regex-compat-tdfa/distinfo
index 99cbafe9490d..6619679b7a86 100644
--- a/textproc/hs-regex-compat-tdfa/distinfo
+++ b/textproc/hs-regex-compat-tdfa/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4fa38ed24ae390eeffe6eef04bbe632d7ecd02b9123729e976e7420f927520dd
SIZE (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4146
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 4c3e09b9969e..41adb030b8f1 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= 12
+PORTREVISION= 13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/distinfo b/textproc/hs-regex-compat/distinfo
index e8ec88fa9595..8ef98aa8233d 100644
--- a/textproc/hs-regex-compat/distinfo
+++ b/textproc/hs-regex-compat/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-compat-0.95.1.tar.gz) = d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b
SIZE (cabal/regex-compat-0.95.1.tar.gz) = 3968
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 97976c6f36ce..316d18603094 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= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 55054846dcae..2630851b004d 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/regex-pcre-builtin-0.94.4.8.8.35.tar.gz) = 0bd1b695de953ba4b6e6e0de007021c346cb2a6c8e09356fbcd34f8a79d2ea78
SIZE (cabal/regex-pcre-builtin-0.94.4.8.8.35.tar.gz) = 311974
diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile
new file mode 100644
index 000000000000..7e1c9c3e2901
--- /dev/null
+++ b/textproc/hs-regex-pcre/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= regex-pcre
+PORTVERSION= 0.94.4
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The PCRE backend to accompany regex-base
+
+LICENSE= BSD3CLAUSE
+
+LIB_DEPENDS= libpcre.so:devel/pcre
+
+USE_CABAL= regex-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-pcre/distinfo b/textproc/hs-regex-pcre/distinfo
new file mode 100644
index 000000000000..fd1ae7f9bd6a
--- /dev/null
+++ b/textproc/hs-regex-pcre/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720826
+SHA256 (cabal/regex-pcre-0.94.4.tar.gz) = 8eaa7d4ac6c0a4ba35aa59fc3f6b8f8e252bb25a47e136791446a74752e226c0
+SIZE (cabal/regex-pcre-0.94.4.tar.gz) = 10814
diff --git a/textproc/hs-regex-pcre/pkg-descr b/textproc/hs-regex-pcre/pkg-descr
new file mode 100644
index 000000000000..ef17ff4156db
--- /dev/null
+++ b/textproc/hs-regex-pcre/pkg-descr
@@ -0,0 +1,3 @@
+The PCRE backend to accompany regex-base, see www.pcre.org
+
+WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 964f3b73eb3e..2865f1487090 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= 9
+PORTREVISION= 10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/distinfo b/textproc/hs-regex-posix/distinfo
index 682ee5aeb002..7a7ca5732819 100644
--- a/textproc/hs-regex-posix/distinfo
+++ b/textproc/hs-regex-posix/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/regex-posix-0.95.2.tar.gz) = 56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e
SIZE (cabal/regex-posix-0.95.2.tar.gz) = 42916
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index c277e50c74e3..be5db6ca4458 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTVERSION= 1.2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 7a01b8d1a802..7d1d6321a459 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/regex-tdfa-1.2.0.tar.gz) = fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401
-SIZE (cabal/regex-tdfa-1.2.0.tar.gz) = 66039
+TIMESTAMP = 1499624838
+SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39
+SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
index 20b580f4e146..05ac6c340086 100644
--- a/textproc/hs-rfc5051/Makefile
+++ b/textproc/hs-rfc5051/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rfc5051
PORTVERSION= 0.1.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-rfc5051/distinfo b/textproc/hs-rfc5051/distinfo
index 938c8e05af87..306f3d784f9f 100644
--- a/textproc/hs-rfc5051/distinfo
+++ b/textproc/hs-rfc5051/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/rfc5051-0.1.0.3.tar.gz) = e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b
SIZE (cabal/rfc5051-0.1.0.3.tar.gz) = 217935
diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile
new file mode 100644
index 000000000000..ec417600e82d
--- /dev/null
+++ b/textproc/hs-scanner/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= scanner
+PORTVERSION= 0.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parser combinator library designed to be fast
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-scanner/distinfo b/textproc/hs-scanner/distinfo
new file mode 100644
index 000000000000..70ef56e0020a
--- /dev/null
+++ b/textproc/hs-scanner/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499620390
+SHA256 (cabal/scanner-0.2.tar.gz) = 3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9
+SIZE (cabal/scanner-0.2.tar.gz) = 38735
diff --git a/textproc/hs-scanner/pkg-descr b/textproc/hs-scanner/pkg-descr
new file mode 100644
index 000000000000..21807ac1f61d
--- /dev/null
+++ b/textproc/hs-scanner/pkg-descr
@@ -0,0 +1,3 @@
+Parser combinator library designed to be fast. It doesn't support backtracking.
+
+WWW: https://hackage.haskell.org/package/scanner
diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile
new file mode 100644
index 000000000000..2b5436f29295
--- /dev/null
+++ b/textproc/hs-skylighting/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= skylighting
+PORTVERSION= 0.3.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Syntax highlighting library with support for over one hundred languages
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \
+ pretty-show regex-pcre regex-pcre-builtin safe text utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo
new file mode 100644
index 000000000000..59a31d6dcf35
--- /dev/null
+++ b/textproc/hs-skylighting/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499717353
+SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57
+SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631
diff --git a/textproc/hs-skylighting/pkg-descr b/textproc/hs-skylighting/pkg-descr
new file mode 100644
index 000000000000..1af3090ca07f
--- /dev/null
+++ b/textproc/hs-skylighting/pkg-descr
@@ -0,0 +1,7 @@
+Skylighting is a syntax highlighting library with support for over one hundred
+languages. It derives its tokenizers from XML syntax definitions used by KDE's
+KSyntaxHighlighting framework, so any syntax supported by that framework can be
+added. An optional command-line program is provided. Skylighting is intended to
+be the successor to highlighting-kate.
+
+WWW: http://hackage.haskell.org/package/skylighting
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 28d487c75f5a..e0aa11a22726 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index 6bf8d5b2a604..ca07c62d3bdf 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/stringsearch-0.3.6.6.tar.gz) = 295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a
SIZE (cabal/stringsearch-0.3.6.6.tar.gz) = 39679
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index fee650e24b58..92e2adc9bdca 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.13.3
+PORTVERSION= 0.14.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 8a4c501af16d..653cf16d5021 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tagsoup-0.13.3.tar.gz) = 32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d
-SIZE (cabal/tagsoup-0.13.3.tar.gz) = 42279
+TIMESTAMP = 1499624839
+SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb
+SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 0e3d7a58f096..92116b096b90 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.5.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index 8f1a799e4a18..5f332dbf6428 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624839
SHA256 (cabal/tagstream-conduit-0.5.5.3.tar.gz) = b296e8f0ba18ae951b5bb3fc2d9d964954666df61ea9363d667f251af17134ab
SIZE (cabal/tagstream-conduit-0.5.5.3.tar.gz) = 9813
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 4ff2f905816e..3ff44c527cb4 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.8.3
+PORTVERSION= 0.9.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT= Conversion between formats used to represent mathematics
LICENSE= GPLv2
-USE_CABAL= aeson mtl network>=2.6 network-uri>=2.6 \
- pandoc-types>=1.12.3.3 parsec>=3 syb text xml
+USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \
+ syb text xml
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= executable
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 34e754c60b68..d300fd4ee54b 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/texmath-0.8.3.tar.gz) = 553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34
-SIZE (cabal/texmath-0.8.3.tar.gz) = 1599129
+TIMESTAMP = 1499624840
+SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04
+SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730
diff --git a/textproc/hs-texmath/files/patch-texmath.cabal b/textproc/hs-texmath/files/patch-texmath.cabal
new file mode 100644
index 000000000000..f1f846076b26
--- /dev/null
+++ b/textproc/hs-texmath/files/patch-texmath.cabal
@@ -0,0 +1,20 @@
+--- texmath.cabal.orig 2017-07-10 15:55:23 UTC
++++ texmath.cabal
+@@ -87,7 +87,7 @@ Flag network-uri
+
+ Library
+ Build-depends: xml, parsec >= 3, containers,
+- pandoc-types >= 1.12.3.3 && < 1.18, mtl
++ pandoc-types >= 1.12.3.3 , mtl
+ if impl(ghc >= 6.10)
+ Build-depends: base >= 4.5 && < 5, syb
+ else
+@@ -141,7 +141,7 @@ Executable texmath
+ if flag(executable)
+ Buildable: True
+ Build-Depends: base >= 4.5 && < 5, texmath, xml,
+- pandoc-types >= 1.12.3.3 && < 1.18,
++ pandoc-types >= 1.12.3.3 ,
+ split, aeson, bytestring, text
+ else
+ Buildable: False
diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile
new file mode 100644
index 000000000000..ce3c41b1e6de
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri-bytestring-aeson
+PORTVERSION= 0.1.0.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The uri-bytestring-aeson package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson text uri-bytestring
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo
new file mode 100644
index 000000000000..43e2944dbb99
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499703625
+SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe
+SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987
diff --git a/textproc/hs-uri-bytestring-aeson/pkg-descr b/textproc/hs-uri-bytestring-aeson/pkg-descr
new file mode 100644
index 000000000000..85839085fcf3
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/pkg-descr
@@ -0,0 +1,4 @@
+uri-bytestring aims to be an RFC3986 compliant URI parser that uses
+efficient ByteStrings for parsing and representing the URI data.
+
+WWW: http://hackage.haskell.org/package/uri-bytestring
diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile
new file mode 100644
index 000000000000..cf7a4638c367
--- /dev/null
+++ b/textproc/hs-uri-bytestring/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri-bytestring
+PORTVERSION= 0.2.3.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell URI parsing as ByteStrings
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec blaze-builder th-lift th-lift-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo
new file mode 100644
index 000000000000..71f3e2baf1f5
--- /dev/null
+++ b/textproc/hs-uri-bytestring/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621831
+SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14
+SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514
diff --git a/textproc/hs-uri-bytestring/pkg-descr b/textproc/hs-uri-bytestring/pkg-descr
new file mode 100644
index 000000000000..85839085fcf3
--- /dev/null
+++ b/textproc/hs-uri-bytestring/pkg-descr
@@ -0,0 +1,4 @@
+uri-bytestring aims to be an RFC3986 compliant URI parser that uses
+efficient ByteStrings for parsing and representing the URI data.
+
+WWW: http://hackage.haskell.org/package/uri-bytestring
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index c2120ab0400e..018041900b6d 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uri
-PORTVERSION= 0.1.6.3
+PORTVERSION= 0.1.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
index 1fabe2295498..9d2b1a5fbfa3 100644
--- a/textproc/hs-uri/distinfo
+++ b/textproc/hs-uri/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uri-0.1.6.3.tar.gz) = 321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6
-SIZE (cabal/uri-0.1.6.3.tar.gz) = 5331
+TIMESTAMP = 1499624841
+SHA256 (cabal/uri-0.1.6.4.tar.gz) = a90cd3d3ca1d33740dc732f14773266a7707901a872747a6e543129cab4ee409
+SIZE (cabal/uri-0.1.6.4.tar.gz) = 5343
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index d6c975ed9cc3..2c5d459f9884 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.3.1
+PORTVERSION= 1.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index c8f65e35aa18..0474c080371d 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xml-conduit-1.3.1.tar.gz) = 19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24
-SIZE (cabal/xml-conduit-1.3.1.tar.gz) = 33304
+TIMESTAMP = 1499546442
+SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734
+SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index 74212580fecb..8aa76fec598c 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml-hamlet
-PORTVERSION= 0.4.0.11
+PORTVERSION= 0.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
index 9d6e0383184a..6d415afdc903 100644
--- a/textproc/hs-xml-hamlet/distinfo
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xml-hamlet-0.4.0.11.tar.gz) = 3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89
-SIZE (cabal/xml-hamlet-0.4.0.11.tar.gz) = 6080
+TIMESTAMP = 1499624842
+SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb
+SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149
diff --git a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
new file mode 100644
index 000000000000..019f91570df9
--- /dev/null
+++ b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
@@ -0,0 +1,11 @@
+--- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC
++++ xml-hamlet.cabal
+@@ -19,7 +19,7 @@ Library
+
+ Build-depends: base >= 4 && < 5
+ , shakespeare >= 1.0 && < 2.2
+- , xml-conduit >= 1.0 && < 1.5
++ , xml-conduit >= 1.0 && < 1.6
+ , text >= 0.10
+ , template-haskell
+ , parsec >= 2.0 && < 3.2
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index b05032d9f66f..248f2c411b73 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-types
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index 1a24c3c65033..2c7ccd8c94fa 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624842
SHA256 (cabal/xml-types-0.3.6.tar.gz) = 9937d440072552c03c6d8ad79f61e61467dc28dcd5adeaad81038b9b94eef8c9
SIZE (cabal/xml-types-0.3.6.tar.gz) = 4020
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index b47de97846e9..20ae5f0cdd50 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xml
PORTVERSION= 1.3.14
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index c1622a7f273e..4b7af438fd97 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624842
SHA256 (cabal/xml-1.3.14.tar.gz) = 32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d
SIZE (cabal/xml-1.3.14.tar.gz) = 12048
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 72bf23d3eb49..8e11ddcb660e 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.3.4
+PORTVERSION= 0.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5 \
- parsec>=3.1.2 text>=0.11 unordered-containers>=0.1.4
+USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \
+ unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index 51880d55b4b6..b04f611d4d0b 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xmlhtml-0.2.3.4.tar.gz) = d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533
-SIZE (cabal/xmlhtml-0.2.3.4.tar.gz) = 124760
+TIMESTAMP = 1499624843
+SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c
+SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541
diff --git a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
new file mode 100644
index 000000000000..cd84fb74b6a7
--- /dev/null
+++ b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
@@ -0,0 +1,30 @@
+--- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC
++++ src/Text/Blaze/Renderer/XmlHtml.hs
+@@ -58,22 +58,20 @@ renderNodes = go []
+ (Element (getText tag) attrs (go [] content []) :)
+ go attrs (CustomParent tag content) =
+ (Element (fromChoiceStringText tag) attrs (go [] content []) :)
+- go attrs (Leaf tag _ _) =
++ go attrs (Leaf tag _ _ _) =
+ (Element (getText tag) attrs [] :)
+- go attrs (CustomLeaf tag _) =
++ go attrs (CustomLeaf tag _ _) =
+ (Element (fromChoiceStringText tag) attrs [] :)
+ go attrs (AddAttribute key _ value content) =
+ go ((getText key, fromChoiceStringText value) : attrs) content
+ go attrs (AddCustomAttribute key value content) =
+ go ((fromChoiceStringText key, fromChoiceStringText value) : attrs)
+ content
+- go _ (Content content) = fromChoiceString content
+-#if MIN_VERSION_blaze_markup(0,6,3)
+- go _ (TBI.Comment comment) =
++ go _ (Content content _) = fromChoiceString content
++ go _ (TBI.Comment comment _) =
+ (X.Comment (fromChoiceStringText comment) :)
+-#endif
+ go attrs (Append h1 h2) = go attrs h1 . go attrs h2
+- go _ Empty = id
++ go _ (Empty _) = id
+ {-# NOINLINE go #-}
+ {-# INLINE renderNodes #-}
+
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
index af6d22559c75..4a675479e68e 100644
--- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -1,15 +1,15 @@
---- xmlhtml.cabal.orig 2014-12-24 20:41:19 UTC
+--- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC
+++ xmlhtml.cabal
@@ -820,9 +820,9 @@ Library
Text.XmlHtml.HTML.Render
Build-depends: base >= 4 && < 5,
-- blaze-builder >= 0.2 && < 0.4,
-- blaze-html >= 0.5 && < 0.8,
-- blaze-markup >= 0.5 && < 0.7,
-+ blaze-builder >= 0.2 && < 0.5,
-+ blaze-html >= 0.5 && < 0.9,
-+ blaze-markup >= 0.5 && < 0.8,
+- blaze-builder >= 0.2 && < 0.5,
+- blaze-html >= 0.5 && < 0.9,
+- blaze-markup >= 0.5 && < 0.8,
++ blaze-builder >= 0.2 ,
++ blaze-html >= 0.5 ,
++ blaze-markup >= 0.5 ,
bytestring >= 0.9 && < 0.11,
containers >= 0.3 && < 0.6,
parsec >= 3.1.2 && < 3.2,
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index e2d386d32a82..09534078ec65 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.13
+PORTVERSION= 0.8.23.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 2cb796dc3985..d4b4133c7d1b 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yaml-0.8.13.tar.gz) = f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a
-SIZE (cabal/yaml-0.8.13.tar.gz) = 74369
+TIMESTAMP = 1499546173
+SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b
+SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569
diff --git a/www/Makefile b/www/Makefile
index 15d86fc80f50..d64225288ef1 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -257,6 +257,7 @@
SUBDIR += hs-happstack-server
SUBDIR += hs-heist
SUBDIR += hs-hjsmin
+ SUBDIR += hs-http-api-data
SUBDIR += hs-http-client
SUBDIR += hs-http-client-tls
SUBDIR += hs-http-conduit
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index 868931ee9ba3..da3c48ca7ae4 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= DAV
-PORTVERSION= 1.0.7
+PORTVERSION= 1.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
index 3589c715e6a5..1602983f2b91 100644
--- a/www/hs-DAV/distinfo
+++ b/www/hs-DAV/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/DAV-1.0.7.tar.gz) = a8a9000b544e872296c8597edd9df10d10ceaa097f981d98bd315c1dfb637c2e
-SIZE (cabal/DAV-1.0.7.tar.gz) = 19768
+TIMESTAMP = 1499625369
+SHA256 (cabal/DAV-1.3.1.tar.gz) = 5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009
+SIZE (cabal/DAV-1.3.1.tar.gz) = 20003
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index f605ada38d79..93b99a07feba 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.20
+PORTVERSION= 4000.3.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 888d8dc22189..0036ef459eee 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HTTP-4000.2.20.tar.gz) = 4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b
-SIZE (cabal/HTTP-4000.2.20.tar.gz) = 71475
+TIMESTAMP = 1499538127
+SHA256 (cabal/HTTP-4000.3.7.tar.gz) = d5c0cceb84e84434e851e97b3c2fce4b3e600d0410e7ac4427df44c541adeae8
+SIZE (cabal/HTTP-4000.3.7.tar.gz) = 71709
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 010daff183c9..80403ea395d6 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= activehs
-PORTVERSION= 0.3.1
-PORTREVISION= 12
+PORTVERSION= 0.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,11 @@ COMMENT= Haskell code presentation tool
LICENSE= BSD3CLAUSE
-USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
- cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
- dia-functions>=0.2.1.1 exceptions>=0.6 haskell-src-exts>=1.12 \
- highlighting-kate>=0.5 hint>=0.3.3.2 hoogle>=4.2.11 mtl>=2.0 \
- pandoc>=1.12 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
- snap-core>=0.6 snap-server>=0.6 split>=0.1 syb>=0.2 \
- text>=0.11 utf8-string>=0.3
+USE_CABAL= activehs-base blaze-html blaze-markup cmdargs data-pprint \
+ dia-base dia-functions exceptions haskell-src-exts \
+ highlighting-kate hint hoogle mtl pandoc pureMD5 \
+ QuickCheck simple-reflect snap-core snap-server split syb \
+ text utf8-string
STANDALONE= yes
EXECUTABLE= activehs
diff --git a/www/hs-activehs/distinfo b/www/hs-activehs/distinfo
index 6846af2f7017..c2289b0c3e26 100644
--- a/www/hs-activehs/distinfo
+++ b/www/hs-activehs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/activehs-0.3.1.tar.gz) = 0c0ab3ef3338d713d0bde0ce288199ce28c6401e27545691f04e08450403ea0f
-SIZE (cabal/activehs-0.3.1.tar.gz) = 33193
+TIMESTAMP = 1501411977
+SHA256 (cabal/activehs-0.3.2.tar.gz) = f70dfee1dbed1edce6d6ecec56a4c16ec4b9462e5b52130058c3bdd85659ab58
+SIZE (cabal/activehs-0.3.2.tar.gz) = 33457
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
index 3e23716431c6..ea445675558b 100644
--- a/www/hs-activehs/files/patch-Converter.hs
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -1,38 +1,77 @@
---- Converter.hs.orig 2013-02-12 19:23:45 UTC
+--- Converter.hs.orig 2017-07-30 10:48:49 UTC
+++ Converter.hs
-@@ -28,7 +28,7 @@ import System.Directory (getTemporaryDir
+@@ -53,7 +53,7 @@ convert ghci args@(Args {magicname, sourcedir, gendir,
+ object = sourcedir </> what <.> "o"
- import Control.Monad
- import Data.List
--import Data.Char
-+import Data.Char hiding (Format)
- ----------------------------------
+-extract :: ParseMode -> Bool -> TaskChan -> Args -> Language -> Doc -> IO ()
++extract :: ParseMode -> Bool -> TaskChan -> Args -> Language -> Doc loc -> IO ()
+ extract mode verbose ghci (Args {lang, templatedir, sourcedir, exercisedir, gendir, magicname}) what (Doc meta modu ss) = do
-@@ -206,7 +206,7 @@ preprocessForSlides x = case span (not .
- ------------------------------------
+ writeEx (what <.> ext) [showEnv mode $ importsHiding []]
+@@ -63,10 +63,9 @@ extract mode verbose ghci (Args {lang, templatedir, so
- rawHtml :: String -> Block
--rawHtml x = RawBlock "html" x
-+rawHtml x = RawBlock (Format "html") x
+ writeFile' (gendir </> what <.> "xml") $ flip writeHtmlString (Pandoc meta $ concat ss')
+ $ def
+- { writerStandalone = True
+- , writerTableOfContents = True
++ { writerTableOfContents = True
+ , writerSectionDivs = True
+- , writerTemplate = ht
++ , writerTemplate = Just ht
+ }
+
+ where
+@@ -95,10 +94,10 @@ extract mode verbose ghci (Args {lang, templatedir, so
+ system s
+
+ importsHiding funnames = case modu of
+- HaskellModule (HSyn.Module loc (HSyn.ModuleName modname) directives _ _ imps _) ->
++ HaskellModule (HSyn.Module loc (Just (HSyn.ModuleHead _ (HSyn.ModuleName _ modname) _ _)) directives imps _) ->
+ HPty.prettyPrint $
+- HSyn.Module loc (HSyn.ModuleName "") directives Nothing Nothing
+- ([mkImport modname funnames, mkImport_ ('X':magicname) modname] ++ imps) []
++ HSyn.Module loc Nothing directives
++ ([mkImport loc modname funnames, mkImport_ loc ('X':magicname) modname] ++ imps) []
+ -- _ -> error "error in Converter.extract"
- showBlockSimple :: Language -> String -> String -> Int -> String -> [Block]
+ mkCodeBlock l =
+@@ -237,27 +236,26 @@ showEnv HaskellMode prelude
+ ++ prelude
+ ++ "\n{-# LINE 1 \"input\" #-}\n"
-@@ -244,13 +244,14 @@ mkImport m d
+-mkImport :: String -> [Name] -> HSyn.ImportDecl
+-mkImport m d
++mkImport :: loc -> String -> [Name] -> HSyn.ImportDecl loc
++mkImport loc m d
+ = HSyn.ImportDecl
+- { HSyn.importLoc = undefined
+- , HSyn.importModule = HSyn.ModuleName m
++ { HSyn.importModule = HSyn.ModuleName loc m
+ , HSyn.importQualified = False
, HSyn.importSrc = False
, HSyn.importPkg = Nothing
, HSyn.importAs = Nothing
- , HSyn.importSpecs = Just (True, map (HSyn.IVar . mkName) d)
-+ , HSyn.importSpecs = Just (True, map (HSyn.IVar HSyn.NoNamespace . mkName) d)
-+ , HSyn.importSafe = False
++ , HSyn.importSpecs = Just (HSyn.ImportSpecList loc True (map (HSyn.IVar loc . mkName loc) d))
+ , HSyn.importSafe = False
}
- mkName :: String -> HSyn.Name
- mkName n@(c:_)
-- | isSymbol c = HSyn.Symbol n
--mkName n = HSyn.Ident n
-+ | isLetter c = HSyn.Ident n
-+mkName n = HSyn.Symbol n
+-mkName :: String -> HSyn.Name
+-mkName n@(c:_)
+- | isLetter c = HSyn.Ident n
+-mkName n = HSyn.Symbol n
++mkName :: loc -> String -> HSyn.Name loc
++mkName loc n@(c:_)
++ | isLetter c = HSyn.Ident loc n
++mkName loc n = HSyn.Symbol loc n
+
+-mkImport_ :: String -> String -> HSyn.ImportDecl
+-mkImport_ magic m
+- = (mkImport m []) { HSyn.importQualified = True, HSyn.importAs = Just $ HSyn.ModuleName magic }
++mkImport_ :: loc -> String -> String -> HSyn.ImportDecl loc
++mkImport_ loc magic m
++ = (mkImport loc m []) { HSyn.importQualified = True, HSyn.importAs = Just $ HSyn.ModuleName loc magic }
+
+ ------------------
- mkImport_ :: String -> String -> HSyn.ImportDecl
- mkImport_ magic m
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
deleted file mode 100644
index dd63e11e4705..000000000000
--- a/www/hs-activehs/files/patch-Main.hs
+++ /dev/null
@@ -1,12 +0,0 @@
---- Main.hs.orig 2013-02-12 19:23:46 UTC
-+++ Main.hs
-@@ -28,8 +28,7 @@ import System.Directory (doesFileExist)
- import Control.Concurrent (threadDelay)
- import Control.Monad (when)
- import Control.Applicative ((<|>))
--import System.Locale (defaultTimeLocale)
--import Data.Time (getCurrentTime, formatTime, diffUTCTime)
-+import Data.Time (getCurrentTime, formatTime, diffUTCTime, defaultTimeLocale)
- import Data.Maybe (listToMaybe)
- --import Prelude hiding (catch)
-
diff --git a/www/hs-activehs/files/patch-Parse.hs b/www/hs-activehs/files/patch-Parse.hs
index 1ebb809b29bb..3fe4d59c4070 100644
--- a/www/hs-activehs/files/patch-Parse.hs
+++ b/www/hs-activehs/files/patch-Parse.hs
@@ -1,27 +1,85 @@
---- Parse.hs.orig 2013-02-12 19:23:45 UTC
+--- Parse.hs.orig 2017-07-30 10:48:49 UTC
+++ Parse.hs
-@@ -72,12 +72,13 @@ mainParse :: ParseMode -> FilePath -> IO
+@@ -17,6 +17,7 @@ import Text.Pandoc
+
+ import qualified Language.Haskell.Exts.Parser as HPar
+ import qualified Language.Haskell.Exts.Syntax as HSyn
++import qualified Language.Haskell.Exts.SrcLoc as HLoc
+
+ import Data.List.Split (splitOn)
+ import Data.List (tails, partition, groupBy)
+@@ -30,15 +31,15 @@ import qualified Data.Set as Set
+ data ParseMode = HaskellMode -- | AgdaMode
+ deriving (Show, Enum, Eq)
+
+-data Module
+- = HaskellModule HSyn.Module
++data Module loc
++ = HaskellModule (HSyn.Module loc)
+ -- | AgdaModule ASyn.Module
+ deriving (Show)
+
+-data Doc
++data Doc loc
+ = Doc
+ Meta{-title, author, date-}
+- Module{-module directives, module name, imports-}
++ (Module{-module directives, module name, imports-} loc)
+ [BBlock]
+ deriving (Show)
+
+@@ -68,7 +69,7 @@ testCommandList = "EeFfH"
+
+ -----------------------------------
+
+-mainParse :: ParseMode -> FilePath -> IO Doc
++mainParse :: ParseMode -> FilePath -> IO (Doc HLoc.SrcSpanInfo)
mainParse mode s = do
c <- readFile s
case readMarkdown pState . unlines . concatMap preprocess . lines $ c of
-- Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks) -> do
-+ Right (Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks)) -> do
- header <- parseModule mode $ h
- fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks
-- Pandoc meta blocks -> do
-+ Right (Pandoc meta blocks) -> do
- header <- parseModule mode $ "module Unknown where"
+@@ -80,7 +81,7 @@ mainParse mode s = do
fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks
-+ Left err -> fail $ "readMarkdown: " ++ show err
+ Left err -> fail $ "readMarkdown: " ++ show err
where
- parseModule :: ParseMode -> String -> IO Module
+- parseModule :: ParseMode -> String -> IO Module
++ parseModule :: ParseMode -> String -> IO (Module HLoc.SrcSpanInfo)
parseModule HaskellMode m = case HPar.parseModuleWithMode HPar.defaultParseMode m of
-@@ -137,7 +138,7 @@ processHaskellLines isExercise l_ = retu
+ (HPar.ParseOk m) -> return $ HaskellModule m
+ parseError -> fail $ "parseHeader: " ++ show parseError
+@@ -137,17 +138,17 @@ processHaskellLines isExercise l_ = return (concatMap
+ names = concatMap (getFName . snd) x
getFName (HPar.ParseOk x) = case x of
- HSyn.TypeSig _ a _ -> map printName a
-- HSyn.PatBind _ (HSyn.PVar a) _ _ _ -> [printName a]
-+ HSyn.PatBind _ (HSyn.PVar a) _ _ -> [printName a]
- HSyn.FunBind (HSyn.Match _ a _ _ _ _ :_) -> [printName a]
- HSyn.TypeDecl _ a _ _ -> [printName a]
- HSyn.DataDecl _ _ _ a _ x _ -> printName a: [printName n | HSyn.QualConDecl _ _ _ y<-x, n <- getN y]
+- HSyn.TypeSig _ a _ -> map printName a
+- HSyn.PatBind _ (HSyn.PVar a) _ _ -> [printName a]
+- HSyn.FunBind (HSyn.Match _ a _ _ _ _ :_) -> [printName a]
+- HSyn.TypeDecl _ a _ _ -> [printName a]
+- HSyn.DataDecl _ _ _ a _ x _ -> printName a: [printName n | HSyn.QualConDecl _ _ _ y<-x, n <- getN y]
+- _ -> []
++ HSyn.TypeSig _ a _ -> map printName a
++ HSyn.PatBind _ (HSyn.PVar _ a) _ _ -> [printName a]
++ HSyn.FunBind _ ((HSyn.Match _ a _ _ _):_) -> [printName a]
++ HSyn.TypeDecl _ (HSyn.DHead _ a) _ -> [printName a]
++ HSyn.DataDecl _ _ _ (HSyn.DHead _ a) x _ -> printName a: [printName n | HSyn.QualConDecl _ _ _ y<-x, n <- getN y]
++ _ -> []
+ getFName _ = []
+
+- getN (HSyn.ConDecl n _) = [n]
+- getN (HSyn.InfixConDecl _ n _) = [n]
+- getN (HSyn.RecDecl n l) = n: concatMap fst l
++ getN (HSyn.ConDecl _ n _) = [n]
++ getN (HSyn.InfixConDecl _ _ n _) = [n]
++ getN (HSyn.RecDecl _ n l) = n : concatMap (\(HSyn.FieldDecl _ xs _) -> xs) l
+
+ isVisible (HPar.ParseOk (HSyn.TypeSig _ _ _)) = True
+ isVisible (HPar.ParseOk (HSyn.InfixDecl _ _ _ _)) = True
+@@ -181,6 +182,6 @@ parseQuickCheck :: String -> ([String], String)
+ parseQuickCheck s = case splitOn ";;" s of
+ l -> (init l, last l)
+
+-printName :: HSyn.Name -> Name
+-printName (HSyn.Ident x) = x
+-printName (HSyn.Symbol x) = x
++printName :: HSyn.Name loc -> Name
++printName (HSyn.Ident _ x) = x
++printName (HSyn.Symbol _ x) = x
diff --git a/www/hs-activehs/files/patch-Qualify.hs b/www/hs-activehs/files/patch-Qualify.hs
new file mode 100644
index 000000000000..b9a90bf0bb18
--- /dev/null
+++ b/www/hs-activehs/files/patch-Qualify.hs
@@ -0,0 +1,76 @@
+--- Qualify.hs.orig 2017-07-30 10:48:49 UTC
++++ Qualify.hs
+@@ -21,44 +21,47 @@ qualify
+ -> String -- ^ Haskell expression
+ -> Either String String -- ^ either the modified expression or an error
+ qualify q ns x = case parseExpWithMode defaultParseMode x of
+- ParseOk y -> Right $ prettyPrint $ runReader (trExp y) ns
++ ParseOk y -> Right $ prettyPrint $ runReader (trExp proxy y) ns
+ e -> Left $ show e
+- where
+- trQName :: QName -> R QName
+- trQName y@(UnQual x) = do
+- b <- asks (printName x `elem`)
+- return $ if b then (Qual (ModuleName q) x) else y
+- trQName y = return y
++ where
++ proxy = error "qualify"
+
+- trExp :: Exp -> R Exp
+- trExp (Lambda loc pats e) = do
+- pats' <- tr pats
+- e' <- local (\\ vars pats) $ trExp e
++ trQName :: Data loc => loc -> QName loc -> R (QName loc)
++ trQName _ y@(UnQual loc x) = do
++ b <- asks (printName loc x `elem`)
++ return $ if b then (Qual loc (ModuleName loc q) x) else y
++ trQName _ y = return y
++
++ trExp :: Data loc => loc -> Exp loc -> R (Exp loc)
++ trExp _ (Lambda loc pats e) = do
++ pats' <- tr loc pats
++ e' <- local (\\ vars loc pats) $ trExp loc e
+ return $ Lambda loc pats' e'
+- trExp (Let b e) = do
+- (b', e') <- local (\\ vars b) $ tr (b, e)
+- return $ Let b' e'
+- trExp x = gmapM tr x
++ trExp _ (Let loc b e) = do
++ (b', e') <- local (\\ vars loc b) $ tr loc (b, e)
++ return $ Let loc b' e'
++ trExp loc x = gmapM (tr loc) x
+
+ {-
+ Alt:
+ Alt SrcLoc Pat GuardedAlts Binds
+ -}
+
+- tr :: Data x => x -> R x
+- tr = everywhereM (mkM trQName) `extM` trExp
++ tr :: (Data loc, Data a) => loc -> a -> R a
++ tr loc = everywhereM (mkM (trQName loc)) `extM` (trExp loc)
+
+- vars :: Data a => a -> [String]
+- vars = map printName . everything (++) (mkQ [] patVars_)
++ vars :: (Typeable loc, Data a) => loc -> a -> [String]
++ vars loc = map (printName loc) . everything (++) (mkQ [] (patVars_ loc))
+
+- patVars_ :: Pat -> [Name]
+- patVars_ (PVar x) = [x]
+- patVars_ (PAsPat x _) = [x]
+- patVars_ (PNPlusK x _) = [x]
+- patVars_ _ = []
++ patVars_ :: loc -> Pat loc -> [Name loc]
++ patVars_ _ (PVar _ x) = [x]
++ patVars_ _ (PAsPat _ x _) = [x]
++ patVars_ _ (PNPlusK _ x _) = [x]
++ patVars_ _ _ = []
+
+- printName (Ident x) = x
+- printName (Symbol x) = x
++ printName :: loc -> Name loc -> String
++ printName _ (Ident _ x) = x
++ printName _ (Symbol _ x) = x
+
+ {- !!!
+ PatTypeSig SrcLoc Pat Type
diff --git a/www/hs-activehs/files/patch-QuickCheck.hs b/www/hs-activehs/files/patch-QuickCheck.hs
deleted file mode 100644
index 3c0c2e43857a..000000000000
--- a/www/hs-activehs/files/patch-QuickCheck.hs
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./QuickCheck.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./QuickCheck.hs 2014-07-14 02:54:45.000000000 +0200
-@@ -7,13 +7,14 @@
- import Logger
- import Qualify (qualify)
- import Hash
-+import Specialize (specialize)
-
- import Test.QuickCheck hiding (Result)
- import qualified Test.QuickCheck.Property as QC
-
- import Data.Char (isLower)
- import Data.List (intercalate)
--import Control.Monad (join)
-+import Control.Monad (join,forM)
- import Control.Concurrent.MVar
-
- ---------------------------------------
-@@ -38,19 +39,24 @@
- return [Error True err]
- Right s_ -> do
- logStrMsg 3 (logger ch) $ "Qualified expressions: " ++ show s_
--
-- let ts = mkTestCases [(v,s,s') | ((v,s),s')<- zip testcases s_]
-- logStrMsg 3 (logger ch) $ "Test cases: " ++ ts
--
- interp False m5 lang ch fn "" $ \a ->
-- do liftIO $ logStrMsg 3 (logger ch) "Before interpretation"
-+ do ss <- forM (testcases `zip` s_) $ \((v,s1),s2) -> do
-+ ts1 <- typeOf s1
-+ ts2 <- typeOf s2
-+ let [x1,x2] = map fixType [(s1,ts1),(s2,ts2)]
-+ return $ mkTestCase (v,x1,x2)
-+ let ts = "[" ++ intercalate ", " ss ++ "]"
-+ liftIO $ logStrMsg 3 (logger ch) $ "Test cases: " ++ ts
-+ liftIO $ logStrMsg 3 (logger ch) "Before interpretation"
- m <- interpret ts (as :: [TestCase])
- liftIO $ logStrMsg 3 (logger ch) "After interpretation"
- return $ qcs lang (logger ch) m
-
- where
-- mkTestCases ss
-- = "[" ++ intercalate ", " (map mkTestCase ss) ++ "]"
-+ fixType (s,t) =
-+ case (specialize t) of
-+ Right (st,_) | t /= st -> unwords [s, "::", st]
-+ _ -> s
-
- mkTestCase (vars, s, s2)
- = "TestCase (\\qcinner "
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
deleted file mode 100644
index 585e6ef9f436..000000000000
--- a/www/hs-activehs/files/patch-Simple.hs
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Simple.hs 2014-07-14 02:44:00.000000000 +0200
-@@ -19,9 +19,10 @@
- import Control.Concurrent (forkIO)
- import Control.Concurrent.MVar (MVar, newEmptyMVar, takeMVar, putMVar)
- import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan)
--import Control.Exception (SomeException, catch)
-+import Control.Exception (SomeException)
-+import qualified Control.Exception as CE
- import Control.Monad (when, forever)
--import Control.Monad.Error (MonadError, catchError)
-+import Control.Monad.Catch (catch)
- import Data.List (isPrefixOf)
- --import Prelude hiding (catch)
-
-@@ -42,7 +43,7 @@
- _ <- forkIO $ forever $ do
- logStrMsg 1 log "start interpreter"
- e <- runInterpreter (handleTask ch Nothing)
-- `catch` \(e :: SomeException) ->
-+ `CE.catch` \(e :: SomeException) ->
- return $ Left $ UnknownError "GHCi server died."
- case e of
- Left e -> logStrMsg 0 log $ "stop interpreter: " ++ show e
-@@ -95,10 +96,10 @@
- fatal (NotAllowed _) = False
- fatal _ = True
-
--catchError_fixed
-- :: MonadError InterpreterError m
-+catchError_fixed
-+ :: MonadInterpreter m
- => m a -> (InterpreterError -> m a) -> m a
--m `catchError_fixed` f = m `catchError` (f . fixError)
-+m `catchError_fixed` f = m `catch` (f . fixError)
- where
- fixError (UnknownError s)
- | Just x <- dropPrefix "GHC returned a result but said: [GhcError {errMsg =" s
diff --git a/www/hs-activehs/files/patch-Specialize.hs b/www/hs-activehs/files/patch-Specialize.hs
index 73c64c19329d..0c4371a06918 100644
--- a/www/hs-activehs/files/patch-Specialize.hs
+++ b/www/hs-activehs/files/patch-Specialize.hs
@@ -1,11 +1,48 @@
---- ./Specialize.hs.orig 2013-02-12 19:23:45.000000000 +0000
-+++ ./Specialize.hs 2013-08-28 17:32:07.000000000 +0100
-@@ -15,7 +15,7 @@
+--- Specialize.hs.orig 2017-07-30 10:48:49 UTC
++++ Specialize.hs
+@@ -23,32 +23,32 @@ specialize a
- specialize :: String -> Either String (String, String)
- specialize a
-- = case parseTypeWithMode (defaultParseMode {extensions = [FlexibleContexts]}) a of
-+ = case parseTypeWithMode (defaultParseMode {extensions = [EnableExtension FlexibleContexts]}) a of
- ParseFailed loc s -> Left $ show s
- ParseOk t -> let
+ in Right (prettyPrint t', prettyPrint t'')
+-split :: Type -> ([(String, [String])], Type)
+-split (TyForall Nothing l t)
++split :: Type a -> ([(String, [String])], Type a)
++split (TyForall _ Nothing (Just (CxTuple _ l)) t)
+ = ( map (\x -> (fst (head x), map snd x)) $ groupBy ((==) `on` fst) $ sort
+- [(v,s) | ClassA (UnQual (Ident s)) [TyVar (Ident v)]<-l]
++ [(v,s) | ClassA _ (UnQual _ (Ident _ s)) [TyVar _ (Ident _ v)]<-l]
+ , t
+ )
+ split t
+ = ([], t)
+
+-convert :: ([(String, [String])], Type) -> (Type, Type)
++convert :: ([(String, [String])], Type a) -> (Type a, Type a)
+ convert (m, t) = (app True mm t, app False mm t) where mm = map resolve m
+
+-app :: Bool -> [(String, [[Char]])] -> Type -> Type
++app :: Bool -> [(String, [[Char]])] -> Type a -> Type a
+ app b m t = f t where
+- f (TyFun a b) = TyFun (f a) (f b)
+- f (TyTuple bo l) = TyTuple bo $ map f l
+- f (TyList t) = TyList (f t)
+- f (TyParen t) = TyParen (f t)
+- f (TyApp x t) = TyApp (f x) (f t)
+- f (TyVar (Ident s)) = mkV $ head $ [y | (v,x)<-m, v==s, y<-ff x] ++ ff allT
++ f (TyFun t a b) = TyFun t (f a) (f b)
++ f (TyTuple t bo l) = TyTuple t bo $ map f l
++ f (TyList x t) = TyList x (f t)
++ f (TyParen x t) = TyParen x (f t)
++ f (TyApp v x t) = TyApp v (f x) (f t)
++ f (TyVar v (Ident _ s)) = mkV v $ head $ [y | (v,x)<-m, v==s, y<-ff x] ++ ff allT
+ f t = t
+
+ ff = if b then id else reverse
+
+-mkV :: String -> Type
+-mkV v = TyVar $ Ident v
++mkV :: a -> String -> Type a
++mkV x v = TyVar x $ Ident x v
+
+ resolve :: (String, [String]) -> (String, [String])
+ resolve (v, l) = (v, foldl1 intersect $ map res l)
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 01f9fac518ae..050911e6acb2 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,58 +1,41 @@
---- activehs.cabal.orig 2013-02-12 19:23:46 UTC
+--- activehs.cabal.orig 2017-07-30 10:48:49 UTC
+++ activehs.cabal
-@@ -56,37 +56,39 @@ Executable activehs
- Special
-
- Build-Depends:
-- highlighting-kate >= 0.5 && < 0.6,
-+ highlighting-kate >= 0.5 && < 0.7,
- hoogle >= 4.2.11 && < 4.3,
- dia-base >= 0.1 && < 0.2,
- dia-functions >= 0.2.1.1 && < 0.3,
+@@ -73,30 +73,30 @@ Executable activehs
activehs-base >= 0.2 && < 0.4,
data-pprint >= 0.2 && < 0.3,
-- base >= 4.0 && < 4.7,
-- QuickCheck >= 2.4 && < 2.6,
-- array >= 0.3 && < 0.5,
-+ base >= 4.0 && < 4.9,
-+ QuickCheck >= 2.4 && < 2.9,
-+ array >= 0.3 && < 0.6,
- directory >= 1.1 && < 1.3,
+ base >= 4.0 && < 5.0,
+- QuickCheck >= 2.4 && < 2.9,
++ QuickCheck >= 2.4 && < 2.11,
+ array >= 0.3 && < 0.6,
+- directory >= 1.1 && < 1.3,
++ directory >= 1.1 && < 1.4,
containers >= 0.4 && < 0.6,
-- filepath >= 1.2 && < 1.4,
-- text >= 0.11 && < 0.12,
-+ filepath >= 1.2 && < 1.5,
-+ text >= 1.1 && < 1.3,
- snap-core >= 0.6 && < 0.10,
- snap-server >= 0.6 && < 0.10,
-- syb >= 0.2 && < 0.4,
-- haskell-src-exts >= 1.12 && < 1.14,
-+ syb >= 0.2 && < 0.6,
-+ haskell-src-exts >= 1.16 && < 1.17,
+ filepath >= 1.2 && < 1.5,
+ text >= 1.1 && < 1.3,
+ snap-core >= 1.0 && < 1.1,
+ snap-server >= 1.0 && < 1.1,
+- syb >= 0.6 && < 0.7,
+- haskell-src-exts >= 1.17 && < 1.18,
++ syb >= 0.6 && < 0.8,
++ haskell-src-exts >= 1.17 && < 1.20,
bytestring >= 0.9 && < 0.11,
-- utf8-string >= 0.3 && < 0.4,
-+ utf8-string >= 0.3 && < 1.1,
+ utf8-string >= 0.3 && < 1.1,
xhtml >= 3000.2 && < 3000.3,
-- blaze-html >= 0.4 && < 0.6,
-+ blaze-html >= 0.4 && < 0.9,
-+ blaze-markup >= 0.6 && < 0.8,
+- blaze-html >= 0.6 && < 0.9,
+- blaze-markup >= 0.6 && < 0.8,
++ blaze-html >= 0.6 && < 0.10,
++ blaze-markup >= 0.6 && < 0.9,
pureMD5 >= 2.1 && < 2.2,
-- deepseq >= 1.1 && < 1.4,
-+ deepseq >= 1.1 && < 1.5,
-+ exceptions >= 0.6 && < 0.9,
+ deepseq >= 1.1 && < 1.5,
+ exceptions >= 0.6 && < 0.9,
split >= 0.1 && < 0.3,
-- pandoc >= 1.10 && < 1.11,
-- time >= 1.2 && < 1.5,
-+ pandoc >= 1.10 && < 1.16,
-+ time >= 1.2 && < 1.6,
+- pandoc >= 1.17 && < 1.18,
++ pandoc >= 1.17 && < 1.20,
+ time >= 1.6 && < 1.7,
old-time >= 1.0 && < 1.2,
-- process >= 1.0 && < 1.2,
-- hint >= 0.3.3.2 && < 0.4,
-+ process >= 1.0 && < 1.3,
-+ hint >= 0.4 && < 0.5,
+ process >= 1.4 && < 1.5,
+- hint >= 0.6 && < 0.7,
++ hint >= 0.6 && < 0.8,
simple-reflect >= 0.2 && < 0.4,
-- mtl >= 2.0 && < 2.2,
-+ mtl >= 2.0 && < 2.3,
+ mtl >= 2.0 && < 2.3,
old-locale >= 1.0 && < 1.1,
- cmdargs >= 0.7 && < 0.11
-
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 60c8651f563d..7a6d516c41a6 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.2.11
+PORTVERSION= 1.3.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 537b9cdb3748..6b17aafaf3bc 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/authenticate-1.3.2.11.tar.gz) = 049388bf2ebf9017f3854462e1e2af57366959528e815017651e8da112577ff6
-SIZE (cabal/authenticate-1.3.2.11.tar.gz) = 8728
+TIMESTAMP = 1499625370
+SHA256 (cabal/authenticate-1.3.3.2.tar.gz) = a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30
+SIZE (cabal/authenticate-1.3.3.2.tar.gz) = 8785
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 7558b3dabb6f..e1b5f1c5534a 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.2.2.2
+PORTVERSION= 3001.3.0.2
PORTEPOCH= 1
CATEGORIES= www haskell
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index 64262abe23e2..50f93cd61858 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cgi-3001.2.2.2.tar.gz) = 23850f29cd80a5ac671c5663b8b3b3aae45e269c8db5a8216082c487d4ed3760
-SIZE (cabal/cgi-3001.2.2.2.tar.gz) = 17270
+TIMESTAMP = 1499625371
+SHA256 (cabal/cgi-3001.3.0.2.tar.gz) = 92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1
+SIZE (cabal/cgi-3001.3.0.2.tar.gz) = 18008
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index 727f86d676bf..21dc00ffb824 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.1.6
+PORTVERSION= 0.4.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1 data-default-class old-locale>=1 text>=0.7
+USE_CABAL= blaze-builder data-default-class old-locale text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 87f08e72f354..465efe1e29dd 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cookie-0.4.1.6.tar.gz) = 3a2da4db7478ae45f848ebd5fcd40c23c84ecd00be79dec857e526619da9de2c
-SIZE (cabal/cookie-0.4.1.6.tar.gz) = 5319
+TIMESTAMP = 1499625371
+SHA256 (cabal/cookie-0.4.2.1.tar.gz) = 06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4
+SIZE (cabal/cookie-0.4.2.1.tar.gz) = 5774
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index af0dffa33521..701bb67f74df 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= css-text
-PORTVERSION= 0.1.2.1
-PORTREVISION= 2
+PORTVERSION= 0.1.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo
index fe1828ed108f..237086d00b9b 100644
--- a/www/hs-css-text/distinfo
+++ b/www/hs-css-text/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/css-text-0.1.2.1.tar.gz) = dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6
-SIZE (cabal/css-text-0.1.2.1.tar.gz) = 3947
+TIMESTAMP = 1499625372
+SHA256 (cabal/css-text-0.1.2.2.tar.gz) = dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987
+SIZE (cabal/css-text-0.1.2.2.tar.gz) = 4033
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index d98522711384..c6cde8c529c2 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/distinfo b/www/hs-fastcgi/distinfo
index d3c0a3655326..36d713f05b2c 100644
--- a/www/hs-fastcgi/distinfo
+++ b/www/hs-fastcgi/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625372
SHA256 (cabal/fastcgi-3001.0.2.4.tar.gz) = b91faff0f2316105147d4d95bd4ff5f9f3437a8007aac93feb830094003fe152
SIZE (cabal/fastcgi-3001.0.2.4.tar.gz) = 4497
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 59c00e09d15b..2f42300ae035 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.11.1
+PORTVERSION= 0.12.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,16 +9,12 @@ COMMENT= Wiki using happstack, git or darcs, and pandoc
LICENSE= GPLv2
-USE_CABAL= aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.4 \
- ConfigFile>=1 feed>=0.3.6 filestore>=0.6 \
- happstack-server>=7.0 highlighting-kate>=0.5.0.1 \
- hoauth2>=0.4.2 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \
- http-client-tls>=0.2.2 http-conduit>=2.1.4 json>=0.4 mtl \
- network>=2.6 network-uri>=2.6 pandoc>=1.12.4 \
- pandoc-types>=1.12.3 parsec random recaptcha>=0.1 safe SHA>1 \
- split syb tagsoup>=0.13 text uri>=0.1 url>=2.1 \
- utf8-string>=0.3 uuid>=1.3 xml>=1.3.5 xss-sanitize>=0.3 \
- zlib>=0.5
+USE_CABAL= ConfigFile HStringTemplate HTTP SHA aeson base64-bytestring \
+ blaze-html feed filestore happstack-server highlighting-kate \
+ hoauth2 hslogger http-client-tls http-conduit json mtl \
+ old-locale old-time pandoc pandoc-types parsec random \
+ recaptcha safe split syb tagsoup text uri url utf8-string \
+ uuid xml xss-sanitize zlib
EXECUTABLE= expireGititCache gitit
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index f352d876fceb..2230517dc960 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gitit-0.11.1.tar.gz) = 29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b
-SIZE (cabal/gitit-0.11.1.tar.gz) = 275587
+TIMESTAMP = 1499625373
+SHA256 (cabal/gitit-0.12.2.1.tar.gz) = 15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4
+SIZE (cabal/gitit-0.12.2.1.tar.gz) = 271239
diff --git a/www/hs-gitit/files/patch-gitit.cabal b/www/hs-gitit/files/patch-gitit.cabal
new file mode 100644
index 000000000000..98e2ff2cb786
--- /dev/null
+++ b/www/hs-gitit/files/patch-gitit.cabal
@@ -0,0 +1,20 @@
+--- gitit.cabal.orig 2017-02-14 13:37:12 UTC
++++ gitit.cabal
+@@ -140,7 +140,7 @@ Library
+ mtl,
+ old-time,
+ pandoc >= 1.12.4 && < 1.20,
+- pandoc-types >= 1.12.3 && < 1.18,
++ pandoc-types >= 1.12.3 && < 1.20,
+ highlighting-kate >= 0.5.0.1 && < 0.7,
+ bytestring,
+ text,
+@@ -170,7 +170,7 @@ Library
+ hoauth2 >= 0.4.2 && < 0.6,
+ http-conduit >= 2.1.4 && < 2.3,
+ http-client-tls >= 0.2.2 && < 0.4,
+- aeson >= 0.7 && < 1.2,
++ aeson >= 0.7 && < 1.3,
+ uuid >= 1.3 && < 1.4
+ if impl(ghc >= 6.10)
+ build-depends: base >= 4, syb
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index ca9bb94b81e3..faf1cb48820d 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.9
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo
index 1a2bf965a49e..e017b13482db 100644
--- a/www/hs-hS3/distinfo
+++ b/www/hs-hS3/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625373
SHA256 (cabal/hS3-0.5.9.tar.gz) = 7ee0ba24b01cdefc02f683aef16d33ac146928ae75a00e566673be12960cc759
SIZE (cabal/hS3-0.5.9.tar.gz) = 19981
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index c15ccd058c62..bd582aee1b8c 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.4.4
+PORTVERSION= 7.4.6.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 62978d1c207b..748b0dcb23bd 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/happstack-server-7.4.4.tar.gz) = 4e5a650554e6c04f2db7ffbed4e0c1af9163d14848bb80464d3d2db2b2d91ef2
-SIZE (cabal/happstack-server-7.4.4.tar.gz) = 79920
+TIMESTAMP = 1499538462
+SHA256 (cabal/happstack-server-7.4.6.4.tar.gz) = b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9
+SIZE (cabal/happstack-server-7.4.6.4.tar.gz) = 81123
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index a59f94783125..2bbf55ddc947 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= happstack
PORTVERSION= 7.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack/distinfo b/www/hs-happstack/distinfo
index cd49cc3f121d..f6376575c01e 100644
--- a/www/hs-happstack/distinfo
+++ b/www/hs-happstack/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625373
SHA256 (cabal/happstack-7.0.2.tar.gz) = d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5
SIZE (cabal/happstack-7.0.2.tar.gz) = 2090
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 1de77f20679d..9480fa216a4e 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.14.1.1
+PORTVERSION= 1.0.1.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,12 +9,10 @@ COMMENT= Haskell template system supporting both HTML5 and XML
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
- blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 either>=3.1 \
- hashable>=1.1 map-syntax>=0.2 \
- MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1.0.1.0 \
- text>=0.10 unordered-containers>=0.1.4 vector>=0.9 \
- xmlhtml>=0.2.3
+USE_CABAL= aeson attoparsec blaze-builder blaze-html directory-tree \
+ dlist hashable lifted-base map-syntax monad-control mtl \
+ random text transformers-base unordered-containers vector \
+ xmlhtml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 6832208e0e20..4ea7affa6dbf 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/heist-0.14.1.1.tar.gz) = 2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43
-SIZE (cabal/heist-0.14.1.1.tar.gz) = 65797
+TIMESTAMP = 1499625374
+SHA256 (cabal/heist-1.0.1.0.tar.gz) = fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb
+SIZE (cabal/heist-1.0.1.0.tar.gz) = 71050
diff --git a/www/hs-heist/files/patch-heist.cabal b/www/hs-heist/files/patch-heist.cabal
new file mode 100644
index 000000000000..59facc7f3c36
--- /dev/null
+++ b/www/hs-heist/files/patch-heist.cabal
@@ -0,0 +1,29 @@
+--- heist.cabal.orig 2016-10-28 08:41:35 UTC
++++ heist.cabal
+@@ -151,14 +151,14 @@ Library
+ Heist.Interpreted.Internal
+
+ build-depends:
+- aeson >= 0.6 && < 1.1,
++ aeson >= 0.6 && < 1.3,
+ attoparsec >= 0.10 && < 0.14,
+ base >= 4 && < 5,
+ blaze-builder >= 0.2 && < 0.5,
+- blaze-html >= 0.4 && < 0.9,
++ blaze-html >= 0.4 && < 0.10,
+ bytestring >= 0.9 && < 0.11,
+ containers >= 0.2 && < 0.6,
+- directory >= 1.1 && < 1.3,
++ directory >= 1.1 && < 1.4,
+ directory-tree >= 0.10 && < 0.13,
+ dlist >= 0.5 && < 0.9,
+ filepath >= 1.3 && < 1.5,
+@@ -174,7 +174,7 @@ Library
+ transformers >= 0.3 && < 0.6,
+ transformers-base >= 0.4 && < 0.5,
+ unordered-containers >= 0.1.4 && < 0.3,
+- vector >= 0.9 && < 0.12,
++ vector >= 0.9 && < 0.13,
+ xmlhtml >= 0.2.3.5 && < 0.3
+
+ if impl(ghc >= 6.12.0)
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index dcf2585d0bab..2f516445a112 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.5.0
+PORTVERSION= 0.2.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 750efc977de9..a7019ee35d28 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hjsmin-0.1.5.0.tar.gz) = f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7
-SIZE (cabal/hjsmin-0.1.5.0.tar.gz) = 117050
+TIMESTAMP = 1499544739
+SHA256 (cabal/hjsmin-0.2.0.2.tar.gz) = bec153d2396962c63998eb12d0a2c7c9f7df6f774cb00e41b6cdb1f5a4905484
+SIZE (cabal/hjsmin-0.2.0.2.tar.gz) = 4211
diff --git a/www/hs-http-api-data/Makefile b/www/hs-http-api-data/Makefile
new file mode 100644
index 000000000000..56da32849742
--- /dev/null
+++ b/www/hs-http-api-data/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= http-api-data
+PORTVERSION= 0.3.7.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Convert Haskell data types to and from HTTP API data
+
+LICENSE= GPLv3
+
+USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \
+ text time-locale-compat unordered-containers \
+ uri-bytestring uuid-types
+
+.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
new file mode 100644
index 000000000000..4e253b5daa0a
--- /dev/null
+++ b/www/hs-http-api-data/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499625375
+SHA256 (cabal/http-api-data-0.3.7.1.tar.gz) = 8c633e95113c8ab655f4ba67e51e41a2c9035f0122ea68bfbb876b37277075fd
+SIZE (cabal/http-api-data-0.3.7.1.tar.gz) = 18907
diff --git a/www/hs-http-api-data/pkg-descr b/www/hs-http-api-data/pkg-descr
new file mode 100644
index 000000000000..0f0424783ec6
--- /dev/null
+++ b/www/hs-http-api-data/pkg-descr
@@ -0,0 +1,4 @@
+This package defines typeclasses used for converting Haskell data types to
+and from HTTP API data.
+
+WWW: https://hackage.haskell.org/package/http-api-data
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
index 77457f2dac10..02c74cc2ca6f 100644
--- a/www/hs-http-client-tls/Makefile
+++ b/www/hs-http-client-tls/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-client-tls
-PORTVERSION= 0.2.2
-PORTREVISION= 2
+PORTVERSION= 0.3.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client-tls/distinfo b/www/hs-http-client-tls/distinfo
index 56b5488dcf4d..e02402552a25 100644
--- a/www/hs-http-client-tls/distinfo
+++ b/www/hs-http-client-tls/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http-client-tls-0.2.2.tar.gz) = 451e5833a1f07fdc162fde4371ac92986932d5c38f9969ace7babb020bc80128
-SIZE (cabal/http-client-tls-0.2.2.tar.gz) = 2962
+TIMESTAMP = 1499625375
+SHA256 (cabal/http-client-tls-0.3.5.1.tar.gz) = c1fa23eb868f4b4e36304f3d03890bce1230284be79f80bd7b4fe1733e8a9558
+SIZE (cabal/http-client-tls-0.3.5.1.tar.gz) = 7240
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
index 6c9df9b0a8d6..0f2ee6c6a3dd 100644
--- a/www/hs-http-client/Makefile
+++ b/www/hs-http-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-client
-PORTVERSION= 0.4.20
+PORTVERSION= 0.5.7.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo
index 68b01b93b26b..a9aada3bf649 100644
--- a/www/hs-http-client/distinfo
+++ b/www/hs-http-client/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http-client-0.4.20.tar.gz) = 8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24
-SIZE (cabal/http-client-0.4.20.tar.gz) = 75960
+TIMESTAMP = 1499625375
+SHA256 (cabal/http-client-0.5.7.0.tar.gz) = e241eac22c55cd851de534b9d84149702a8b3990d10afc282bd6955df550ffa3
+SIZE (cabal/http-client-0.5.7.0.tar.gz) = 86010
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 4a6b8dd5ac57..f5efb94ff3a4 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 2.1.8
+PORTVERSION= 2.2.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,8 @@ COMMENT= HTTP client package with conduit interface and HTTPS support
LICENSE= BSD3CLAUSE
-USE_CABAL= conduit>=0.5.5 http-client>=0.4.19 http-client-tls>=0.2.2 \
- http-types>=0.7 lifted-base>=0.1 monad-control mtl \
- resourcet>=1.1
+USE_CABAL= aeson conduit conduit-extra http-client http-client-tls \
+ http-types lifted-base monad-control mtl resourcet
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index 0f939df80544..d230a1ad1f22 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http-conduit-2.1.8.tar.gz) = 550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d
-SIZE (cabal/http-conduit-2.1.8.tar.gz) = 23331
+TIMESTAMP = 1499625376
+SHA256 (cabal/http-conduit-2.2.3.1.tar.gz) = 53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e
+SIZE (cabal/http-conduit-2.2.3.1.tar.gz) = 37632
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index fa7de2115363..6daed2112f0b 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,6 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.6.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-date/distinfo b/www/hs-http-date/distinfo
index 8118038e7a49..11bea69ca36f 100644
--- a/www/hs-http-date/distinfo
+++ b/www/hs-http-date/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625376
SHA256 (cabal/http-date-0.0.6.1.tar.gz) = f2e106603e2b3f710f1189e478f6c20067d9a9d21a20a633fe362b3f91807636
SIZE (cabal/http-date-0.0.6.1.tar.gz) = 4989
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index b61b236a473a..f968bcf2b20e 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.4.2
+PORTVERSION= 0.4.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index c945e1f31dbb..18972d2eda0a 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http-reverse-proxy-0.4.2.tar.gz) = 3118eae07425ee5e44fb309f6a99f09d6a4fccb4965cc6af2ce5ba6003348d81
-SIZE (cabal/http-reverse-proxy-0.4.2.tar.gz) = 9641
+TIMESTAMP = 1499625376
+SHA256 (cabal/http-reverse-proxy-0.4.4.tar.gz) = 1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978
+SIZE (cabal/http-reverse-proxy-0.4.4.tar.gz) = 10394
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 9f9bfe0f9be0..9a2d9e1e03cf 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index c8e2803ef926..d91e498e0da2 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625376
SHA256 (cabal/http-server-1.0.6.tar.gz) = 5cd44741053aef8ba7bd6b6d8d0a8048a171db42e2b7cb5013a99fcd754143b5
SIZE (cabal/http-server-1.0.6.tar.gz) = 29071
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 8ab63f64dab4..eed5504790a7 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.8.6
+PORTVERSION= 0.9.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index d2f13f61d879..c4a5448e9ca5 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http-types-0.8.6.tar.gz) = b03b1893e0148169087f64ef0b1dedcf2382865352f4306d4fa7219d118a36e0
-SIZE (cabal/http-types-0.8.6.tar.gz) = 10796
+TIMESTAMP = 1499625376
+SHA256 (cabal/http-types-0.9.1.tar.gz) = 7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550
+SIZE (cabal/http-types-0.9.1.tar.gz) = 12284
diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile
index f62c1985a734..8fb329634573 100644
--- a/www/hs-http2/Makefile
+++ b/www/hs-http2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http2
-PORTVERSION= 1.0.4
+PORTVERSION= 1.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= HTTP/2.0 library including frames and HPACK
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson aeson-pretty hex mwc-random stm text \
- unordered-containers vector word8
+USE_CABAL= aeson aeson-pretty case-insensitive hex mwc-random psqueues \
+ stm text unordered-containers vector word8
FLAGS_DISABLE= devel
diff --git a/www/hs-http2/distinfo b/www/hs-http2/distinfo
index bb0f78780479..b914d033241b 100644
--- a/www/hs-http2/distinfo
+++ b/www/hs-http2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/http2-1.0.4.tar.gz) = 727fc0d39a62b02b677189f9ef745e3c8fd574334736594139767940dc4647b7
-SIZE (cabal/http2-1.0.4.tar.gz) = 35760
+TIMESTAMP = 1499625378
+SHA256 (cabal/http2-1.6.3.tar.gz) = 61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43
+SIZE (cabal/http2-1.6.3.tar.gz) = 5138268
diff --git a/www/hs-http2/files/patch-http2.cabal b/www/hs-http2/files/patch-http2.cabal
index 661339af0e6f..830fac27bffc 100644
--- a/www/hs-http2/files/patch-http2.cabal
+++ b/www/hs-http2/files/patch-http2.cabal
@@ -1,50 +1,50 @@
---- http2.cabal.orig 2015-07-31 05:18:14 UTC
+--- http2.cabal.orig 2017-02-02 01:41:44 UTC
+++ http2.cabal
-@@ -60,7 +60,6 @@ Library
+@@ -82,7 +82,6 @@ Library
Build-Depends: base >= 4.6 && < 5
, array
, bytestring >= 0.10
- , bytestring-builder
+ , case-insensitive
, containers >= 0.5
- , mwc-random
- , stm
-@@ -93,7 +92,6 @@ Test-Suite spec
+ , psqueues
+@@ -115,7 +114,6 @@ Test-Suite spec
Build-Depends: base >= 4 && < 5
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , hspec >= 1.3
-@@ -116,7 +114,6 @@ Test-Suite hpack
+@@ -138,7 +136,6 @@ Test-Suite hpack
, aeson-pretty
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, directory
- , filepath
-@@ -165,7 +162,6 @@ Executable hpack-encode
+@@ -188,7 +185,6 @@ Executable hpack-encode
, aeson-pretty
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , text
-@@ -186,7 +182,6 @@ Executable hpack-debug
+@@ -210,7 +206,6 @@ Executable hpack-debug
, aeson
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , text
-@@ -208,7 +203,6 @@ Executable hpack-stat
+@@ -233,7 +228,6 @@ Executable hpack-stat
, aeson-pretty
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, directory
- , filepath
diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile
index 768c9e033f5b..fc24842ae63f 100644
--- a/www/hs-multipart/Makefile
+++ b/www/hs-multipart/Makefile
@@ -2,6 +2,7 @@
PORTNAME= multipart
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-multipart/distinfo b/www/hs-multipart/distinfo
index a2243063b0ad..1b6febacfac6 100644
--- a/www/hs-multipart/distinfo
+++ b/www/hs-multipart/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625378
SHA256 (cabal/multipart-0.1.2.tar.gz) = e543fb307beb14fc366171d7767a6a18244bacf78db295d8d161c5c03d94043c
SIZE (cabal/multipart-0.1.2.tar.gz) = 6787
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 3346065b70aa..cbd644fa18b1 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= oeis
-PORTVERSION= 0.3.6
+PORTVERSION= 0.3.9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-oeis/distinfo b/www/hs-oeis/distinfo
index 6eb7298cacf6..885b80c37c3d 100644
--- a/www/hs-oeis/distinfo
+++ b/www/hs-oeis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/oeis-0.3.6.tar.gz) = 4039b69a7aa0412eb4a37f36be7bf442ea32dd4672fc8765b6b134513fe3fee0
-SIZE (cabal/oeis-0.3.6.tar.gz) = 29275
+TIMESTAMP = 1499540242
+SHA256 (cabal/oeis-0.3.9.tar.gz) = 8a692c0b898f5d89e607f9593697a24827981a1cfee53045c192084015061b8e
+SIZE (cabal/oeis-0.3.9.tar.gz) = 29159
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 162ba50296b0..f4406e155065 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= path-pieces
-PORTVERSION= 0.2.0
+PORTVERSION= 0.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo
index fd147c11d7df..f3e26a484838 100644
--- a/www/hs-path-pieces/distinfo
+++ b/www/hs-path-pieces/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/path-pieces-0.2.0.tar.gz) = c097672ab0dd1835b8cadbbd9db412893f02e02eca044c5a1690fbefb3e8df84
-SIZE (cabal/path-pieces-0.2.0.tar.gz) = 3267
+TIMESTAMP = 1499625378
+SHA256 (cabal/path-pieces-0.2.1.tar.gz) = 080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f
+SIZE (cabal/path-pieces-0.2.1.tar.gz) = 3529
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 14d91e218ec7..48fbdb03a1af 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,6 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1.0.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/distinfo b/www/hs-recaptcha/distinfo
index 3194b7b95378..dcd0d59f2ae5 100644
--- a/www/hs-recaptcha/distinfo
+++ b/www/hs-recaptcha/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625378
SHA256 (cabal/recaptcha-0.1.0.3.tar.gz) = 29a898bc7a063be88c05ac3ec0446a23117ed04c501dbd99c83684683fd638a3
SIZE (cabal/recaptcha-0.1.0.3.tar.gz) = 2742
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 3a302a71214b..0830885f9200 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 2.0.5
+PORTVERSION= 2.0.13
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= aeson blaze-html blaze-markup exceptions parsec>=2 \
- text>=0.7
+USE_CABAL= aeson blaze-html blaze-markup exceptions parsec text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index 6da4edd29547..d25d7c0177f4 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/shakespeare-2.0.5.tar.gz) = f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549
-SIZE (cabal/shakespeare-2.0.5.tar.gz) = 61636
+TIMESTAMP = 1499543938
+SHA256 (cabal/shakespeare-2.0.13.tar.gz) = a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e
+SIZE (cabal/shakespeare-2.0.13.tar.gz) = 65054
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index a09f7a810c15..d7515a05adc1 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 0.9.7.2
+PORTVERSION= 1.0.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,14 +9,11 @@ COMMENT= Snap: A Haskell Web Framework (core interfaces and types)
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
- blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
- bytestring-mmap>=0.2.2 case-insensitive>=0.3 \
- enumerator>=0.4.15 hashable>=1.1 HUnit>=1.2 \
- MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
- regex-posix>=0.95 text>=0.11 time-locale-compat>=0.1 \
- unix-compat>=0.2 unordered-containers>=0.1.4.3 \
- vector>=0.6 zlib-enum>=0.2.1
+USE_CABAL= attoparsec case-insensitive hashable HUnit io-streams \
+ lifted-base monad-control mtl network-uri old-locale \
+ random readable regex-posix text time-locale-compat \
+ transformers-base unix-compat unordered-containers \
+ vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 26986eb0979d..5ff85b7f8886 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/snap-core-0.9.7.2.tar.gz) = 526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651
-SIZE (cabal/snap-core-0.9.7.2.tar.gz) = 91604
+TIMESTAMP = 1499544248
+SHA256 (cabal/snap-core-1.0.2.1.tar.gz) = de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d
+SIZE (cabal/snap-core-1.0.2.1.tar.gz) = 142939
diff --git a/www/hs-snap-core/files/patch-snap-core.cabal b/www/hs-snap-core/files/patch-snap-core.cabal
new file mode 100644
index 000000000000..c6e6480d5086
--- /dev/null
+++ b/www/hs-snap-core/files/patch-snap-core.cabal
@@ -0,0 +1,18 @@
+--- snap-core.cabal.orig 2017-05-11 13:48:21 UTC
++++ snap-core.cabal
+@@ -133,7 +133,6 @@ Library
+ attoparsec >= 0.12 && < 0.14,
+ base >= 4 && < 5,
+ bytestring >= 0.9 && < 0.11,
+- bytestring-builder >= 0.10.4 && < 0.11,
+ case-insensitive >= 1.1 && < 1.3,
+ containers >= 0.3 && < 1.0,
+ directory >= 1 && < 2,
+@@ -235,7 +234,6 @@ Test-suite testsuite
+ attoparsec,
+ base,
+ bytestring,
+- bytestring-builder,
+ case-insensitive,
+ containers,
+ directory,
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index cdbd8470e7b4..6c8222f45746 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 0.9.5.1
+PORTVERSION= 1.0.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,11 +9,9 @@ COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
- blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
- case-insensitive>=0.3 enumerator>=0.4.15 \
- MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
- old-locale snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
+USE_CABAL= attoparsec blaze-builder case-insensitive clock io-streams \
+ io-streams-haproxy lifted-base mtl network old-locale snap-core \
+ text unix-compat vector
FLAGS_DEFINE= OPENSSL
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 59b0b2cc253c..8b20917a87a4 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/snap-server-0.9.5.1.tar.gz) = af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3
-SIZE (cabal/snap-server-0.9.5.1.tar.gz) = 59062
+TIMESTAMP = 1499544292
+SHA256 (cabal/snap-server-1.0.2.2.tar.gz) = 27de5fb962e88fbc4285015c2e7f7abf0e06dac64e8f9737ad6ece6074fa837f
+SIZE (cabal/snap-server-1.0.2.2.tar.gz) = 74372
diff --git a/www/hs-snap-server/files/patch-snap-server.cabal b/www/hs-snap-server/files/patch-snap-server.cabal
new file mode 100644
index 000000000000..3dbb6ed54f4e
--- /dev/null
+++ b/www/hs-snap-server/files/patch-snap-server.cabal
@@ -0,0 +1,10 @@
+--- snap-server.cabal.orig 2017-05-15 21:28:21 UTC
++++ snap-server.cabal
+@@ -89,7 +89,6 @@ Library
+ base >= 4 && < 5,
+ 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,
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 4da6be8e8465..74272b57d28b 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.14.0.6
+PORTVERSION= 1.0.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,17 +9,11 @@ COMMENT= Top-level package for the Snap Web Framework
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
- comonad>=1.1 configurator>=0.1 directory-tree>=0.11 \
- directory-tree>=0.10 dlist>=0.5 either>=4.3 hashable>=1.1 \
- heist>=0.14 lens>=3.7.6 logict>=0.4.2 \
- MonadCatchIO-transformers>=0.2 mtl>2.0 mwc-random>=0.8 \
- old-time>=1.0 pwstore-fast>=2.2 regex-posix>=0.95 \
- snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 text>=0.11 \
- unordered-containers>=0.1.4 vector>=0.7.1 \
- vector-algorithms>=0.4 xmlhtml>=0.1
-
-EXECUTABLE= snap
+USE_CABAL= aeson attoparsec cereal clientsession configurator \
+ directory-tree dlist hashable heist lens lifted-base \
+ map-syntax monad-control mtl mwc-random pwstore-fast \
+ snap-core snap-server stm text transformers-base \
+ unordered-containers xmlhtml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index c861133d2dbe..4a2104e9fdc8 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/snap-0.14.0.6.tar.gz) = fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617
-SIZE (cabal/snap-0.14.0.6.tar.gz) = 84164
+TIMESTAMP = 1499625379
+SHA256 (cabal/snap-1.0.0.1.tar.gz) = 293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8
+SIZE (cabal/snap-1.0.0.1.tar.gz) = 81400
diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal
index 284efd938544..281c9182d169 100644
--- a/www/hs-snap/files/patch-snap.cabal
+++ b/www/hs-snap/files/patch-snap.cabal
@@ -1,10 +1,29 @@
---- snap.cabal.orig 2015-07-19 02:19:23 UTC
+--- snap.cabal.orig 2016-09-23 03:03:09 UTC
+++ snap.cabal
-@@ -237,6 +237,7 @@ Executable snap
- text >= 0.11 && < 1.3
+@@ -103,7 +103,7 @@ Library
+ Snap.Snaplet.Session.SecureCookie
- extensions:
-+ TemplateHaskell
- OverloadedStrings
-
- ghc-prof-options: -prof -auto-all
+ build-depends:
+- aeson >= 0.6 && < 1.1,
++ aeson >= 0.6 && < 1.3,
+ attoparsec >= 0.10 && < 0.14,
+ base >= 4 && < 5,
+ bytestring >= 0.9.1 && < 0.11,
+@@ -111,7 +111,7 @@ Library
+ clientsession >= 0.8 && < 0.10,
+ configurator >= 0.1 && < 0.4,
+ containers >= 0.2 && < 0.6,
+- directory >= 1.1 && < 1.3,
++ directory >= 1.1 && < 1.4,
+ directory-tree >= 0.10 && < 0.13,
+ dlist >= 0.5 && < 0.9,
+ filepath >= 1.3 && < 1.5,
+@@ -120,7 +120,7 @@ Library
+ -- the version disjunction causes problems with dependency resolution.
+ hashable >= 1.2.0.6 && < 1.3,
+ heist >= 1.0 && < 1.1,
+- lens >= 3.7.6 && < 4.15,
++ lens >= 3.7.6 && < 4.16,
+ lifted-base >= 0.2 && < 0.3,
+ map-syntax >= 0.2 && < 0.3,
+ monad-control >= 0.3 && < 1.1,
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 30b576f9f276..351ed2905c86 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-url/distinfo b/www/hs-url/distinfo
index de6d9ba43579..6f7b646574da 100644
--- a/www/hs-url/distinfo
+++ b/www/hs-url/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625379
SHA256 (cabal/url-2.1.3.tar.gz) = 5af27e3f8c0a27e52d0dcb98ef06a0fdd01efe8bb21242c29432e1bc380a4f61
SIZE (cabal/url-2.1.3.tar.gz) = 4180
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index b9b7fca63fec..316acb9043b0 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 3.1.1
+PORTVERSION= 3.1.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index c0ab65fdbc9d..c2fddb83753b 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wai-app-static-3.1.1.tar.gz) = 5b7ed5028584bbefbbf3da6869ad9fe5ed4fe28ad599ca5d9ad715a1cee43e2a
-SIZE (cabal/wai-app-static-3.1.1.tar.gz) = 21781
+TIMESTAMP = 1499625380
+SHA256 (cabal/wai-app-static-3.1.6.1.tar.gz) = b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668
+SIZE (cabal/wai-app-static-3.1.6.1.tar.gz) = 22686
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index 075579285cb6..9bea0d5fb73d 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 3.0.10
+PORTVERSION= 3.0.20.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,12 +9,12 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
-USE_CABAL= ansi-terminal base64-bytestring blaze-builder>=0.2.1.4 \
- case-insensitive>=0.2 cookie data-default-class \
- fast-logger>=2.1 http-types>=0.7 lifted-base>=0.1.2 \
- network>=2.2.1.5 resourcet>=0.4.6 streaming-commons \
- stringsearch>=0.3 text>=0.7 unix-compat vault void>=0.5 \
- wai>=3.0.3.0 wai-logger>=2.0 word8
+USE_CABAL= aeson ansi-terminal base64-bytestring blaze-builder \
+ case-insensitive cookie data-default-class \
+ fast-logger http-types iproute lifted-base \
+ network old-locale resourcet streaming-commons \
+ stringsearch text unix-compat vault void \
+ wai wai-logger word8 zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index e3fc952ee6bf..da5c80ccadb7 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wai-extra-3.0.10.tar.gz) = 503af31217c29d1bcec10a6806ea119aab9d68f29f12a1c1006fe4f931771b37
-SIZE (cabal/wai-extra-3.0.10.tar.gz) = 49846
+TIMESTAMP = 1499625381
+SHA256 (cabal/wai-extra-3.0.20.0.tar.gz) = ad63ca529e812f5edec84e197a58433095a1376a127f8e9416235028bf021971
+SIZE (cabal/wai-extra-3.0.20.0.tar.gz) = 60542
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 29fbbfc11b32..c3f363bb93b4 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 2.2.4.1
+PORTVERSION= 2.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,8 @@ COMMENT= Logging system for WAI
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update blaze-builder byteorder case-insensitive \
- easy-file>=0.2 fast-logger>=2.2 http-types network \
- unix-time>=0.2.2 wai>=2.0.0
+USE_CABAL= blaze-builder byteorder case-insensitive fast-logger \
+ http-types network old-locale unix-time wai
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo
index 8878aca54e75..292c96cd3142 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wai-logger-2.2.4.1.tar.gz) = f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8
-SIZE (cabal/wai-logger-2.2.4.1.tar.gz) = 6585
+TIMESTAMP = 1499625381
+SHA256 (cabal/wai-logger-2.3.0.tar.gz) = 90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0
+SIZE (cabal/wai-logger-2.3.0.tar.gz) = 5379
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 528957d6a2d4..b9612a83433b 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 3.0.3.0
+PORTVERSION= 3.2.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 0df0712350ec..5ee6267b1bb7 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wai-3.0.3.0.tar.gz) = c47eb435a3320795f21bee8585abc8164aaf3bfde86f7e1e13e98190cb968d10
-SIZE (cabal/wai-3.0.3.0.tar.gz) = 9532
+TIMESTAMP = 1499625379
+SHA256 (cabal/wai-3.2.1.1.tar.gz) = 5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21
+SIZE (cabal/wai-3.2.1.1.tar.gz) = 10039
diff --git a/www/hs-wai/files/patch-wai.cabal b/www/hs-wai/files/patch-wai.cabal
new file mode 100644
index 000000000000..739389af330b
--- /dev/null
+++ b/www/hs-wai/files/patch-wai.cabal
@@ -0,0 +1,10 @@
+--- wai.cabal.orig 2017-07-09 19:57:56 UTC
++++ wai.cabal
+@@ -21,7 +21,6 @@ Source-repository head
+ Library
+ Build-Depends: base >= 4 && < 5
+ , bytestring >= 0.10
+- , bytestring-builder >= 0.10.4.0 && < 0.11
+ , blaze-builder >= 0.2.1.4 && < 0.5
+ , network >= 2.2.1.5
+ , http-types >= 0.7
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
index fdb77f931939..2a8794e05c55 100644
--- a/www/hs-warp-tls/Makefile
+++ b/www/hs-warp-tls/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= warp-tls
-PORTVERSION= 3.1.1
+PORTVERSION= 3.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= HTTP over SSL/TLS support for Warp via the TLS package
LICENSE= MIT
USE_CABAL= cprng-aes>=0.5.0 data-default-class>=0.0.1 network>=2.2.1 \
- streaming-commons tls>=1.2.16 wai>=3.0 warp>=3.1
+ streaming-commons tls>=1.2.16 tls-session-manager wai>=3.0 warp>=3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp-tls/distinfo b/www/hs-warp-tls/distinfo
index 3f4f70aa73f4..1202565ccfff 100644
--- a/www/hs-warp-tls/distinfo
+++ b/www/hs-warp-tls/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/warp-tls-3.1.1.tar.gz) = 5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd
-SIZE (cabal/warp-tls-3.1.1.tar.gz) = 6426
+TIMESTAMP = 1499625382
+SHA256 (cabal/warp-tls-3.2.4.tar.gz) = 05d1aad58fa1a16a652369d7247d4c68b86af0b8febaea9ab7969c121f956e17
+SIZE (cabal/warp-tls-3.2.4.tar.gz) = 7158
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index c2eb11c0d3d7..1efcba46f7a7 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 3.1.3
+PORTVERSION= 3.2.13
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 567f7247a00f..12af17495a45 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/warp-3.1.3.tar.gz) = f65d32e374da0c1c1a44624e9744e4e2b5e325ca1e24a6aeae5719ee48c2b8e3
-SIZE (cabal/warp-3.1.3.tar.gz) = 64154
+TIMESTAMP = 1499625382
+SHA256 (cabal/warp-3.2.13.tar.gz) = 92395bf42d012e5c4deaea7f9e1fc2271a63c5380b4c5bc1cf16b7c53aa2c424
+SIZE (cabal/warp-3.2.13.tar.gz) = 78441
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index 9fbd65136e33..3e367378a9cb 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 0.13.1.3
+PORTVERSION= 0.14.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-webkit/distinfo b/www/hs-webkit/distinfo
index f83ca6ff8fb0..0f83bc6974ce 100644
--- a/www/hs-webkit/distinfo
+++ b/www/hs-webkit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/webkit-0.13.1.3.tar.gz) = 068c23b5ceebb725f113d519dadb30deaa5bc747c656264eb32e1bda8b210902
-SIZE (cabal/webkit-0.13.1.3.tar.gz) = 152548
+TIMESTAMP = 1499625383
+SHA256 (cabal/webkit-0.14.2.1.tar.gz) = b80ef2a7d9def4245ec85f6065f62fc19fafe7ca3379a5def86e98eeaea1f550
+SIZE (cabal/webkit-0.14.2.1.tar.gz) = 150595
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 97fc0b54c2d2..9d217aeedcb9 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xss-sanitize
-PORTVERSION= 0.3.5.6
+PORTVERSION= 0.3.5.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo
index 6f71fb5ce019..794c144ef367 100644
--- a/www/hs-xss-sanitize/distinfo
+++ b/www/hs-xss-sanitize/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xss-sanitize-0.3.5.6.tar.gz) = 008a20e0266f7e4255cb6009336bc25cfe74eda3314dff4f0da0bbd584cd58c8
-SIZE (cabal/xss-sanitize-0.3.5.6.tar.gz) = 10874
+TIMESTAMP = 1499625383
+SHA256 (cabal/xss-sanitize-0.3.5.7.tar.gz) = 955856413e70375c794766d04ac9ab7f0d3337dbb04a412c9b7ff5c415acac00
+SIZE (cabal/xss-sanitize-0.3.5.7.tar.gz) = 10878
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
index b70de20f4228..77e549f6d5cf 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.4.2.2
+PORTVERSION= 1.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
index 2edd0c2f7bdb..2e5e46fd24c2 100644
--- a/www/hs-yesod-auth-hashdb/distinfo
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = d904933fa5172cc330785591eb92fa61a3cb86599c617ff4bdedf348ecad5868
-SIZE (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = 10290
+TIMESTAMP = 1499625384
+SHA256 (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8
+SIZE (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 15615
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 08d92b2b8128..e1d0dddfa2b0 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.4.6
+PORTVERSION= 1.4.17.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index ef7e0a9b6c2c..c354a5785c08 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-auth-1.4.6.tar.gz) = 5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030
-SIZE (cabal/yesod-auth-1.4.6.tar.gz) = 42895
+TIMESTAMP = 1499625384
+SHA256 (cabal/yesod-auth-1.4.17.2.tar.gz) = 63a4273faed4bb7ddf3b196e30ae54bcc4b228e388f11cca71d5005c9ea19983
+SIZE (cabal/yesod-auth-1.4.17.2.tar.gz) = 50569
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index 7097bc560b4e..965655980690 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-bin
-PORTVERSION= 1.4.13.3
+PORTVERSION= 1.5.2.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,13 +15,13 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \
http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \
http-types>=0.7 lifted-base network \
optparse-applicative>=0.11 parsec>=2.1 \
- project-template>=0.1.1 resourcet>=0.3 shakespeare>=2.0 \
+ project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \
split>=0.2 streaming-commons tar>=0.4 text>=0.11 \
- transformers-compat unix-compat>=0.2 unordered-containers \
+ transformers-compat typed-process unix-compat>=0.2 unordered-containers \
wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \
zlib>=0.5
-EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
+EXECUTABLE= yesod
STANDALONE= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo
index 29503448aab0..0383d8eaae2f 100644
--- a/www/hs-yesod-bin/distinfo
+++ b/www/hs-yesod-bin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-bin-1.4.13.3.tar.gz) = cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61
-SIZE (cabal/yesod-bin-1.4.13.3.tar.gz) = 808012
+TIMESTAMP = 1499625384
+SHA256 (cabal/yesod-bin-1.5.2.3.tar.gz) = eeabc3579d7834c6fc0890c5bdf27c52f84cc2bd3b44b4153f4a9320d3d123f6
+SIZE (cabal/yesod-bin-1.5.2.3.tar.gz) = 25237
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index b7639d6140d7..79c62b2abf9c 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.4.13
+PORTVERSION= 1.4.35
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= MIT
USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \
clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \
- data-default exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \
+ data-default deepseq-generics exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \
lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \
mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \
primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 6ea6b64f8df5..ff6ba7be2a00 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-core-1.4.13.tar.gz) = 219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da
-SIZE (cabal/yesod-core-1.4.13.tar.gz) = 81300
+TIMESTAMP = 1499625385
+SHA256 (cabal/yesod-core-1.4.35.tar.gz) = 7e5d0bead1a415aeb8a1d5c62930506c81b8e5209f179d7f19c5627e45bb5cf1
+SIZE (cabal/yesod-core-1.4.35.tar.gz) = 93503
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index cb8280a2062b..e7fc6c6ef6c2 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.4.4.1
+PORTVERSION= 1.4.12
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 4f6460aff74b..9fcf7c8d2ddb 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-form-1.4.4.1.tar.gz) = 83aec216b6c5179c373d1b76ab3cca219ebacc98db2e5163400228b632dc6493
-SIZE (cabal/yesod-form-1.4.4.1.tar.gz) = 29487
+TIMESTAMP = 1499625386
+SHA256 (cabal/yesod-form-1.4.12.tar.gz) = 731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51
+SIZE (cabal/yesod-form-1.4.12.tar.gz) = 31515
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index d5e1de1fdf23..4bcae28c0c70 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.4.0.3
+PORTVERSION= 1.4.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= blaze-builder conduit persistent>=2.1 persistent-template>=2.1 \
- resource-pool resourcet>=0.4.5 yesod-core>=1.4.0
+USE_CABAL= blaze-builder conduit persistent persistent-template \
+ resource-pool resourcet yesod-core
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 3cba6dfb829b..445a92e0f131 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-persistent-1.4.0.3.tar.gz) = 6455b79eda028e12caefc9d89808fbc611ece36ef64bab3426f90a26cacf3b5f
-SIZE (cabal/yesod-persistent-1.4.0.3.tar.gz) = 4283
+TIMESTAMP = 1499625386
+SHA256 (cabal/yesod-persistent-1.4.2.tar.gz) = d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056
+SIZE (cabal/yesod-persistent-1.4.2.tar.gz) = 4887
diff --git a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal b/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
new file mode 100644
index 000000000000..ccaf7973e3f9
--- /dev/null
+++ b/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
@@ -0,0 +1,13 @@
+--- yesod-persistent.cabal.orig 2017-07-10 15:13:02 UTC
++++ yesod-persistent.cabal
+@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md
+ library
+ build-depends: base >= 4 && < 5
+ , yesod-core >= 1.4.0 && < 1.5
+- , persistent >= 2.1 && < 2.7
+- , persistent-template >= 2.1 && < 2.7
++ , persistent >= 2.1 && < 2.8
++ , persistent-template >= 2.1 && < 2.8
+ , transformers >= 0.2.2
+ , blaze-builder
+ , conduit
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 7f74e2ed0518..e1b51c641d6a 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.5.0.2
+PORTVERSION= 1.5.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index 363c4fdc62c6..2f52b2e8bfea 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-static-1.5.0.2.tar.gz) = 8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9
-SIZE (cabal/yesod-static-1.5.0.2.tar.gz) = 25037
+TIMESTAMP = 1499625386
+SHA256 (cabal/yesod-static-1.5.3.tar.gz) = b486aea2b24bc0497ace32b6318da3737d7f8ea8434327608eafdf1eb25d5d65
+SIZE (cabal/yesod-static-1.5.3.tar.gz) = 25521
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index 455e25d3ae5f..a212d8a58ea5 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.4.3.1
+PORTVERSION= 1.5.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \
hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \
- monad-control network>=2.2 persistent>=1.0 text wai>=3.0 \
+ monad-control network>=2.2 persistent>=1.0 pretty-show text wai>=3.0 \
wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 07ab4f770c65..ed6e0a7931c8 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-test-1.4.3.1.tar.gz) = a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394
-SIZE (cabal/yesod-test-1.4.3.1.tar.gz) = 15284
+TIMESTAMP = 1499625387
+SHA256 (cabal/yesod-test-1.5.7.tar.gz) = 426b2aaf777b4c18aee150ed5bbe7ab95c987e622609b0cff1242f9ec0850113
+SIZE (cabal/yesod-test-1.5.7.tar.gz) = 19365
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index 0dc663f5b0b6..4db58e4bed91 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.4.1.5
+PORTVERSION= 1.4.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 89afdf1c56a3..fcddf8a19d0b 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yesod-1.4.1.5.tar.gz) = a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b
-SIZE (cabal/yesod-1.4.1.5.tar.gz) = 9570
+TIMESTAMP = 1499625383
+SHA256 (cabal/yesod-1.4.5.tar.gz) = 267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9
+SIZE (cabal/yesod-1.4.5.tar.gz) = 9105
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index 875fa4f7c485..b72dc7d64777 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= GLURaw
-PORTVERSION= 1.5.0.1
+PORTVERSION= 2.0.0.3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo
index 31390a941da3..e446af03da01 100644
--- a/x11-toolkits/hs-GLURaw/distinfo
+++ b/x11-toolkits/hs-GLURaw/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/GLURaw-1.5.0.1.tar.gz) = 1b52c2637820c2bea38f40acdd217a68c0dd3849f7ed1308959aa324b6b2c8f1
-SIZE (cabal/GLURaw-1.5.0.1.tar.gz) = 10121
+TIMESTAMP = 1499538016
+SHA256 (cabal/GLURaw-2.0.0.3.tar.gz) = 582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee
+SIZE (cabal/GLURaw-2.0.0.3.tar.gz) = 10515
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index a4941f62f175..d2127000414e 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= GLUT
-PORTVERSION= 2.7.0.1
-PORTREVISION= 1
+PORTVERSION= 2.7.0.12
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index edb9934c8dda..03e662322272 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/GLUT-2.7.0.1.tar.gz) = fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d
-SIZE (cabal/GLUT-2.7.0.1.tar.gz) = 660437
+TIMESTAMP = 1499625638
+SHA256 (cabal/GLUT-2.7.0.12.tar.gz) = 66f516bd9f836e5252fe0186e447b68a61b594d9247466c502b74994d3e9f1b5
+SIZE (cabal/GLUT-2.7.0.12.tar.gz) = 656592
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 2e92500d312f..f0afd0aafb73 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 2.12.0.1
+PORTVERSION= 3.0.2.0
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 5966cccf59d6..82f7f7194b5e 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/OpenGL-2.12.0.1.tar.gz) = 8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5
-SIZE (cabal/OpenGL-2.12.0.1.tar.gz) = 125419
+TIMESTAMP = 1499613084
+SHA256 (cabal/OpenGL-3.0.2.0.tar.gz) = faa99459724d614d2cf2d2b83c7bda4898ee71752a253bf4699c096822450efb
+SIZE (cabal/OpenGL-3.0.2.0.tar.gz) = 130658
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index 0668f6422c21..afb1b0384ba4 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= OpenGLRaw
-PORTVERSION= 2.5.1.0
-PORTREVISION= 1
+PORTVERSION= 3.2.4.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +9,7 @@ COMMENT= Raw binding for the OpenGL graphics system
LICENSE= BSD3CLAUSE
+USE_CABAL= fixed half text
USE_GL= gl glut
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
index 7bc5fd8615cf..e3b92186d64a 100644
--- a/x11-toolkits/hs-OpenGLRaw/distinfo
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/OpenGLRaw-2.5.1.0.tar.gz) = 33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd
-SIZE (cabal/OpenGLRaw-2.5.1.0.tar.gz) = 733570
+TIMESTAMP = 1499444850
+SHA256 (cabal/OpenGLRaw-3.2.4.0.tar.gz) = e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e
+SIZE (cabal/OpenGLRaw-3.2.4.0.tar.gz) = 799693
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index cf2bd64a79e8..1115d62754a8 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gtk
-PORTVERSION= 0.13.9
+PORTVERSION= 0.14.6
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo
index 4cd6fa1538fa..b4953c749437 100644
--- a/x11-toolkits/hs-gtk/distinfo
+++ b/x11-toolkits/hs-gtk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gtk-0.13.9.tar.gz) = 12e0097724002385207b3bb9a0339ad3d7c8d54336bf91d90827193f801ebfd5
-SIZE (cabal/gtk-0.13.9.tar.gz) = 684971
+TIMESTAMP = 1499625639
+SHA256 (cabal/gtk-0.14.6.tar.gz) = 707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327
+SIZE (cabal/gtk-0.14.6.tar.gz) = 679274
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 46b9eabf7513..99cb02c645f6 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gtk2hs
-PORTVERSION= 0.13
+PORTVERSION= 0.13.2.2
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 7ad7b7a195a6..53fccade1cf7 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gtksourceview2
-PORTVERSION= 0.13.1.3
+PORTVERSION= 0.13.3.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtksourceview2/distinfo b/x11-toolkits/hs-gtksourceview2/distinfo
index 696abc57fc5d..7faca4e021d3 100644
--- a/x11-toolkits/hs-gtksourceview2/distinfo
+++ b/x11-toolkits/hs-gtksourceview2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gtksourceview2-0.13.1.3.tar.gz) = 0eba5ee51206a8d99d4d4c4e24e0801492731fb2a67e953da15dbe27a7d328ca
-SIZE (cabal/gtksourceview2-0.13.1.3.tar.gz) = 54310
+TIMESTAMP = 1499625640
+SHA256 (cabal/gtksourceview2-0.13.3.1.tar.gz) = a1c5ebc07faa5b2809d424b3ded5e9cfa0a5338b51c7989e2a0271d016c5fe53
+SIZE (cabal/gtksourceview2-0.13.3.1.tar.gz) = 45713
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index c4e758765539..146742dc83b9 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pango
-PORTVERSION= 0.13.1.0
+PORTVERSION= 0.13.3.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo
index b7cc2f00630a..1af1913cb903 100644
--- a/x11-toolkits/hs-pango/distinfo
+++ b/x11-toolkits/hs-pango/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pango-0.13.1.0.tar.gz) = 1612dbe198f8bbbb394bf043eb06c554d5e1c0dc76cdee186ef925fb8a7ac968
-SIZE (cabal/pango-0.13.1.0.tar.gz) = 61656
+TIMESTAMP = 1499625640
+SHA256 (cabal/pango-0.13.3.1.tar.gz) = 306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb
+SIZE (cabal/pango-0.13.3.1.tar.gz) = 52564
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index cfc1f39f9e01..c5c27652cf0c 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vte
-PORTVERSION= 0.13.0.2
+PORTVERSION= 0.13.1.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/distinfo b/x11-toolkits/hs-vte/distinfo
index e3eae83b7aae..93583dc681f5 100644
--- a/x11-toolkits/hs-vte/distinfo
+++ b/x11-toolkits/hs-vte/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vte-0.13.0.2.tar.gz) = 70e8f81e5e44beb9eba66959792af7648ab9238c758ed359bda3f78933427ef0
-SIZE (cabal/vte-0.13.0.2.tar.gz) = 37954
+TIMESTAMP = 1499625641
+SHA256 (cabal/vte-0.13.1.1.tar.gz) = c38699a626af47be2c15ddcc7c9070fe5b9999fee73e3b479d1bafb96cdd5231
+SIZE (cabal/vte-0.13.1.1.tar.gz) = 28931
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 964555c92dae..1b3fb5d268db 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wx
-PORTVERSION= 0.91.0.0
+PORTVERSION= 0.92.3.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/distinfo b/x11-toolkits/hs-wx/distinfo
index d9f452ec7599..b0ab4d3adca0 100644
--- a/x11-toolkits/hs-wx/distinfo
+++ b/x11-toolkits/hs-wx/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wx-0.91.0.0.tar.gz) = 5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c
-SIZE (cabal/wx-0.91.0.0.tar.gz) = 48926
+TIMESTAMP = 1499625642
+SHA256 (cabal/wx-0.92.3.0.tar.gz) = bdcbabeb1841c61d0fee5ac5c797ee9b825edf97028990c9bd1101855ee28c11
+SIZE (cabal/wx-0.92.3.0.tar.gz) = 50940
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 82110995df90..330a58ca1a64 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -1,19 +1,19 @@
# $FreeBSD$
PORTNAME= wxc
-PORTVERSION= 0.91.0.0
+PORTVERSION= 0.92.3.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell C++ wrapper
-USE_CABAL= wxdirect>=0.91
+USE_CABAL= split wxdirect
-USES= dos2unix
+USES= dos2unix pkgconfig
USE_WX= 3.0
WX_COMPS= wx
-OPTIONS_EXCLUDE=DOCS
+IGNORE_DOCS= yes
post-patch::
@${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \
diff --git a/x11-toolkits/hs-wxc/distinfo b/x11-toolkits/hs-wxc/distinfo
index 30e3b46699cf..c2ea66d0c604 100644
--- a/x11-toolkits/hs-wxc/distinfo
+++ b/x11-toolkits/hs-wxc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wxc-0.91.0.0.tar.gz) = 4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a
-SIZE (cabal/wxc-0.91.0.0.tar.gz) = 185224
+TIMESTAMP = 1499625642
+SHA256 (cabal/wxc-0.92.3.0.tar.gz) = 28a27fc51a53b8d2f3042a516fe9b8adfd118675adcdf1a7cf1f9fe2b722ff44
+SIZE (cabal/wxc-0.92.3.0.tar.gz) = 203597
diff --git a/x11-toolkits/hs-wxc/files/patch-Setup.hs b/x11-toolkits/hs-wxc/files/patch-Setup.hs
index fa20a1af592d..66c7f976ddc8 100644
--- a/x11-toolkits/hs-wxc/files/patch-Setup.hs
+++ b/x11-toolkits/hs-wxc/files/patch-Setup.hs
@@ -1,42 +1,25 @@
---- Setup.hs.orig 2014-08-11 14:25:54 UTC
+--- Setup.hs.orig 2017-04-28 17:40:12 UTC
+++ Setup.hs
-@@ -12,7 +12,7 @@ import Distribution.Simple.LocalBuildInf
+@@ -15,7 +15,7 @@ import Distribution.Simple.LocalBuildInfo (LocalBuildI
import Distribution.Simple.PackageIndex(SearchResult (..), searchByName )
import Distribution.Simple.Program (ConfiguredProgram (..), lookupProgram, runProgram, simpleProgram, locationPath)
import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
- , CopyDest(..), CopyFlags, copyVerbosity
+ , CopyDest(..), CopyFlags, copyVerbosity, copyDest
, InstallFlags, installVerbosity
- , fromFlag
+ , fromFlag, fromFlagOrDefault, copyDest
)
-@@ -480,16 +480,17 @@ ldconfig path = case buildOS of
+@@ -640,7 +640,7 @@ ldconfig path = case buildOS of
otherwise -> error "Couldn't execute ldconfig, ensure it is on your path"
myCopyHook :: PackageDescription -> LocalBuildInfo -> UserHooks -> CopyFlags -> IO ()
--myCopyHook = hookHelper (fromFlag . copyVerbosity) (copyHook simpleUserHooks)
+-myCopyHook = hookHelper (fromFlag . copyVerbosity) (fromFlagOrDefault NoCopyDest . copyDest) (copyHook simpleUserHooks)
+myCopyHook = hookHelper (fromFlag . copyVerbosity) (fromFlag . copyDest) (copyHook simpleUserHooks)
myInstHook :: PackageDescription -> LocalBuildInfo -> UserHooks -> InstallFlags -> IO ()
--myInstHook = hookHelper (fromFlag . installVerbosity) (instHook simpleUserHooks)
-+myInstHook = hookHelper (fromFlag . installVerbosity) (const NoCopyDest) (instHook simpleUserHooks)
-
- hookHelper ::
- (a -> Verbosity) ->
-+ (a -> CopyDest) ->
- (PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()) ->
- PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
--hookHelper verbosity origHook pkg_descr local_bld_info user_hooks flags =
-+hookHelper verbosity copyDest origHook pkg_descr local_bld_info user_hooks flags =
- do
- -- Perform simpleUserHooks (copyHook/instHook => to copy installIncludes)
- origHook pkg_descr local_bld_info user_hooks flags
-@@ -504,8 +505,7 @@ hookHelper verbosity origHook pkg_descr
- dll_name = fromJust (lookup "x-dll-name" custom_bi)
- lib_name = sharedLibName ver dll_name
-
-- inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
-+ inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info (copyDest flags)
+ myInstHook = hookHelper (fromFlag . installVerbosity) (const NoCopyDest) (instHook simpleUserHooks)
+@@ -668,4 +668,3 @@ hookHelper verbosity copydest origHook pkg_descr local
+ inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info (copydest flags)
installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
- ldconfig inst_lib_dir
-
diff --git a/x11-toolkits/hs-wxc/files/patch-wxc.cabal b/x11-toolkits/hs-wxc/files/patch-wxc.cabal
deleted file mode 100644
index cc044803b8cd..000000000000
--- a/x11-toolkits/hs-wxc/files/patch-wxc.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- wxc.cabal.orig 2014-08-11 14:25:54 UTC
-+++ wxc.cabal
-@@ -161,6 +161,8 @@ library
- base >= 4 && < 5,
- wxdirect >= 0.90.1.1
-
-+ cc-options: -std=c++11
-+
- x-dll-sources:
- src/cpp/apppath.cpp
- src/cpp/dragimage.cpp
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 8fcec492fb9a..cbd7b7c829bf 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wxcore
-PORTVERSION= 0.91.0.0
+PORTVERSION= 0.92.3.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= wxHaskell core
USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91
-USES= dos2unix
+USES= dos2unix pkgconfig
DOS2UNIX_GLOB= *.hs
USE_WX= 3.0
diff --git a/x11-toolkits/hs-wxcore/distinfo b/x11-toolkits/hs-wxcore/distinfo
index 7f47fdfd4438..faae1be34ebf 100644
--- a/x11-toolkits/hs-wxcore/distinfo
+++ b/x11-toolkits/hs-wxcore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wxcore-0.91.0.0.tar.gz) = 7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06
-SIZE (cabal/wxcore-0.91.0.0.tar.gz) = 364439
+TIMESTAMP = 1499625643
+SHA256 (cabal/wxcore-0.92.3.0.tar.gz) = e053e1e9fc44f7ae2837c09c07bc1073255950d761643ec15a4a9f19557195e4
+SIZE (cabal/wxcore-0.92.3.0.tar.gz) = 400300
diff --git a/x11-toolkits/hs-wxcore/files/patch-Setup.hs b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
index 612c88193677..fa0a2f170de6 100644
--- a/x11-toolkits/hs-wxcore/files/patch-Setup.hs
+++ b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
@@ -1,10 +1,10 @@
---- Setup.hs.orig 2016-06-20 16:11:53 UTC
+--- Setup.hs.orig 2017-04-28 17:39:58 UTC
+++ Setup.hs
-@@ -78,7 +78,6 @@ myConfHook (pkg0, pbi) flags = do
+@@ -90,7 +90,6 @@ myConfHook (pkg0, pbi) flags = do
let libbi' = libbi
- { extraLibDirs = extraLibDirs libbi ++ [wxcDirectory]
-- , extraLibs = extraLibs libbi ++ ["wxc"]
- , ldOptions = ldOptions libbi ++ ["-Wl,-rpath," ++ wxcDirectory] }
-
- let lib' = lib { libBuildInfo = libbi' }
+ { extraLibDirs = extraLibDirs libbi ++ [wxcDirectory]
+- , extraLibs = extraLibs libbi ++ ["wxc"]
+ , PD.includeDirs = PD.includeDirs libbi ++ case glIncludeDirs of
+ ('-':'I':v) -> [v];
+ _ -> []
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index 5e96abcd12b5..e19093fa6e7f 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wxdirect
-PORTVERSION= 0.91.0.0
+PORTVERSION= 0.92.3.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/distinfo b/x11-toolkits/hs-wxdirect/distinfo
index 9d810765d28e..8623589f11bc 100644
--- a/x11-toolkits/hs-wxdirect/distinfo
+++ b/x11-toolkits/hs-wxdirect/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/wxdirect-0.91.0.0.tar.gz) = 475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f
-SIZE (cabal/wxdirect-0.91.0.0.tar.gz) = 30044
+TIMESTAMP = 1499446016
+SHA256 (cabal/wxdirect-0.92.3.0.tar.gz) = 03c60f604347dcfb1fb8cf65b4d0a487b5c2c868e4896f03ce5edd12d81e367a
+SIZE (cabal/wxdirect-0.92.3.0.tar.gz) = 30586
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
deleted file mode 100644
index 0be7b491ead9..000000000000
--- a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- wxdirect.cabal.orig 2014-08-11 12:05:43 UTC
-+++ wxdirect.cabal
-@@ -49,8 +49,8 @@ executable wxdirect
- directory,
- parsec >= 2.1.0 && < 4,
- strict,
-- time >= 1.0 && < 1.5,
-- filepath < 1.4,
-+ time >= 1.0 && < 1.6,
-+ filepath < 1.5,
- process >= 1.1 && < 1.3
-
- if flag(splitBase)
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 1499d49dfa34..204843352dce 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +12,7 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
- X11>=1.6.1 X11-xft>=0.2 xmonad==0.13
+ X11>=1.6.1 X11-xft>=0.2 xmonad==0.13_1
USE_XORG= x11
RUN_DEPENDS+= bash:shells/bash
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 611a9fa82a71..2de0de99f305 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Tiling window manager
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl setlocale utf8-string>=0.3 X11>=1.8 directory>=1.2.3
+USE_CABAL= extensible-exceptions mtl setlocale utf8-string X11
USE_XORG= x11
MAN1PAGES= xmonad.1
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 17eabcb2563e..e71d8a677a8b 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= 14
+PORTREVISION= 15
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11-xft/distinfo b/x11/hs-X11-xft/distinfo
index bc81c1eac150..169c31947b22 100644
--- a/x11/hs-X11-xft/distinfo
+++ b/x11/hs-X11-xft/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499625448
SHA256 (cabal/X11-xft-0.3.1.tar.gz) = 4eba3fee62570e06447654030a62fb55f19587884bc2cef77a9c3b2c3458f8d1
SIZE (cabal/X11-xft-0.3.1.tar.gz) = 13621
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 7408c7bd9f20..37236d164b69 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -3,6 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index ddee5ffd4016..f8cffb74e4f2 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.24.3
+PORTVERSION= 0.24.5
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 403a4603ad5b..2a61c187aabb 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479131610
-SHA256 (cabal/xmobar-0.24.3.tar.gz) = d330079dd60e22004a4cfa271eb9e00a1bb36b8dafcbbf1b1a5980d401dcf510
-SIZE (cabal/xmobar-0.24.3.tar.gz) = 100317
+TIMESTAMP = 1499625449
+SHA256 (cabal/xmobar-0.24.5.tar.gz) = 393aab8d86d09f218f5255bb8811ba12a4ca2f4eb64411c38b9713c58574bf69
+SIZE (cabal/xmobar-0.24.5.tar.gz) = 100658