aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED29
-rw-r--r--UPDATING15
-rw-r--r--archivers/Makefile1
-rw-r--r--archivers/hs-tar/Makefile2
-rw-r--r--archivers/hs-zip-archive/Makefile20
-rw-r--r--archivers/hs-zip-archive/distinfo4
-rw-r--r--archivers/hs-zlib-bindings/Makefile4
-rw-r--r--archivers/hs-zlib-conduit/Makefile16
-rw-r--r--archivers/hs-zlib-conduit/distinfo2
-rw-r--r--archivers/hs-zlib-conduit/pkg-descr3
-rw-r--r--archivers/hs-zlib-enum/Makefile5
-rw-r--r--archivers/hs-zlib-enum/distinfo4
-rw-r--r--archivers/hs-zlib/Makefile4
-rw-r--r--audio/hs-ALUT/Makefile7
-rw-r--r--audio/hs-ALUT/distinfo4
-rw-r--r--audio/hs-ALUT/pkg-descr9
-rw-r--r--audio/hs-OpenAL/Makefile7
-rw-r--r--audio/hs-OpenAL/distinfo4
-rw-r--r--audio/hs-OpenAL/pkg-descr6
-rw-r--r--audio/hs-libmpd/Makefile6
-rw-r--r--audio/hs-libmpd/distinfo4
-rw-r--r--audio/hs-libmpd/pkg-descr2
-rw-r--r--benchmarks/hs-criterion/Makefile11
-rw-r--r--benchmarks/hs-criterion/distinfo4
-rw-r--r--converters/hs-aeson/Makefile11
-rw-r--r--converters/hs-aeson/distinfo4
-rw-r--r--converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs76
-rw-r--r--converters/hs-aeson/files/patch-aeson.cabal11
-rw-r--r--converters/hs-dataenc/Makefile5
-rw-r--r--converters/hs-dataenc/distinfo4
-rw-r--r--converters/hs-json/Makefile7
-rw-r--r--databases/Makefile1
-rw-r--r--databases/hs-esqueleto/Makefile16
-rw-r--r--databases/hs-esqueleto/distinfo2
-rw-r--r--databases/hs-esqueleto/pkg-descr4
-rw-r--r--databases/hs-mysql/Makefile5
-rw-r--r--databases/hs-mysql/distinfo4
-rw-r--r--databases/hs-mysql/pkg-descr5
-rw-r--r--databases/hs-persistent-sqlite/Makefile6
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-template/Makefile7
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent/Makefile10
-rw-r--r--databases/hs-persistent/distinfo4
-rw-r--r--devel/Makefile51
-rw-r--r--devel/cvs2darcs/Makefile2
-rw-r--r--devel/hs-BNFC/Makefile8
-rw-r--r--devel/hs-Boolean/Makefile5
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-ConfigFile/Makefile3
-rw-r--r--devel/hs-ConfigFile/distinfo4
-rw-r--r--devel/hs-DrIFT/Makefile17
-rw-r--r--devel/hs-DrIFT/distinfo2
-rw-r--r--devel/hs-DrIFT/pkg-descr13
-rw-r--r--devel/hs-Glob/Makefile (renamed from devel/hs-IORefCAS/Makefile)11
-rw-r--r--devel/hs-Glob/distinfo2
-rw-r--r--devel/hs-Glob/pkg-descr3
-rw-r--r--devel/hs-HUnit/Makefile4
-rw-r--r--devel/hs-IORefCAS/distinfo2
-rw-r--r--devel/hs-IORefCAS/pkg-descr11
-rw-r--r--devel/hs-IfElse/Makefile4
-rw-r--r--devel/hs-List/Makefile6
-rw-r--r--devel/hs-MaybeT/Makefile4
-rw-r--r--devel/hs-MemoTrie/Makefile5
-rw-r--r--devel/hs-MemoTrie/distinfo4
-rw-r--r--devel/hs-MissingH/Makefile7
-rw-r--r--devel/hs-MissingH/distinfo4
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile8
-rw-r--r--devel/hs-MonadCatchIO-mtl/distinfo4
-rw-r--r--devel/hs-MonadCatchIO-mtl/pkg-descr2
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile7
-rw-r--r--devel/hs-MonadCatchIO-transformers/distinfo4
-rw-r--r--devel/hs-MonadRandom/Makefile3
-rw-r--r--devel/hs-MonadRandom/distinfo4
-rw-r--r--devel/hs-ObjectName/Makefile4
-rw-r--r--devel/hs-PSQueue/Makefile4
-rw-r--r--devel/hs-QuickCheck/Makefile4
-rw-r--r--devel/hs-ReadArgs/Makefile4
-rw-r--r--devel/hs-STMonadTrans/Makefile15
-rw-r--r--devel/hs-STMonadTrans/distinfo2
-rw-r--r--devel/hs-STMonadTrans/pkg-descr3
-rw-r--r--devel/hs-SafeSemaphore/Makefile5
-rw-r--r--devel/hs-SafeSemaphore/distinfo4
-rw-r--r--devel/hs-StateVar/distinfo2
-rw-r--r--devel/hs-StateVar/pkg-descr4
-rw-r--r--devel/hs-Stream/Makefile5
-rw-r--r--devel/hs-Stream/distinfo4
-rw-r--r--devel/hs-Tensor/Makefile15
-rw-r--r--devel/hs-Tensor/distinfo2
-rw-r--r--devel/hs-Tensor/pkg-descr4
-rw-r--r--devel/hs-TypeCompose/Makefile5
-rw-r--r--devel/hs-TypeCompose/distinfo4
-rw-r--r--devel/hs-abstract-deque/Makefile22
-rw-r--r--devel/hs-abstract-deque/distinfo4
-rw-r--r--devel/hs-abstract-deque/pkg-descr2
-rw-r--r--devel/hs-abstract-par/Makefile5
-rw-r--r--devel/hs-abstract-par/distinfo4
-rw-r--r--devel/hs-abstract-par/pkg-descr12
-rw-r--r--devel/hs-activehs-base/Makefile4
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal8
-rw-r--r--devel/hs-alex/Makefile5
-rw-r--r--devel/hs-alex/distinfo4
-rw-r--r--devel/hs-ansi-terminal/Makefile7
-rw-r--r--devel/hs-ansi-terminal/distinfo4
-rw-r--r--devel/hs-ansi-terminal/pkg-descr2
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile7
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo4
-rw-r--r--devel/hs-arrows/Makefile4
-rw-r--r--devel/hs-asn1-data/Makefile4
-rw-r--r--devel/hs-asn1-encoding/Makefile15
-rw-r--r--devel/hs-asn1-encoding/distinfo2
-rw-r--r--devel/hs-asn1-encoding/pkg-descr4
-rw-r--r--devel/hs-asn1-parse/Makefile15
-rw-r--r--devel/hs-asn1-parse/distinfo2
-rw-r--r--devel/hs-asn1-parse/pkg-descr4
-rw-r--r--devel/hs-asn1-types/Makefile5
-rw-r--r--devel/hs-asn1-types/distinfo4
-rw-r--r--devel/hs-async/Makefile5
-rw-r--r--devel/hs-async/distinfo4
-rw-r--r--devel/hs-atomic-primops/Makefile15
-rw-r--r--devel/hs-atomic-primops/distinfo2
-rw-r--r--devel/hs-atomic-primops/pkg-descr8
-rw-r--r--devel/hs-attempt/Makefile16
-rw-r--r--devel/hs-attempt/distinfo2
-rw-r--r--devel/hs-attempt/pkg-descr4
-rw-r--r--devel/hs-auto-update/Makefile13
-rw-r--r--devel/hs-auto-update/distinfo2
-rw-r--r--devel/hs-auto-update/pkg-descr6
-rw-r--r--devel/hs-base-unicode-symbols/Makefile4
-rw-r--r--devel/hs-base16-bytestring/Makefile5
-rw-r--r--devel/hs-base16-bytestring/distinfo4
-rw-r--r--devel/hs-base16-bytestring/pkg-descr5
-rw-r--r--devel/hs-base64-bytestring/Makefile4
-rw-r--r--devel/hs-base64-conduit/Makefile16
-rw-r--r--devel/hs-base64-conduit/distinfo2
-rw-r--r--devel/hs-base64-conduit/pkg-descr3
-rw-r--r--devel/hs-basic-prelude/Makefile7
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile7
-rw-r--r--devel/hs-bifunctors/distinfo4
-rw-r--r--devel/hs-bifunctors/pkg-descr2
-rw-r--r--devel/hs-bits-atomic/Makefile4
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile17
-rw-r--r--devel/hs-blaze-builder-conduit/distinfo2
-rw-r--r--devel/hs-blaze-builder-conduit/pkg-descr3
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile7
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo4
-rw-r--r--devel/hs-blaze-builder/Makefile5
-rw-r--r--devel/hs-blaze-builder/distinfo4
-rw-r--r--devel/hs-blaze-textual/Makefile5
-rw-r--r--devel/hs-blaze-textual/distinfo4
-rw-r--r--devel/hs-bloomfilter/Makefile5
-rw-r--r--devel/hs-bloomfilter/distinfo4
-rw-r--r--devel/hs-bloomfilter/pkg-descr2
-rw-r--r--devel/hs-boxes/Makefile15
-rw-r--r--devel/hs-boxes/distinfo2
-rw-r--r--devel/hs-boxes/pkg-descr4
-rw-r--r--devel/hs-bsd-sysctl/Makefile4
-rw-r--r--devel/hs-byteable/Makefile13
-rw-r--r--devel/hs-byteable/distinfo2
-rw-r--r--devel/hs-byteable/pkg-descr5
-rw-r--r--devel/hs-byteorder/Makefile4
-rw-r--r--devel/hs-bytestring-nums/Makefile4
-rw-r--r--devel/hs-bytestring-show/Makefile5
-rw-r--r--devel/hs-bytestring-show/distinfo4
-rw-r--r--devel/hs-c2hs/Makefile9
-rw-r--r--devel/hs-c2hs/distinfo4
-rw-r--r--devel/hs-c2hs/pkg-descr2
-rw-r--r--devel/hs-cabal-install/Makefile17
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/hs-cabal-install/files/cabal.in11
-rw-r--r--devel/hs-cabal-install/files/patch-Main.hs24
-rw-r--r--devel/hs-cabal-install/pkg-plist1
-rw-r--r--devel/hs-cereal/Makefile7
-rw-r--r--devel/hs-cereal/distinfo4
-rw-r--r--devel/hs-checkers/Makefile5
-rw-r--r--devel/hs-checkers/distinfo4
-rw-r--r--devel/hs-chunked-data/Makefile16
-rw-r--r--devel/hs-chunked-data/distinfo2
-rw-r--r--devel/hs-chunked-data/pkg-descr3
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile7
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo4
-rw-r--r--devel/hs-classy-prelude/Makefile10
-rw-r--r--devel/hs-classy-prelude/distinfo4
-rw-r--r--devel/hs-cmdargs/Makefile15
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-conduit-combinators/Makefile19
-rw-r--r--devel/hs-conduit-combinators/distinfo2
-rw-r--r--devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs68
-rw-r--r--devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal19
-rw-r--r--devel/hs-conduit-combinators/pkg-descr4
-rw-r--r--devel/hs-conduit-extra/Makefile17
-rw-r--r--devel/hs-conduit-extra/distinfo2
-rw-r--r--devel/hs-conduit-extra/pkg-descr7
-rw-r--r--devel/hs-conduit/Makefile10
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile5
-rw-r--r--devel/hs-configurator/distinfo4
-rw-r--r--devel/hs-convertible/Makefile5
-rw-r--r--devel/hs-convertible/distinfo4
-rw-r--r--devel/hs-cpphs/Makefile5
-rw-r--r--devel/hs-cpphs/distinfo4
-rw-r--r--devel/hs-cpphs/pkg-descr2
-rw-r--r--devel/hs-darcs/Makefile91
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs4
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal136
-rw-r--r--devel/hs-darcs/files/patch-src__Crypt__SHA256.hs10
-rw-r--r--devel/hs-darcs/files/patch-src__Darcs__Commands__Get.hs12
-rw-r--r--devel/hs-darcs/files/patch-src__Darcs__Global.hs26
-rw-r--r--devel/hs-darcs/files/patch-src__Darcs__SignalHandler.hs23
-rw-r--r--devel/hs-data-default-class/Makefile4
-rw-r--r--devel/hs-data-default-instances-base/Makefile4
-rw-r--r--devel/hs-data-default-instances-containers/Makefile4
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile4
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile4
-rw-r--r--devel/hs-data-default/Makefile4
-rw-r--r--devel/hs-data-hash/Makefile13
-rw-r--r--devel/hs-data-hash/distinfo2
-rw-r--r--devel/hs-data-hash/pkg-descr4
-rw-r--r--devel/hs-data-pprint/Makefile5
-rw-r--r--devel/hs-data-pprint/distinfo4
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal11
-rw-r--r--devel/hs-date-cache/Makefile4
-rw-r--r--devel/hs-datetime/Makefile2
-rw-r--r--devel/hs-deepseq-generics/Makefile13
-rw-r--r--devel/hs-deepseq-generics/distinfo2
-rw-r--r--devel/hs-deepseq-generics/pkg-descr5
-rw-r--r--devel/hs-directory-tree/Makefile5
-rw-r--r--devel/hs-directory-tree/distinfo4
-rw-r--r--devel/hs-dlist-instances/Makefile15
-rw-r--r--devel/hs-dlist-instances/distinfo2
-rw-r--r--devel/hs-dlist-instances/pkg-descr4
-rw-r--r--devel/hs-dlist/Makefile7
-rw-r--r--devel/hs-dlist/distinfo4
-rw-r--r--devel/hs-dlist/pkg-descr2
-rw-r--r--devel/hs-drift/Makefile61
-rw-r--r--devel/hs-drift/distinfo2
-rw-r--r--devel/hs-drift/files/patch-src__ChaseImports.hs19
-rw-r--r--devel/hs-drift/files/patch-src__DrIFT.hs21
-rw-r--r--devel/hs-drift/files/patch-src__GenUtil.hs91
-rw-r--r--devel/hs-drift/files/patch-src__Makefile.in11
-rw-r--r--devel/hs-drift/pkg-descr13
-rw-r--r--devel/hs-edit-distance/Makefile4
-rw-r--r--devel/hs-either/Makefile10
-rw-r--r--devel/hs-either/distinfo4
-rw-r--r--devel/hs-enclosed-exceptions/Makefile15
-rw-r--r--devel/hs-enclosed-exceptions/distinfo2
-rw-r--r--devel/hs-enclosed-exceptions/pkg-descr4
-rw-r--r--devel/hs-enumerator/Makefile5
-rw-r--r--devel/hs-enumerator/distinfo4
-rw-r--r--devel/hs-equivalence/Makefile15
-rw-r--r--devel/hs-equivalence/distinfo2
-rw-r--r--devel/hs-equivalence/pkg-descr5
-rw-r--r--devel/hs-errors/Makefile7
-rw-r--r--devel/hs-errors/distinfo4
-rw-r--r--devel/hs-exceptions/Makefile15
-rw-r--r--devel/hs-exceptions/distinfo2
-rw-r--r--devel/hs-exceptions/pkg-descr3
-rw-r--r--devel/hs-extensible-exceptions/Makefile4
-rw-r--r--devel/hs-failure/Makefile16
-rw-r--r--devel/hs-failure/distinfo2
-rw-r--r--devel/hs-failure/pkg-descr3
-rw-r--r--devel/hs-fast-logger/Makefile7
-rw-r--r--devel/hs-fast-logger/distinfo4
-rw-r--r--devel/hs-fgl/Makefile5
-rw-r--r--devel/hs-fgl/distinfo4
-rw-r--r--devel/hs-file-embed/Makefile5
-rw-r--r--devel/hs-file-embed/distinfo4
-rw-r--r--devel/hs-filemanip/Makefile4
-rw-r--r--devel/hs-filestore/Makefile5
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-filesystem-conduit/Makefile17
-rw-r--r--devel/hs-filesystem-conduit/distinfo2
-rw-r--r--devel/hs-filesystem-conduit/pkg-descr4
-rw-r--r--devel/hs-free/Makefile17
-rw-r--r--devel/hs-free/distinfo2
-rw-r--r--devel/hs-free/pkg-descr4
-rw-r--r--devel/hs-fsnotify/Makefile9
-rw-r--r--devel/hs-fsnotify/distinfo4
-rw-r--r--devel/hs-fsnotify/pkg-descr4
-rw-r--r--devel/hs-gconf/Makefile5
-rw-r--r--devel/hs-gconf/distinfo4
-rw-r--r--devel/hs-generic-deriving/Makefile5
-rw-r--r--devel/hs-generic-deriving/distinfo4
-rw-r--r--devel/hs-geniplate/Makefile5
-rw-r--r--devel/hs-geniplate/distinfo4
-rw-r--r--devel/hs-ghc-events/Makefile5
-rw-r--r--devel/hs-ghc-events/distinfo4
-rw-r--r--devel/hs-ghc-mtl/Makefile7
-rw-r--r--devel/hs-ghc-mtl/distinfo4
-rw-r--r--devel/hs-ghc-mtl/pkg-descr2
-rw-r--r--devel/hs-ghc-paths/Makefile4
-rw-r--r--devel/hs-gio/Makefile5
-rw-r--r--devel/hs-gio/distinfo4
-rw-r--r--devel/hs-git-annex/Makefile137
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-git-annex/files/patch-Build__Configure.hs11
-rw-r--r--devel/hs-git-annex/files/patch-Build__DesktopFile.hs34
-rw-r--r--devel/hs-git-annex/files/patch-Setup.hs10
-rw-r--r--devel/hs-git-annex/files/patch-Utility__Yesod.hs20
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal16
-rw-r--r--devel/hs-git-annex/pkg-plist8
-rw-r--r--devel/hs-glade/Makefile5
-rw-r--r--devel/hs-glade/distinfo4
-rw-r--r--devel/hs-glib/Makefile5
-rw-r--r--devel/hs-glib/distinfo4
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo4
-rw-r--r--devel/hs-gtk2hs-buildtools/pkg-descr14
-rw-r--r--devel/hs-haddock/Makefile7
-rw-r--r--devel/hs-haddock/distinfo4
-rw-r--r--devel/hs-haddock/files/patch-src__Haddock__Convert.hs15
-rw-r--r--devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs20
-rw-r--r--devel/hs-happy/Makefile5
-rw-r--r--devel/hs-happy/distinfo4
-rw-r--r--devel/hs-hashable/Makefile17
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashed-storage/Makefile7
-rw-r--r--devel/hs-hashed-storage/distinfo4
-rw-r--r--devel/hs-hashtables/Makefile7
-rw-r--r--devel/hs-hashtables/distinfo4
-rw-r--r--devel/hs-hashtables/pkg-descr7
-rw-r--r--devel/hs-haskeline/Makefile18
-rw-r--r--devel/hs-haskeline/distinfo2
-rw-r--r--devel/hs-haskeline/pkg-descr6
-rw-r--r--devel/hs-haskell-platform/Makefile79
-rw-r--r--devel/hs-haskell-src-exts/Makefile5
-rw-r--r--devel/hs-haskell-src-exts/distinfo4
-rw-r--r--devel/hs-haskell-src-exts/pkg-descr2
-rw-r--r--devel/hs-haskell-src/Makefile5
-rw-r--r--devel/hs-haskell-src/distinfo4
-rw-r--r--devel/hs-haskell-src/pkg-descr8
-rw-r--r--devel/hs-hasktags/Makefile7
-rw-r--r--devel/hs-hasktags/distinfo4
-rw-r--r--devel/hs-hasktags/pkg-descr2
-rw-r--r--devel/hs-hastache/Makefile7
-rw-r--r--devel/hs-hastache/distinfo4
-rw-r--r--devel/hs-hinotify/Makefile5
-rw-r--r--devel/hs-hinotify/distinfo4
-rw-r--r--devel/hs-hint/Makefile12
-rw-r--r--devel/hs-hint/distinfo4
-rw-r--r--devel/hs-hint/pkg-descr2
-rw-r--r--devel/hs-hlibev/Makefile4
-rw-r--r--devel/hs-hlint/Makefile9
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile14
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hslogger/Makefile5
-rw-r--r--devel/hs-hslogger/distinfo4
-rw-r--r--devel/hs-hslua/Makefile15
-rw-r--r--devel/hs-hslua/distinfo2
-rw-r--r--devel/hs-hslua/pkg-descr4
-rw-r--r--devel/hs-hspec-expectations/Makefile3
-rw-r--r--devel/hs-hspec-expectations/distinfo4
-rw-r--r--devel/hs-hspec/Makefile11
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-hspec/pkg-descr2
-rw-r--r--devel/hs-keys/Makefile15
-rw-r--r--devel/hs-keys/distinfo2
-rw-r--r--devel/hs-keys/pkg-descr3
-rw-r--r--devel/hs-kqueue/Makefile5
-rw-r--r--devel/hs-kqueue/distinfo4
-rw-r--r--devel/hs-language-c/Makefile8
-rw-r--r--devel/hs-language-c/distinfo4
-rw-r--r--devel/hs-language-javascript/Makefile8
-rw-r--r--devel/hs-language-javascript/distinfo4
-rw-r--r--devel/hs-largeword/Makefile5
-rw-r--r--devel/hs-largeword/distinfo4
-rw-r--r--devel/hs-largeword/pkg-descr2
-rw-r--r--devel/hs-lazysmallcheck/Makefile4
-rw-r--r--devel/hs-lens/Makefile20
-rw-r--r--devel/hs-lens/distinfo4
-rw-r--r--devel/hs-lens/files/patch-lens.cabal12
-rw-r--r--devel/hs-lifted-base/Makefile8
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-logict/Makefile7
-rw-r--r--devel/hs-logict/distinfo4
-rw-r--r--devel/hs-mmap/Makefile5
-rw-r--r--devel/hs-mmap/distinfo4
-rw-r--r--devel/hs-mmap/pkg-descr8
-rw-r--r--devel/hs-mmorph/Makefile7
-rw-r--r--devel/hs-mmorph/distinfo4
-rw-r--r--devel/hs-monad-control/Makefile8
-rw-r--r--devel/hs-monad-control/distinfo4
-rw-r--r--devel/hs-monad-logger/Makefile8
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-loops/Makefile11
-rw-r--r--devel/hs-monad-loops/distinfo2
-rw-r--r--devel/hs-monad-loops/pkg-descr3
-rw-r--r--devel/hs-monad-par-extras/Makefile8
-rw-r--r--devel/hs-monad-par-extras/distinfo4
-rw-r--r--devel/hs-monad-par/Makefile7
-rw-r--r--devel/hs-monad-par/distinfo4
-rw-r--r--devel/hs-monads-tf/Makefile13
-rw-r--r--devel/hs-monads-tf/distinfo2
-rw-r--r--devel/hs-monads-tf/pkg-descr4
-rw-r--r--devel/hs-mono-traversable/Makefile18
-rw-r--r--devel/hs-mono-traversable/distinfo2
-rw-r--r--devel/hs-mono-traversable/pkg-descr5
-rw-r--r--devel/hs-mtl/Makefile7
-rw-r--r--devel/hs-mtl/distinfo4
-rw-r--r--devel/hs-mueval/Makefile8
-rw-r--r--devel/hs-mueval/distinfo4
-rw-r--r--devel/hs-mueval/pkg-descr3
-rw-r--r--devel/hs-murmur-hash/Makefile5
-rw-r--r--devel/hs-murmur-hash/distinfo4
-rw-r--r--devel/hs-optparse-applicative/Makefile7
-rw-r--r--devel/hs-optparse-applicative/distinfo4
-rw-r--r--devel/hs-parallel/Makefile5
-rw-r--r--devel/hs-parallel/distinfo4
-rw-r--r--devel/hs-pcre-light/Makefile7
-rw-r--r--devel/hs-pcre-light/distinfo4
-rw-r--r--devel/hs-pcre-light/pkg-descr11
-rw-r--r--devel/hs-pool-conduit/Makefile17
-rw-r--r--devel/hs-pool-conduit/distinfo2
-rw-r--r--devel/hs-pool-conduit/pkg-descr4
-rw-r--r--devel/hs-prelude-extras/Makefile13
-rw-r--r--devel/hs-prelude-extras/distinfo2
-rw-r--r--devel/hs-prelude-extras/pkg-descr4
-rw-r--r--devel/hs-prettyclass/Makefile (renamed from devel/hs-StateVar/Makefile)8
-rw-r--r--devel/hs-prettyclass/distinfo2
-rw-r--r--devel/hs-prettyclass/pkg-descr5
-rw-r--r--devel/hs-primitive/Makefile5
-rw-r--r--devel/hs-primitive/distinfo4
-rw-r--r--devel/hs-primitive/pkg-descr4
-rw-r--r--devel/hs-profunctor-extras/Makefile17
-rw-r--r--devel/hs-profunctor-extras/distinfo2
-rw-r--r--devel/hs-profunctor-extras/pkg-descr5
-rw-r--r--devel/hs-profunctors/Makefile10
-rw-r--r--devel/hs-profunctors/distinfo4
-rw-r--r--devel/hs-profunctors/pkg-descr2
-rw-r--r--devel/hs-project-template/Makefile11
-rw-r--r--devel/hs-project-template/distinfo4
-rw-r--r--devel/hs-quickcheck-io/Makefile3
-rw-r--r--devel/hs-quickcheck-io/distinfo4
-rw-r--r--devel/hs-random/Makefile4
-rw-r--r--devel/hs-ranges/Makefile4
-rw-r--r--devel/hs-readline/Makefile4
-rw-r--r--devel/hs-reflection/Makefile5
-rw-r--r--devel/hs-reflection/distinfo4
-rw-r--r--devel/hs-resource-pool/Makefile9
-rw-r--r--devel/hs-resource-pool/distinfo4
-rw-r--r--devel/hs-resourcet/Makefile9
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-resourcet/pkg-descr5
-rw-r--r--devel/hs-safe/Makefile7
-rw-r--r--devel/hs-safe/distinfo4
-rw-r--r--devel/hs-safe/pkg-descr8
-rw-r--r--devel/hs-scientific/Makefile15
-rw-r--r--devel/hs-scientific/distinfo2
-rw-r--r--devel/hs-scientific/pkg-descr4
-rw-r--r--devel/hs-securemem/Makefile15
-rw-r--r--devel/hs-securemem/distinfo2
-rw-r--r--devel/hs-securemem/pkg-descr4
-rw-r--r--devel/hs-setenv/Makefile3
-rw-r--r--devel/hs-setenv/distinfo4
-rw-r--r--devel/hs-shake/Makefile18
-rw-r--r--devel/hs-shake/distinfo2
-rw-r--r--devel/hs-shake/pkg-descr14
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile4
-rw-r--r--devel/hs-simple-reflect/Makefile5
-rw-r--r--devel/hs-simple-reflect/distinfo4
-rw-r--r--devel/hs-simple-reflect/pkg-descr2
-rw-r--r--devel/hs-smallcheck/Makefile5
-rw-r--r--devel/hs-smallcheck/distinfo4
-rw-r--r--devel/hs-split/Makefile4
-rw-r--r--devel/hs-stm-chans/Makefile15
-rw-r--r--devel/hs-stm-chans/distinfo2
-rw-r--r--devel/hs-stm-chans/pkg-descr3
-rw-r--r--devel/hs-stm/Makefile4
-rw-r--r--devel/hs-streaming-commons/Makefile15
-rw-r--r--devel/hs-streaming-commons/distinfo2
-rw-r--r--devel/hs-streaming-commons/pkg-descr4
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile4
-rw-r--r--devel/hs-syb-with-class/Makefile5
-rw-r--r--devel/hs-syb-with-class/distinfo4
-rw-r--r--devel/hs-syb/Makefile5
-rw-r--r--devel/hs-syb/distinfo4
-rw-r--r--devel/hs-system-fileio/Makefile3
-rw-r--r--devel/hs-system-fileio/distinfo4
-rw-r--r--devel/hs-system-filepath/Makefile3
-rw-r--r--devel/hs-system-filepath/distinfo4
-rw-r--r--devel/hs-tagged/Makefile5
-rw-r--r--devel/hs-tagged/distinfo4
-rw-r--r--devel/hs-temporary/Makefile7
-rw-r--r--devel/hs-temporary/distinfo4
-rw-r--r--devel/hs-terminfo/Makefile19
-rw-r--r--devel/hs-terminfo/distinfo2
-rw-r--r--devel/hs-terminfo/pkg-descr6
-rw-r--r--devel/hs-test-framework-hunit/Makefile7
-rw-r--r--devel/hs-test-framework-hunit/distinfo4
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile8
-rw-r--r--devel/hs-test-framework-quickcheck2/distinfo4
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework-quickcheck2/pkg-descr2
-rw-r--r--devel/hs-test-framework/Makefile10
-rw-r--r--devel/hs-test-framework/distinfo4
-rw-r--r--devel/hs-testpack/Makefile2
-rw-r--r--devel/hs-text-icu/Makefile17
-rw-r--r--devel/hs-text-icu/distinfo2
-rw-r--r--devel/hs-text-icu/pkg-descr21
-rw-r--r--devel/hs-text/Makefile5
-rw-r--r--devel/hs-text/distinfo4
-rw-r--r--devel/hs-tf-random/Makefile15
-rw-r--r--devel/hs-tf-random/distinfo2
-rw-r--r--devel/hs-tf-random/pkg-descr5
-rw-r--r--devel/hs-threads/Makefile5
-rw-r--r--devel/hs-threads/distinfo4
-rw-r--r--devel/hs-threadscope/Makefile6
-rw-r--r--devel/hs-threadscope/distinfo4
-rw-r--r--devel/hs-threadscope/files/patch-GUI__Main.hs10
-rw-r--r--devel/hs-threadscope/files/patch-GUI__Timeline__Render.hs11
-rw-r--r--devel/hs-time-compat/Makefile4
-rw-r--r--devel/hs-timezone-olson/Makefile5
-rw-r--r--devel/hs-timezone-olson/distinfo4
-rw-r--r--devel/hs-timezone-series/Makefile5
-rw-r--r--devel/hs-timezone-series/distinfo4
-rw-r--r--devel/hs-transformers-base/Makefile7
-rw-r--r--devel/hs-transformers-base/distinfo4
-rw-r--r--devel/hs-transformers-compat/Makefile15
-rw-r--r--devel/hs-transformers-compat/distinfo2
-rw-r--r--devel/hs-transformers-compat/pkg-descr6
-rw-r--r--devel/hs-transformers/Makefile15
-rw-r--r--devel/hs-transformers/distinfo2
-rw-r--r--devel/hs-transformers/pkg-descr17
-rw-r--r--devel/hs-unamb/Makefile4
-rw-r--r--devel/hs-uniplate/Makefile5
-rw-r--r--devel/hs-uniplate/distinfo4
-rw-r--r--devel/hs-unix-compat/Makefile5
-rw-r--r--devel/hs-unix-compat/distinfo4
-rw-r--r--devel/hs-unix-time/Makefile10
-rw-r--r--devel/hs-unix-time/distinfo4
-rw-r--r--devel/hs-unix-time/files/nopatch-unix-time.cabal11
-rw-r--r--devel/hs-unordered-containers/Makefile5
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-utf8-light/Makefile5
-rw-r--r--devel/hs-utf8-light/distinfo4
-rw-r--r--devel/hs-utf8-string/Makefile5
-rw-r--r--devel/hs-utf8-string/distinfo4
-rw-r--r--devel/hs-utility-ht/Makefile7
-rw-r--r--devel/hs-utility-ht/distinfo4
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile4
-rw-r--r--devel/hs-uuagc-cabal/Makefile5
-rw-r--r--devel/hs-uuagc-cabal/distinfo4
-rw-r--r--devel/hs-uuagc/Makefile5
-rw-r--r--devel/hs-uuagc/distinfo4
-rw-r--r--devel/hs-uuid/Makefile7
-rw-r--r--devel/hs-uuid/distinfo4
-rw-r--r--devel/hs-uulib/Makefile5
-rw-r--r--devel/hs-uulib/distinfo4
-rw-r--r--devel/hs-vault/Makefile7
-rw-r--r--devel/hs-vault/distinfo4
-rw-r--r--devel/hs-vector-algorithms/Makefile7
-rw-r--r--devel/hs-vector-algorithms/distinfo4
-rw-r--r--devel/hs-vector-binary-instances/Makefile15
-rw-r--r--devel/hs-vector-binary-instances/distinfo2
-rw-r--r--devel/hs-vector-binary-instances/pkg-descr6
-rw-r--r--devel/hs-vector-instances/Makefile16
-rw-r--r--devel/hs-vector-instances/distinfo2
-rw-r--r--devel/hs-vector-instances/pkg-descr3
-rw-r--r--devel/hs-vector-th-unbox/Makefile15
-rw-r--r--devel/hs-vector-th-unbox/distinfo2
-rw-r--r--devel/hs-vector-th-unbox/pkg-descr5
-rw-r--r--devel/hs-vector/Makefile7
-rw-r--r--devel/hs-vector/distinfo4
-rw-r--r--devel/hs-vector/pkg-descr3
-rw-r--r--devel/hs-void/Makefile5
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-word8/Makefile5
-rw-r--r--devel/hs-word8/distinfo4
-rw-r--r--devel/pure-gen/Makefile2
-rw-r--r--devel/pure-gen/files/patch-dump-ast.hs18
-rw-r--r--dns/Makefile2
-rw-r--r--dns/hs-dns/Makefile16
-rw-r--r--dns/hs-dns/distinfo2
-rw-r--r--dns/hs-dns/pkg-descr4
-rw-r--r--dns/hs-gnuidn/Makefile19
-rw-r--r--dns/hs-gnuidn/distinfo2
-rw-r--r--dns/hs-gnuidn/pkg-descr3
-rw-r--r--ftp/hs-curl/Makefile4
-rw-r--r--games/hedgewars/files/patch-gameServer__Actions.hs11
-rw-r--r--graphics/hs-HGL/Makefile5
-rw-r--r--graphics/hs-HGL/distinfo4
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs27
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs20
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs26
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs20
-rw-r--r--graphics/hs-HGL/files/patch-HGL.cabal11
-rw-r--r--graphics/hs-HGL/pkg-descr16
-rw-r--r--graphics/hs-cairo/Makefile7
-rw-r--r--graphics/hs-cairo/distinfo4
-rw-r--r--graphics/hs-dia-base/Makefile4
-rw-r--r--graphics/hs-dia-base/files/patch-dia-base.cabal11
-rw-r--r--graphics/hs-dia-functions/Makefile6
-rw-r--r--graphics/hs-dia-functions/files/patch-dia-functions.cabal11
-rw-r--r--graphics/hs-soegtk/Makefile2
-rw-r--r--graphics/hs-svgcairo/Makefile7
-rw-r--r--graphics/hs-svgcairo/distinfo4
-rw-r--r--graphics/hs-svgcairo/pkg-descr2
-rw-r--r--lang/ghc/Makefile75
-rw-r--r--lang/ghc/bsd.cabal.mk27
-rw-r--r--lang/ghc/bsd.cabal.options.mk77
-rw-r--r--lang/ghc/bsd.hackage.mk847
-rw-r--r--lang/ghc/distinfo4
-rw-r--r--lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in11
-rw-r--r--lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in11
-rw-r--r--lang/ghc/files/nopatch-rules__distdir-way-opts.mk19
-rw-r--r--lang/ghc/files/patch-aclocal.m442
-rw-r--r--lang/ghc/files/patch-compiler-main-Dynflags.hs11
-rw-r--r--lang/ghc/files/patch-configure.ac78
-rw-r--r--lang/ghc/files/patch-ghc.mk36
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs42
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs38
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs39
-rw-r--r--lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc18
-rw-r--r--lang/ghc/files/patch-libraries__base__cbits__iconv.c51
-rw-r--r--lang/ghc/files/patch-mk-config.mk.in15
-rw-r--r--lang/ghc/files/patch-rts-ghc.mk104
-rw-r--r--lang/ghc/files/patch-rts_package.conf.in20
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-epic/Makefile6
-rw-r--r--lang/hs-unlambda/Makefile2
-rw-r--r--mail/hs-email-validate/Makefile5
-rw-r--r--mail/hs-email-validate/distinfo4
-rw-r--r--mail/hs-mime-mail/Makefile5
-rw-r--r--mail/hs-mime-mail/distinfo4
-rw-r--r--mail/hs-mime-types/Makefile3
-rw-r--r--mail/hs-mime-types/distinfo4
-rw-r--r--mail/hs-mime/Makefile7
-rw-r--r--mail/hs-mime/distinfo4
-rw-r--r--mail/hs-mime/pkg-descr2
-rw-r--r--math/Makefile4
-rw-r--r--math/hs-Agda/Makefile30
-rw-r--r--math/hs-Agda/distinfo4
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal27
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs24
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs13
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs11
-rw-r--r--math/hs-NumInstances/Makefile4
-rw-r--r--math/hs-categories/Makefile5
-rw-r--r--math/hs-categories/distinfo4
-rw-r--r--math/hs-categories/files/patch-src__Control__Categorical__Functor.hs101
-rw-r--r--math/hs-categories/files/patch-src__Control__Category__Dual.hs61
-rw-r--r--math/hs-comonad-transformers/Makefile17
-rw-r--r--math/hs-comonad-transformers/distinfo2
-rw-r--r--math/hs-comonad-transformers/pkg-descr3
-rw-r--r--math/hs-comonad/Makefile10
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-comonad/pkg-descr2
-rw-r--r--math/hs-comonads-fd/Makefile17
-rw-r--r--math/hs-comonads-fd/distinfo2
-rw-r--r--math/hs-comonads-fd/pkg-descr3
-rw-r--r--math/hs-contravariant/Makefile9
-rw-r--r--math/hs-contravariant/distinfo4
-rw-r--r--math/hs-contravariant/files/patch-contravariant.cabal12
-rw-r--r--math/hs-contravariant/pkg-descr2
-rw-r--r--math/hs-data-lens-template/Makefile5
-rw-r--r--math/hs-data-lens-template/distinfo4
-rw-r--r--math/hs-data-lens-template/pkg-descr2
-rw-r--r--math/hs-data-lens/Makefile10
-rw-r--r--math/hs-data-lens/distinfo4
-rw-r--r--math/hs-data-lens/pkg-descr2
-rw-r--r--math/hs-distributive/Makefile9
-rw-r--r--math/hs-distributive/distinfo4
-rw-r--r--math/hs-distributive/files/patch-distributive.cabal12
-rw-r--r--math/hs-distributive/pkg-descr2
-rw-r--r--math/hs-erf/Makefile4
-rw-r--r--math/hs-groupoids/Makefile16
-rw-r--r--math/hs-groupoids/distinfo2
-rw-r--r--math/hs-groupoids/pkg-descr3
-rw-r--r--math/hs-ieee754/Makefile4
-rw-r--r--math/hs-math-functions/Makefile9
-rw-r--r--math/hs-math-functions/distinfo4
-rw-r--r--math/hs-mwc-random/Makefile7
-rw-r--r--math/hs-mwc-random/distinfo4
-rw-r--r--math/hs-nats/Makefile9
-rw-r--r--math/hs-nats/distinfo4
-rw-r--r--math/hs-nats/pkg-descr2
-rw-r--r--math/hs-pointed/Makefile12
-rw-r--r--math/hs-pointed/distinfo4
-rw-r--r--math/hs-pointed/pkg-descr2
-rw-r--r--math/hs-probability/Makefile7
-rw-r--r--math/hs-probability/distinfo4
-rw-r--r--math/hs-semigroupoid-extras/Makefile16
-rw-r--r--math/hs-semigroupoid-extras/distinfo2
-rw-r--r--math/hs-semigroupoid-extras/pkg-descr3
-rw-r--r--math/hs-semigroupoids/Makefile11
-rw-r--r--math/hs-semigroupoids/distinfo4
-rw-r--r--math/hs-semigroups/Makefile9
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-semigroups/pkg-descr12
-rw-r--r--math/hs-statistics/Makefile10
-rw-r--r--math/hs-statistics/distinfo4
-rw-r--r--math/hs-vector-space/Makefile7
-rw-r--r--math/hs-vector-space/distinfo4
-rw-r--r--multimedia/hs-gstreamer/Makefile5
-rw-r--r--multimedia/hs-gstreamer/distinfo4
-rw-r--r--multimedia/hs-gstreamer/pkg-descr2
-rw-r--r--net/Makefile5
-rw-r--r--net/hs-connection/Makefile17
-rw-r--r--net/hs-connection/distinfo2
-rw-r--r--net/hs-connection/pkg-descr6
-rw-r--r--net/hs-gsasl/Makefile16
-rw-r--r--net/hs-gsasl/distinfo2
-rw-r--r--net/hs-gsasl/pkg-descr3
-rw-r--r--net/hs-hostname/Makefile4
-rw-r--r--net/hs-iproute/Makefile15
-rw-r--r--net/hs-iproute/distinfo2
-rw-r--r--net/hs-iproute/pkg-descr5
-rw-r--r--net/hs-maccatcher/Makefile4
-rw-r--r--net/hs-network-conduit/Makefile17
-rw-r--r--net/hs-network-conduit/distinfo2
-rw-r--r--net/hs-network-conduit/pkg-descr3
-rw-r--r--net/hs-network-info/Makefile5
-rw-r--r--net/hs-network-info/distinfo4
-rw-r--r--net/hs-network-info/pkg-descr9
-rw-r--r--net/hs-network-multicast/Makefile3
-rw-r--r--net/hs-network-multicast/distinfo4
-rw-r--r--net/hs-network-protocol-xmpp/Makefile16
-rw-r--r--net/hs-network-protocol-xmpp/distinfo2
-rw-r--r--net/hs-network-protocol-xmpp/pkg-descr3
-rw-r--r--net/hs-network/Makefile5
-rw-r--r--net/hs-network/distinfo4
-rw-r--r--net/hs-pcap/Makefile4
-rw-r--r--net/hs-publicsuffixlist/Makefile4
-rw-r--r--net/hs-sendfile/Makefile4
-rw-r--r--net/hs-simple-sendfile/Makefile7
-rw-r--r--net/hs-simple-sendfile/distinfo4
-rw-r--r--net/hs-socks/Makefile5
-rw-r--r--net/hs-socks/distinfo4
-rw-r--r--ports-mgmt/hs-porte/Makefile4
-rw-r--r--print/hs-hscolour/Makefile2
-rw-r--r--science/hs-bio/Makefile5
-rw-r--r--science/hs-bio/distinfo4
-rw-r--r--science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs19
-rw-r--r--security/Makefile15
-rw-r--r--security/hs-Crypto/Makefile4
-rw-r--r--security/hs-Crypto/files/patch-Crypto.cabal52
-rw-r--r--security/hs-DRBG/Makefile17
-rw-r--r--security/hs-DRBG/distinfo2
-rw-r--r--security/hs-DRBG/pkg-descr3
-rw-r--r--security/hs-HsOpenSSL/Makefile5
-rw-r--r--security/hs-HsOpenSSL/distinfo4
-rw-r--r--security/hs-HsOpenSSL/pkg-descr14
-rw-r--r--security/hs-RSA/Makefile31
-rw-r--r--security/hs-RSA/distinfo4
-rw-r--r--security/hs-SHA/Makefile20
-rw-r--r--security/hs-SHA/distinfo4
-rw-r--r--security/hs-certificate/Makefile24
-rw-r--r--security/hs-certificate/distinfo4
-rw-r--r--security/hs-cipher-aes/Makefile7
-rw-r--r--security/hs-cipher-aes/distinfo4
-rw-r--r--security/hs-cipher-aes128/Makefile15
-rw-r--r--security/hs-cipher-aes128/distinfo2
-rw-r--r--security/hs-cipher-aes128/pkg-descr3
-rw-r--r--security/hs-cipher-blowfish/Makefile16
-rw-r--r--security/hs-cipher-blowfish/distinfo2
-rw-r--r--security/hs-cipher-blowfish/pkg-descr3
-rw-r--r--security/hs-cipher-camellia/Makefile16
-rw-r--r--security/hs-cipher-camellia/distinfo2
-rw-r--r--security/hs-cipher-camellia/pkg-descr3
-rw-r--r--security/hs-cipher-des/Makefile15
-rw-r--r--security/hs-cipher-des/distinfo2
-rw-r--r--security/hs-cipher-des/pkg-descr3
-rw-r--r--security/hs-cipher-rc4/Makefile7
-rw-r--r--security/hs-cipher-rc4/distinfo4
-rw-r--r--security/hs-clientsession/Makefile9
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-cprng-aes/Makefile8
-rw-r--r--security/hs-cprng-aes/distinfo4
-rw-r--r--security/hs-crypto-api/Makefile7
-rw-r--r--security/hs-crypto-api/distinfo4
-rw-r--r--security/hs-crypto-cipher-types/Makefile15
-rw-r--r--security/hs-crypto-cipher-types/distinfo2
-rw-r--r--security/hs-crypto-cipher-types/pkg-descr3
-rw-r--r--security/hs-crypto-conduit/Makefile8
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-conduit/pkg-descr2
-rw-r--r--security/hs-crypto-numbers/Makefile7
-rw-r--r--security/hs-crypto-numbers/distinfo4
-rw-r--r--security/hs-crypto-pubkey-types/Makefile5
-rw-r--r--security/hs-crypto-pubkey-types/distinfo4
-rw-r--r--security/hs-crypto-pubkey/Makefile9
-rw-r--r--security/hs-crypto-pubkey/distinfo4
-rw-r--r--security/hs-crypto-random-api/Makefile4
-rw-r--r--security/hs-crypto-random/Makefile15
-rw-r--r--security/hs-crypto-random/distinfo2
-rw-r--r--security/hs-crypto-random/pkg-descr3
-rw-r--r--security/hs-cryptocipher/Makefile11
-rw-r--r--security/hs-cryptocipher/distinfo4
-rw-r--r--security/hs-cryptocipher/pkg-descr2
-rw-r--r--security/hs-cryptohash-conduit/Makefile15
-rw-r--r--security/hs-cryptohash-conduit/distinfo2
-rw-r--r--security/hs-cryptohash-conduit/pkg-descr4
-rw-r--r--security/hs-cryptohash-cryptoapi/Makefile15
-rw-r--r--security/hs-cryptohash-cryptoapi/distinfo2
-rw-r--r--security/hs-cryptohash-cryptoapi/pkg-descr3
-rw-r--r--security/hs-cryptohash/Makefile7
-rw-r--r--security/hs-cryptohash/distinfo4
-rw-r--r--security/hs-digest/Makefile4
-rw-r--r--security/hs-entropy/Makefile5
-rw-r--r--security/hs-entropy/distinfo4
-rw-r--r--security/hs-entropy/pkg-descr7
-rw-r--r--security/hs-gnutls/Makefile18
-rw-r--r--security/hs-gnutls/distinfo2
-rw-r--r--security/hs-gnutls/pkg-descr6
-rw-r--r--security/hs-monadcryptorandom/Makefile7
-rw-r--r--security/hs-monadcryptorandom/distinfo4
-rw-r--r--security/hs-pem/Makefile7
-rw-r--r--security/hs-pem/distinfo4
-rw-r--r--security/hs-pureMD5/Makefile4
-rw-r--r--security/hs-pwstore-fast/Makefile7
-rw-r--r--security/hs-pwstore-fast/distinfo4
-rw-r--r--security/hs-skein/Makefile5
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-tls-extra/Makefile18
-rw-r--r--security/hs-tls-extra/distinfo2
-rw-r--r--security/hs-tls-extra/pkg-descr3
-rw-r--r--security/hs-tls/Makefile12
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--security/hs-x509-store/Makefile16
-rw-r--r--security/hs-x509-store/distinfo2
-rw-r--r--security/hs-x509-store/pkg-descr4
-rw-r--r--security/hs-x509-system/Makefile15
-rw-r--r--security/hs-x509-system/distinfo2
-rw-r--r--security/hs-x509-system/pkg-descr3
-rw-r--r--security/hs-x509-validation/Makefile17
-rw-r--r--security/hs-x509-validation/distinfo2
-rw-r--r--security/hs-x509-validation/pkg-descr3
-rw-r--r--security/hs-x509/Makefile16
-rw-r--r--security/hs-x509/distinfo2
-rw-r--r--security/hs-x509/pkg-descr3
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/hs-angel/Makefile7
-rw-r--r--sysutils/hs-angel/distinfo4
-rw-r--r--sysutils/hs-angel/pkg-descr2
-rw-r--r--sysutils/hs-cpu/Makefile7
-rw-r--r--sysutils/hs-cpu/distinfo4
-rw-r--r--sysutils/hs-cpu/pkg-descr2
-rw-r--r--sysutils/hs-ekg-core/Makefile15
-rw-r--r--sysutils/hs-ekg-core/distinfo2
-rw-r--r--sysutils/hs-ekg-core/pkg-descr3
-rw-r--r--sysutils/hs-ekg/Makefile16
-rw-r--r--sysutils/hs-ekg/distinfo2
-rw-r--r--sysutils/hs-ekg/pkg-descr5
-rw-r--r--textproc/Makefile6
-rw-r--r--textproc/hs-Diff/Makefile5
-rw-r--r--textproc/hs-Diff/distinfo4
-rw-r--r--textproc/hs-HStringTemplate/Makefile5
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-HaXml/Makefile5
-rw-r--r--textproc/hs-HaXml/distinfo4
-rw-r--r--textproc/hs-appar/Makefile (renamed from textproc/hs-xhtml/Makefile)9
-rw-r--r--textproc/hs-appar/distinfo2
-rw-r--r--textproc/hs-appar/pkg-descr3
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile16
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo2
-rw-r--r--textproc/hs-attoparsec-conduit/pkg-descr3
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile3
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/pkg-descr2
-rw-r--r--textproc/hs-attoparsec/Makefile4
-rw-r--r--textproc/hs-blaze-html/Makefile7
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile5
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile9
-rw-r--r--textproc/hs-case-insensitive/Makefile7
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/Makefile42
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile4
-rw-r--r--textproc/hs-feed/Makefile7
-rw-r--r--textproc/hs-feed/distinfo4
-rw-r--r--textproc/hs-feed/pkg-descr2
-rw-r--r--textproc/hs-hexpat/Makefile8
-rw-r--r--textproc/hs-hexpat/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/Makefile21
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile5
-rw-r--r--textproc/hs-html-conduit/Makefile8
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html/Makefile4
-rw-r--r--textproc/hs-hxt-charproperties/Makefile5
-rw-r--r--textproc/hs-hxt-charproperties/distinfo4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-unicode/Makefile7
-rw-r--r--textproc/hs-hxt-unicode/distinfo4
-rw-r--r--textproc/hs-hxt/Makefile5
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-lhs2tex/Makefile4
-rw-r--r--textproc/hs-libxml-sax/Makefile18
-rw-r--r--textproc/hs-libxml-sax/distinfo2
-rw-r--r--textproc/hs-libxml-sax/pkg-descr3
-rw-r--r--textproc/hs-libxml/Makefile4
-rw-r--r--textproc/hs-pandoc-types/Makefile5
-rw-r--r--textproc/hs-pandoc-types/distinfo4
-rw-r--r--textproc/hs-pandoc/Makefile40
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs14
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal11
-rw-r--r--textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs11
-rw-r--r--textproc/hs-pandoc/pkg-descr29
-rw-r--r--textproc/hs-parsec/Makefile5
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr11
-rw-r--r--textproc/hs-polyparse/Makefile2
-rw-r--r--textproc/hs-regex-base/Makefile4
-rw-r--r--textproc/hs-regex-compat/Makefile4
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile5
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo4
-rw-r--r--textproc/hs-regex-pcre-builtin/pkg-descr3
-rw-r--r--textproc/hs-regex-posix/Makefile4
-rw-r--r--textproc/hs-regex-tdfa/Makefile5
-rw-r--r--textproc/hs-regex-tdfa/distinfo4
-rw-r--r--textproc/hs-stringsearch/Makefile5
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-tagsoup/Makefile10
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile11
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal11
-rw-r--r--textproc/hs-texmath/Makefile20
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-uri/Makefile15
-rw-r--r--textproc/hs-uri/distinfo2
-rw-r--r--textproc/hs-uri/pkg-descr4
-rw-r--r--textproc/hs-xhtml/distinfo2
-rw-r--r--textproc/hs-xhtml/pkg-descr4
-rw-r--r--textproc/hs-xml-conduit/Makefile14
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/files/patch-xml-conduit.cabal11
-rw-r--r--textproc/hs-xml-hamlet/Makefile15
-rw-r--r--textproc/hs-xml-hamlet/distinfo2
-rw-r--r--textproc/hs-xml-hamlet/pkg-descr3
-rw-r--r--textproc/hs-xml-types/Makefile3
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml/Makefile4
-rw-r--r--textproc/hs-xmlhtml/Makefile5
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-yaml/Makefile11
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--textproc/hs-yaml/pkg-descr2
-rw-r--r--www/Makefile12
-rw-r--r--www/hs-DAV/Makefile21
-rw-r--r--www/hs-DAV/distinfo2
-rw-r--r--www/hs-DAV/pkg-descr6
-rw-r--r--www/hs-HTTP/Makefile7
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-activehs/Makefile10
-rw-r--r--www/hs-activehs/files/patch-Converter.hs20
-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.hs11
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal34
-rw-r--r--www/hs-authenticate/Makefile11
-rw-r--r--www/hs-authenticate/distinfo4
-rw-r--r--www/hs-cgi/Makefile7
-rw-r--r--www/hs-cgi/distinfo4
-rw-r--r--www/hs-cgi/files/patch-Network__CGI__Monad.hs30
-rw-r--r--www/hs-cgi/files/patch-Network__CGI__Protocol.hs35
-rw-r--r--www/hs-cookie/Makefile5
-rw-r--r--www/hs-cookie/distinfo4
-rw-r--r--www/hs-css-text/Makefile7
-rw-r--r--www/hs-css-text/distinfo4
-rw-r--r--www/hs-fastcgi/Makefile4
-rw-r--r--www/hs-gitit/Makefile14
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-hS3/Makefile5
-rw-r--r--www/hs-hS3/distinfo4
-rw-r--r--www/hs-hamlet/Makefile17
-rw-r--r--www/hs-hamlet/distinfo2
-rw-r--r--www/hs-hamlet/pkg-descr6
-rw-r--r--www/hs-happstack-server/Makefile11
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile5
-rw-r--r--www/hs-happstack/distinfo4
-rw-r--r--www/hs-heist/Makefile7
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile10
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-http-client-tls/Makefile16
-rw-r--r--www/hs-http-client-tls/distinfo2
-rw-r--r--www/hs-http-client-tls/pkg-descr3
-rw-r--r--www/hs-http-client/Makefile18
-rw-r--r--www/hs-http-client/distinfo2
-rw-r--r--www/hs-http-client/pkg-descr4
-rw-r--r--www/hs-http-conduit/Makefile17
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-conduit/pkg-descr4
-rw-r--r--www/hs-http-date/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/Makefile14
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-reverse-proxy/pkg-descr7
-rw-r--r--www/hs-http-server/Makefile8
-rw-r--r--www/hs-http-server/distinfo4
-rw-r--r--www/hs-http-types/Makefile5
-rw-r--r--www/hs-http-types/distinfo4
-rw-r--r--www/hs-oeis/Makefile9
-rw-r--r--www/hs-oeis/distinfo4
-rw-r--r--www/hs-path-pieces/Makefile5
-rw-r--r--www/hs-path-pieces/distinfo4
-rw-r--r--www/hs-recaptcha/Makefile7
-rw-r--r--www/hs-recaptcha/distinfo4
-rw-r--r--www/hs-scgi/Makefile4
-rw-r--r--www/hs-shakespeare-css/Makefile16
-rw-r--r--www/hs-shakespeare-css/distinfo2
-rw-r--r--www/hs-shakespeare-css/pkg-descr11
-rw-r--r--www/hs-shakespeare-i18n/Makefile16
-rw-r--r--www/hs-shakespeare-i18n/distinfo2
-rw-r--r--www/hs-shakespeare-i18n/pkg-descr5
-rw-r--r--www/hs-shakespeare-js/Makefile16
-rw-r--r--www/hs-shakespeare-js/distinfo2
-rw-r--r--www/hs-shakespeare-js/pkg-descr11
-rw-r--r--www/hs-shakespeare-text/Makefile16
-rw-r--r--www/hs-shakespeare-text/distinfo2
-rw-r--r--www/hs-shakespeare-text/pkg-descr11
-rw-r--r--www/hs-shakespeare/Makefile7
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile11
-rw-r--r--www/hs-snap-core/distinfo4
-rw-r--r--www/hs-snap-server/Makefile18
-rw-r--r--www/hs-snap-server/distinfo4
-rw-r--r--www/hs-snap/Makefile23
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-snap/files/patch-snap.cabal19
-rw-r--r--www/hs-url/Makefile4
-rw-r--r--www/hs-wai-app-static/Makefile15
-rw-r--r--www/hs-wai-app-static/distinfo4
-rw-r--r--www/hs-wai-app-static/pkg-descr2
-rw-r--r--www/hs-wai-extra/Makefile14
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-logger/Makefile10
-rw-r--r--www/hs-wai-logger/distinfo4
-rw-r--r--www/hs-wai-test/Makefile19
-rw-r--r--www/hs-wai-test/distinfo2
-rw-r--r--www/hs-wai-test/pkg-descr3
-rw-r--r--www/hs-wai/Makefile9
-rw-r--r--www/hs-wai/distinfo4
-rw-r--r--www/hs-warp-tls/Makefile16
-rw-r--r--www/hs-warp-tls/distinfo2
-rw-r--r--www/hs-warp-tls/pkg-descr3
-rw-r--r--www/hs-warp/Makefile12
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-webkit/Makefile7
-rw-r--r--www/hs-webkit/distinfo4
-rw-r--r--www/hs-webkit/pkg-descr3
-rw-r--r--www/hs-xss-sanitize/Makefile5
-rw-r--r--www/hs-xss-sanitize/distinfo4
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile16
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo2
-rw-r--r--www/hs-yesod-auth-hashdb/pkg-descr5
-rw-r--r--www/hs-yesod-auth/Makefile17
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-auth/files/patch-yesod-auth.cabal21
-rw-r--r--www/hs-yesod-bin/Makefile27
-rw-r--r--www/hs-yesod-bin/distinfo2
-rw-r--r--www/hs-yesod-bin/files/patch-yesod-bin.cabal21
-rw-r--r--www/hs-yesod-bin/pkg-descr3
-rw-r--r--www/hs-yesod-core/Makefile22
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-core/files/patch-yesod-core.cabal40
-rw-r--r--www/hs-yesod-core/pkg-descr2
-rw-r--r--www/hs-yesod-form/Makefile12
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-form/files/patch-yesod-form.cabal13
-rw-r--r--www/hs-yesod-persistent/Makefile8
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile251
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal62
-rw-r--r--www/hs-yesod-routes/Makefile3
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-static/Makefile17
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-static/files/patch-yesod-static.cabal18
-rw-r--r--www/hs-yesod-test/Makefile8
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod-test/files/patch-yesod-test.cabal10
-rw-r--r--www/hs-yesod/Makefile14
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--www/hs-yesod/files/patch-yesod.cabal19
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile7
-rw-r--r--x11-toolkits/hs-GLURaw/distinfo4
-rw-r--r--x11-toolkits/hs-GLUT/Makefile9
-rw-r--r--x11-toolkits/hs-GLUT/distinfo4
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile7
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo4
-rw-r--r--x11-toolkits/hs-OpenGL/pkg-descr2
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile5
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo4
-rw-r--r--x11-toolkits/hs-gtk/Makefile5
-rw-r--r--x11-toolkits/hs-gtk/distinfo4
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile62
-rw-r--r--x11-toolkits/hs-gtk2hs/pkg-descr2
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile5
-rw-r--r--x11-toolkits/hs-gtkglext/distinfo4
-rw-r--r--x11-toolkits/hs-gtkglext/pkg-descr2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile5
-rw-r--r--x11-toolkits/hs-gtksourceview2/distinfo4
-rw-r--r--x11-toolkits/hs-gtksourceview2/pkg-descr2
-rw-r--r--x11-toolkits/hs-pango/Makefile5
-rw-r--r--x11-toolkits/hs-pango/distinfo4
-rw-r--r--x11-toolkits/hs-vte/Makefile5
-rw-r--r--x11-toolkits/hs-vte/distinfo4
-rw-r--r--x11-toolkits/hs-vte/pkg-descr2
-rw-r--r--x11-toolkits/hs-wx/Makefile7
-rw-r--r--x11-toolkits/hs-wx/distinfo4
-rw-r--r--x11-toolkits/hs-wx/pkg-descr2
-rw-r--r--x11-toolkits/hs-wxc/Makefile18
-rw-r--r--x11-toolkits/hs-wxc/distinfo4
-rw-r--r--x11-toolkits/hs-wxc/files/nopatch-wxc.cabal11
-rw-r--r--x11-toolkits/hs-wxc/files/patch-src__cpp__eljpen.cpp11
-rw-r--r--x11-toolkits/hs-wxc/files/patch-wxc.cabal7
-rw-r--r--x11-toolkits/hs-wxc/pkg-descr6
-rw-r--r--x11-toolkits/hs-wxcore/Makefile7
-rw-r--r--x11-toolkits/hs-wxcore/distinfo4
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-wxcore.cabal19
-rw-r--r--x11-toolkits/hs-wxcore/pkg-descr7
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile9
-rw-r--r--x11-toolkits/hs-wxdirect/distinfo4
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs10
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs10
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal18
-rw-r--r--x11-toolkits/hs-wxdirect/pkg-descr3
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile23
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo4
-rw-r--r--x11-wm/hs-xmonad/Makefile6
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile23
-rw-r--r--x11/hs-X11/distinfo4
-rw-r--r--x11/hs-X11/pkg-descr1
-rw-r--r--x11/hs-xmobar/Makefile77
-rw-r--r--x11/hs-xmobar/distinfo4
-rw-r--r--x11/hs-xmobar/pkg-descr2
1139 files changed, 5752 insertions, 4820 deletions
diff --git a/MOVED b/MOVED
index 6cf69468e3a..7f346ebc6de 100644
--- a/MOVED
+++ b/MOVED
@@ -6375,3 +6375,32 @@ security/p5-openxpki-client|security/p5-openxpki|2014-08-04|Has expired: now inc
security/p5-openxpki-client-scep|security/p5-openxpki|2014-08-04|Has expired: now incorporated within security/p5-openxpki
security/p5-openxpki-deployment|security/p5-openxpki|2014-08-04|Has expired: now incorporated within security/p5-openxpki
news/husky-base-devel||2014-08-05|Has been incorporated into the build process of other husky-*-devel ports
+archivers/hs-zlib-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
+devel/hs-IORefCAS||2014-08-10|Removed: Deprecated in favor of atomic-primops
+devel/hs-Tensor||2014-08-10|Removed: Deprecated
+devel/hs-StateVar||2014-08-10|Removed: Deprecated
+devel/hs-attempt||2014-08-10|Removed: Deprecated in favor of exceptions
+devel/hs-base64-conduit||2014-08-10|Removed: Deprecated in favor of conduit-combinators
+devel/hs-blaze-builder-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
+devel/hs-drift|devel/hs-DrIFT|2014-08-10|Renamed: Converted to use the Cabal framework
+devel/hs-failure||2014-08-10|Removed: Deprecated in favor or exceptions
+devel/hs-filesystem-conduit||2014-08-10|Removed: Deprecated in favor of conduit-combinators
+devel/hs-haskeline||2014-08-10|Removed: Become part of GHC
+devel/hs-pool-conduit||2014-08-10|Removed: Deprecated in favor of resource-pool
+devel/hs-profunctor-extras||2014-08-10|The package has been absorbed into profunctors
+devel/hs-terminfo||2014-08-10|Removed: Become part of GHC
+devel/hs-transformers||2014-08-10|Removed: Become part of GHC
+math/hs-comonad-transformers||2014-08-10|Deprecated in favor of comonad
+math/hs-comonads-fd||2014-08-10|Deprecated in favor of comonad
+math/hs-groupoids||2014-08-10|Deprecated in favor of semigroupoids
+math/hs-semigroupoid-extras||2014-08-10|Deprecated in favor of semigroupoids
+net/hs-network-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
+security/hs-tls-extra||2014-08-10|Removed: Deprecated in favor of tls
+textproc/hs-attoparsec-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
+textproc/hs-xhtml||2014-08-10|Removed: Become part of GHC
+www/hs-hamlet||2014-08-10|Removed: Deprecated in favor of shakespeare
+www/hs-shakespeare-css||2014-08-10|Removed: Deprecated in favor of shakespeare
+www/hs-shakespeare-i18n||2014-08-10|Removed: Deprecated in favor of shakespeare
+www/hs-shakespeare-js||2014-08-10|Removed: Deprecated in favor of shakespeare
+www/hs-shakespeare-text||2014-08-10|Removed: Deprecated in favor of shakespeare
+www/hs-wai-test||2014-08-10|Removed: Deprecated in favor of wai-extra
diff --git a/UPDATING b/UPDATING
index 31b3d57a454..2dd0436cca2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ 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.
+20140810:
+ AFFECTS: users of lang/ghc and */hs-*
+ AUTHOR: haskell@FreeBSD.org
+
+ The Glorious Glasgow Haskell Compiler has been updated to version
+ 7.8.3 and Haskell Platform to 2014.2.0.0. Hence it is recommended to
+ rebuild or reinstall all the dependent ports by one of the following
+ commands:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+ or
+ # pkg upgrade
+
20140803:
AFFECTS: users of security/p5-openxpki
AUTHOR: wg@FreeBSD.org
diff --git a/archivers/Makefile b/archivers/Makefile
index c390008ba4a..e1da4419a6b 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -41,7 +41,6 @@
SUBDIR += hs-zip-archive
SUBDIR += hs-zlib
SUBDIR += hs-zlib-bindings
- SUBDIR += hs-zlib-conduit
SUBDIR += hs-zlib-enum
SUBDIR += javatar
SUBDIR += jzip.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index 75a3124b4a0..6bde66c7101 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tar
PORTVERSION= 0.4.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 863d5db2bad..18fdaa34ab1 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.1.3.4
-PORTREVISION= 5
+PORTVERSION= 0.2.3.2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,20 +9,13 @@ COMMENT= Library for creating and modifying zip archives
LICENSE= BSD3CLAUSE
-USE_CABAL= digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib
+USE_CABAL= digest>=0.0.0.1 mtl text>=0.11 zlib
-OPTIONS_DEFINE= EXECUTABLE
+FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the Zip executable
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-EXECUTABLE= Zip
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+EXECUTABLE_DESC= Build the Zip executable
+EXECUTABLE_FLAG_ENABLE= executable
+EXECUTABLE_FLAG_EXECUTABLE= Zip
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index f4b39a75387..e346eb9932d 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.3.4.tar.gz) = cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643
-SIZE (cabal/zip-archive-0.1.3.4.tar.gz) = 11250
+SHA256 (cabal/zip-archive-0.2.3.2.tar.gz) = c18120e1d2e50c8b56d2a4a70fcd28c1f31403ae8a2d43efa333702fcdd4c9f8
+SIZE (cabal/zip-archive-0.2.3.2.tar.gz) = 11513
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 0b9c649ea0d..b7a4f013b9e 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,13 +2,13 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.1.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Low-level bindings to the zlib package
-LICENSE= BSD2CLAUSE
+LICENSE= BSD3CLAUSE
USE_CABAL= zlib>=0.5.2.0
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
deleted file mode 100644
index 1ffcb8800e9..00000000000
--- a/archivers/hs-zlib-conduit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= zlib-conduit
-PORTVERSION= 1.0.0
-PORTREVISION= 5
-CATEGORIES= archivers haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Streaming compression/decompression via conduits
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= conduit>=1.0 transformers>=0.2.2 void zlib-bindings>=0.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/archivers/hs-zlib-conduit/distinfo b/archivers/hs-zlib-conduit/distinfo
deleted file mode 100644
index 2edd2c0aad7..00000000000
--- a/archivers/hs-zlib-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/zlib-conduit-1.0.0.tar.gz) = 7b81c7902e7c0b3fc1ec089764d4eaa11fa2964020121b8e949c091738261460
-SIZE (cabal/zlib-conduit-1.0.0.tar.gz) = 3461
diff --git a/archivers/hs-zlib-conduit/pkg-descr b/archivers/hs-zlib-conduit/pkg-descr
deleted file mode 100644
index cac9da7c591..00000000000
--- a/archivers/hs-zlib-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Streaming compression/decompression via conduits.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 3d3a5ac35cd..9031d188070 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zlib-enum
-PORTVERSION= 0.2.3
-PORTREVISION= 6
+PORTVERSION= 0.2.3.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Enumerator interface for zlib compression
LICENSE= MIT
-USE_CABAL= enumerator transformers>=0.2 zlib-bindings
+USE_CABAL= enumerator>=0.4 zlib-bindings>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/archivers/hs-zlib-enum/distinfo b/archivers/hs-zlib-enum/distinfo
index 9c44df60332..8360108738e 100644
--- a/archivers/hs-zlib-enum/distinfo
+++ b/archivers/hs-zlib-enum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-enum-0.2.3.tar.gz) = 21b644a72ae4b971d4a6229801f3e1f424ec62579c17092ed88a32ca09142753
-SIZE (cabal/zlib-enum-0.2.3.tar.gz) = 4652
+SHA256 (cabal/zlib-enum-0.2.3.1.tar.gz) = e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9
+SIZE (cabal/zlib-enum-0.2.3.1.tar.gz) = 4652
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 51ba4bd9aa8..df63a1f9653 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -3,13 +3,13 @@
PORTNAME= zlib
PORTVERSION= 0.5.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Compression and decompression in the gzip and zlib formats
-LICENSE= BSD2CLAUSE
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index dc95b56e384..5e703e7d847 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= ALUT
-PORTVERSION= 2.2.0.0
-PORTREVISION= 14
+PORTVERSION= 2.3.0.1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding for the OpenAL Utility Toolkit
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= OpenAL StateVar
+USE_CABAL= OpenAL>=1.6.0.0 OpenGL>=2.9.0.0
USES= openal:al,alut
INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
diff --git a/audio/hs-ALUT/distinfo b/audio/hs-ALUT/distinfo
index 8e3a95fa249..96a2d54cd7e 100644
--- a/audio/hs-ALUT/distinfo
+++ b/audio/hs-ALUT/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ALUT-2.2.0.0.tar.gz) = 9d5ffa3450c51d641f055eaa48c0613984b45c46347a3e9055b098abba0e3a44
-SIZE (cabal/ALUT-2.2.0.0.tar.gz) = 94174
+SHA256 (cabal/ALUT-2.3.0.1.tar.gz) = f9511be911b73eb4c7358f69e1ed12746ba0b30e7e26e9a4a5825dcbd6a23e66
+SIZE (cabal/ALUT-2.3.0.1.tar.gz) = 25500
diff --git a/audio/hs-ALUT/pkg-descr b/audio/hs-ALUT/pkg-descr
index 575c34ce514..e3411af8a3e 100644
--- a/audio/hs-ALUT/pkg-descr
+++ b/audio/hs-ALUT/pkg-descr
@@ -1,6 +1,5 @@
-A Haskell binding for the OpenAL Utility Toolkit, which makes
-managing of OpenAL contexts, loading sounds in various formats
-and creating waveforms very easy. For more information about the
-C library on which this binding is based, please see:
+A Haskell binding for the OpenAL Utility Toolkit, which makes managing
+of OpenAL contexts, loading sounds in various formats and creating
+waveforms very easy.
-WWW: http://connect.creativelabs.com/openal/
+WWW: https://github.com/haskell-openal/ALUT
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 85645788aea..42d3d016362 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= OpenAL
-PORTVERSION= 1.4.0.2
-PORTREVISION= 5
+PORTVERSION= 1.6.0.0
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the OpenAL cross-platform 3D audio API
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= ObjectName StateVar Tensor
+USE_CABAL= OpenGL>=2.9.0.0
USES= openal:al
INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
diff --git a/audio/hs-OpenAL/distinfo b/audio/hs-OpenAL/distinfo
index 35403acdcbb..0d4b175b848 100644
--- a/audio/hs-OpenAL/distinfo
+++ b/audio/hs-OpenAL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenAL-1.4.0.2.tar.gz) = 7febf0d9ab1832275208ca1387fb238e5452e363e0978420066370114bbb04a7
-SIZE (cabal/OpenAL-1.4.0.2.tar.gz) = 116835
+SHA256 (cabal/OpenAL-1.6.0.0.tar.gz) = ed919152957ce4d5f81f4835d42dc709e370cf77595b522379236e64a707822f
+SIZE (cabal/OpenAL-1.6.0.0.tar.gz) = 41111
diff --git a/audio/hs-OpenAL/pkg-descr b/audio/hs-OpenAL/pkg-descr
index 58835b85fd1..9698beca8ec 100644
--- a/audio/hs-OpenAL/pkg-descr
+++ b/audio/hs-OpenAL/pkg-descr
@@ -1,5 +1,5 @@
A Haskell binding for the OpenAL cross-platform 3D audio API,
-appropriate for use with gaming applications and many other
-types of audio applications. For more information about OpenAL.
+appropriate for use with gaming applications and many other types of
+audio applications. For more information about OpenAL.
-WWW: http://connect.creativelabs.com/openal/
+WWW: https://github.com/haskell-openal/ALUT
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index daceac2d8cc..b4b3b09e1a0 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.8.0.2
-PORTREVISION= 5
+PORTVERSION= 0.8.0.5
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= MPD client library
LICENSE= LGPL21
-USE_CABAL= mtl>=2.0 network>=2.1 text utf8-string>=0.3.1
+USE_CABAL= attoparsec>=0.10.1 data-default>=0.4.0 mtl>=2.0 network>=2.1 \
+ text>=0.11 utf8-string>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 506e1964c63..bae7762701c 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/libmpd-0.8.0.2.tar.gz) = 5201623568eea7fb13ddfdad1ea6bf7657da9a01e9ac061614fc2a4dcb5a14de
-SIZE (cabal/libmpd-0.8.0.2.tar.gz) = 40189
+SHA256 (cabal/libmpd-0.8.0.5.tar.gz) = 10ca58e2e27e3d3f79e9b90d7ac562822b9146ff1cfff3db58dbd5986817ad4b
+SIZE (cabal/libmpd-0.8.0.5.tar.gz) = 39993
diff --git a/audio/hs-libmpd/pkg-descr b/audio/hs-libmpd/pkg-descr
index 3433bd44b56..e31667db08f 100644
--- a/audio/hs-libmpd/pkg-descr
+++ b/audio/hs-libmpd/pkg-descr
@@ -1,3 +1,3 @@
A client library for MPD, the Music Player Daemon.
-WWW: http://github.com/joachifm/libmpd-haskell
+WWW: http://github.com/joachifm/libmpd-haskell#readme
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 76448002120..549ea7efd96 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,18 +2,17 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 0.6.2.1
-PORTREVISION= 6
+PORTVERSION= 0.8.1.0
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Robust, reliable performance measurement and analysis
-LICENSE= BSD2CLAUSE
+LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.3.2.12 hastache>=0.5.0 mtl>=2 mwc-random>=0.8.0.3 \
- parsec>=3.1.0 statistics>=0.10.0.0 transformers \
- vector>=0.7.1 vector-algorithms>=0.4
+USE_CABAL= aeson>=0.3.2.12 Glob>=0.7.2 hastache>=0.6.0 mtl>=2 \
+ mwc-random>=0.8.0.3 parsec>=3.1.0 statistics>=0.11 \
+ text>=0.11 vector>=0.7.1 vector-algorithms>=0.4
INSTALL_PORTEXAMPLES= \
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index f572fe79d59..84f9c95004e 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/criterion-0.6.2.1.tar.gz) = e59732cd1401b0201c032adc9a67c96ae8556baa7f8e91059c006b8c83d1eb21
-SIZE (cabal/criterion-0.6.2.1.tar.gz) = 153292
+SHA256 (cabal/criterion-0.8.1.0.tar.gz) = ed8b5950afb9b4b73204226aea5659e1dbd7bd2682131fa56da4412e54b5f97b
+SIZE (cabal/criterion-0.8.1.0.tar.gz) = 155095
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 219293018c8..7a66b48071e 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 0.6.1.0
-PORTREVISION= 6
+PORTVERSION= 0.7.0.6
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast JSON parsing and encoding
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.8.6.1 blaze-builder>=0.2.1.4 dlist>=0.2 \
- hashable>=1.1.2.0 mtl syb text>=0.11.1.0 \
- unordered-containers>=0.1.3.0 vector>=0.7.1
+USE_CABAL= attoparsec>=0.10.4.0 dlist>=0.2 hashable>=1.1.2.0 mtl \
+ scientific>=0.3.1 syb text>=0.11.1.0 unordered-containers>=0.2.3.0 \
+ vector>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index 7152a620d76..c64246dd65b 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/aeson-0.6.1.0.tar.gz) = 7d4de8aee47d3ed7f5171c619a83a18f741dfb4a59808e9e0eb3beba3ce3129a
-SIZE (cabal/aeson-0.6.1.0.tar.gz) = 101599
+SHA256 (cabal/aeson-0.7.0.6.tar.gz) = 645531759ba18105cadf024415e1be60353ad704ac686ff5ee67c7f4754d4e6f
+SIZE (cabal/aeson-0.7.0.6.tar.gz) = 141565
diff --git a/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs b/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
new file mode 100644
index 00000000000..759362be0d6
--- /dev/null
+++ b/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
@@ -0,0 +1,76 @@
+--- ./Data/Aeson/Parser/Internal.hs.orig 2014-05-16 17:43:52.000000000 +0200
++++ ./Data/Aeson/Parser/Internal.hs 2014-07-12 19:54:00.000000000 +0200
+@@ -41,25 +41,29 @@
+ (Builder, byteString, toLazyByteString, charUtf8, word8)
+ #endif
+
+-import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
++import Control.Applicative ((*>), (<$>), (<*), (<|>), liftA2, pure)
++import Control.Monad (when, void)
+ import Data.Aeson.Types (Result(..), Value(..))
+-import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,
+- skipSpace, string)
++import Data.Attoparsec.Char8 (Parser, char, endOfInput, isDigit_w8,
++ skipSpace, string, decimal, signed)
+ import Data.Bits ((.|.), shiftL)
+ import Data.ByteString (ByteString)
+ import Data.Char (chr)
+ import Data.Monoid (mappend, mempty)
++import Data.Scientific (Scientific)
+ import Data.Text (Text)
+ import Data.Text.Encoding (decodeUtf8')
+ import Data.Vector as Vector (Vector, fromList)
+ import Data.Word (Word8)
+ import qualified Data.Attoparsec as A
++import qualified Data.Attoparsec.ByteString as I
+ import qualified Data.Attoparsec.Lazy as L
+ import qualified Data.Attoparsec.Zepto as Z
+ import qualified Data.ByteString as B
+ import qualified Data.ByteString.Lazy as L
+ import qualified Data.ByteString.Unsafe as B
+ import qualified Data.HashMap.Strict as H
++import qualified Data.Scientific as Sci
+
+ #define BACKSLASH 92
+ #define CLOSE_CURLY 125
+@@ -356,3 +360,40 @@
+ #else
+ peekWord8' = maybe (fail "not enough bytes") return =<< A.peekWord8
+ #endif
++
++scientific :: A.Parser Scientific
++scientific = scientifically id
++
++-- A strict pair
++data SP = SP !Integer {-# UNPACK #-}!Int
++
++{-# INLINE scientifically #-}
++scientifically :: (Scientific -> a) -> Parser a
++scientifically h = do
++ let minus = 45
++ plus = 43
++ sign <- peekWord8'
++ let !positive = sign == plus || sign /= minus
++ when (sign == plus || sign == minus) $
++ void $ I.anyWord8
++
++ n <- decimal
++
++ let f fracDigits = SP (B.foldl' step n fracDigits)
++ (negate $ B.length fracDigits)
++ step a w = a * 10 + fromIntegral (w - 48)
++
++ dotty <- I.peekWord8
++ -- '.' -> ascii 46
++ SP c e <- case dotty of
++ Just 46 -> I.anyWord8 *> (f <$> I.takeWhile isDigit_w8)
++ _ -> pure (SP n 0)
++
++ let !signedCoeff | positive = c
++ | otherwise = -c
++
++ let littleE = 101
++ bigE = 69
++ (I.satisfy (\ex -> ex == littleE || ex == bigE) *>
++ fmap (h . Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
++ return (h $ Sci.scientific signedCoeff e)
diff --git a/converters/hs-aeson/files/patch-aeson.cabal b/converters/hs-aeson/files/patch-aeson.cabal
new file mode 100644
index 00000000000..0d2683706cc
--- /dev/null
+++ b/converters/hs-aeson/files/patch-aeson.cabal
@@ -0,0 +1,11 @@
+--- ./aeson.cabal.orig 2014-05-16 17:43:52.000000000 +0200
++++ ./aeson.cabal 2014-07-12 19:15:00.000000000 +0200
+@@ -112,7 +112,7 @@
+ Data.Aeson.Types.Generic
+
+ build-depends:
+- attoparsec >= 0.11.3.4,
++ attoparsec >= 0.10.4.0,
+ base == 4.*,
+ containers,
+ deepseq,
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 404b6290f38..623c0aabaea 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= dataenc
-PORTVERSION= 0.14.0.5
-PORTREVISION= 5
+PORTVERSION= 0.14.0.7
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Data encoding library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-dataenc/distinfo b/converters/hs-dataenc/distinfo
index f624f521df8..db519ef50a1 100644
--- a/converters/hs-dataenc/distinfo
+++ b/converters/hs-dataenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dataenc-0.14.0.5.tar.gz) = 1cb1aeb20b641149a1be9a8c18fa020dbf73441c89e78135ea272baf1696ea8d
-SIZE (cabal/dataenc-0.14.0.5.tar.gz) = 12902
+SHA256 (cabal/dataenc-0.14.0.7.tar.gz) = f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3
+SIZE (cabal/dataenc-0.14.0.7.tar.gz) = 12813
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index d7a11249461..9265b272cb6 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,17 +3,18 @@
PORTNAME= json
PORTVERSION= 0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for serialising Haskell to and from JSON
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl syb>=0.3.3 text
-CONFIGURE_ARGS+= --flags="split-base generic -parsec -pretty -mapdict"
+FLAGS_ENABLE= split-base generic
+FLAGS_DISABLE= parse pretty mapdict
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/Makefile b/databases/Makefile
index 6a776bdb071..ab88a898574 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -106,6 +106,7 @@
SUBDIR += hbase
SUBDIR += hiredis
SUBDIR += hk_classes
+ SUBDIR += hs-esqueleto
SUBDIR += hs-mysql
SUBDIR += hs-persistent
SUBDIR += hs-persistent-sqlite
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
new file mode 100644
index 00000000000..f3206cdbd2a
--- /dev/null
+++ b/databases/hs-esqueleto/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= esqueleto
+PORTVERSION= 1.4.4
+CATEGORIES= databases haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Type-safe EDSL for SQL queries on persistent backends
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit>=1.1 monad-logger persistent>=1.3 resourcet \
+ tagged>=0.2 text>=0.11 unordered-containers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/databases/hs-esqueleto/distinfo b/databases/hs-esqueleto/distinfo
new file mode 100644
index 00000000000..d35301327eb
--- /dev/null
+++ b/databases/hs-esqueleto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/esqueleto-1.4.4.tar.gz) = 401921e7d5d3c419f9dfbb408d6bbafeea08fb000d6137d0527add4291134503
+SIZE (cabal/esqueleto-1.4.4.tar.gz) = 29338
diff --git a/databases/hs-esqueleto/pkg-descr b/databases/hs-esqueleto/pkg-descr
new file mode 100644
index 00000000000..09ad96fcf7e
--- /dev/null
+++ b/databases/hs-esqueleto/pkg-descr
@@ -0,0 +1,4 @@
+esqueleto is a bare bones, type-safe EDSL for SQL queries that works
+with unmodified persistent SQL backends.
+
+WWW: https://github.com/prowdsponsor/esqueleto
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index fca43469423..195f5006959 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= mysql
-PORTVERSION= 0.1.1.4
-PORTREVISION= 8
+PORTVERSION= 0.1.1.6
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Low-level MySQL client library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_MYSQL= yes
diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo
index 5264686af01..eeb934f2d10 100644
--- a/databases/hs-mysql/distinfo
+++ b/databases/hs-mysql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mysql-0.1.1.4.tar.gz) = 3ab278173355de51f729c9b18d6a49d186c448abc12b6b78fc7f5b6fdd57bda9
-SIZE (cabal/mysql-0.1.1.4.tar.gz) = 13884
+SHA256 (cabal/mysql-0.1.1.6.tar.gz) = b2d6c47e3176ddb4e192133c5e2ecff7c4831cef44ce1a6dc0b06b4f5ce9bfeb
+SIZE (cabal/mysql-0.1.1.6.tar.gz) = 14071
diff --git a/databases/hs-mysql/pkg-descr b/databases/hs-mysql/pkg-descr
index 34558cf33d0..fe3037d6855 100644
--- a/databases/hs-mysql/pkg-descr
+++ b/databases/hs-mysql/pkg-descr
@@ -1,5 +1,4 @@
-This library is a Haskell binding to the MySQL mysqlclient client library.
-It is a fairly faithful, low level library that implements
-most of the MySQL client API.
+A low-level client library for the MySQL database, implemented as
+bindings to the C mysqlclient API.
WWW: https://github.com/bos/mysql
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index eb0acb8f6fd..fc245c0e5da 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.3.0.5
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 \
- monad-logger>=0.2.4 persistent>=1.2 text>=0.7 \
- transformers>=0.2.1
+ monad-logger>=0.2.4 persistent>=1.3 resourcet text>=0.7
.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 cb6f3724a36..cea8cc8b179 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-1.2.0.tar.gz) = 9060f3363d981bde0b5e5bab99562930523072fb506b5f7af509b36cc24fad27
-SIZE (cabal/persistent-sqlite-1.2.0.tar.gz) = 1285410
+SHA256 (cabal/persistent-sqlite-1.3.0.5.tar.gz) = eb477f7f98d4af69aa5ef88750c0e62915378c554a480652b4b09e4f985f6715
+SIZE (cabal/persistent-sqlite-1.3.0.5.tar.gz) = 1353303
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 294755ea059..8707ffe684e 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.3.1.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson monad-control>=0.2 monad-logger persistent>=1.2 \
- text>=0.5 transformers>=0.2
+USE_CABAL= aeson monad-control>=0.2 monad-logger persistent>=1.3 \
+ text>=0.5 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 4b1ae153f72..79fd83cdf79 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-1.2.0.tar.gz) = 446b666717be9ce6d01283817ecb52733c50ea2fa740aa08dde80b9532cbd95d
-SIZE (cabal/persistent-template-1.2.0.tar.gz) = 12007
+SHA256 (cabal/persistent-template-1.3.1.4.tar.gz) = d3313840ef0258775b2ce0d37ba9be0948a11d97ef6f3ed3ce76f0b476d045fb
+SIZE (cabal/persistent-template-1.3.1.4.tar.gz) = 14384
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index b952d03cd7e..d2027520373 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 1.2.0.1
-PORTREVISION= 4
+PORTVERSION= 1.3.1.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,11 +10,10 @@ COMMENT= Type-safe, multi-backend data serialization
LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
- blaze-markup>=0.5.1 conduit>=1.0 lifted-base>=0.1 \
+ blaze-markup>=0.5.1 conduit>=1.0 exceptions lifted-base>=0.1 \
monad-control>=0.3 monad-logger>=0.3 path-pieces>=0.1 \
- pool-conduit>=0.1.2 resourcet>=0.4 silently text>=0.8 \
- transformers>=0.2.1 transformers-base unordered-containers \
- vector
+ resource-pool resourcet>=0.4 scientific silently text>=0.8 \
+ transformers-base unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index 2b78dac3e19..efa853d3d51 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-1.2.0.1.tar.gz) = 8b6e4726e2cfa819926d3883fda8be1b956fa88ae05214fee604f3e9c22347af
-SIZE (cabal/persistent-1.2.0.1.tar.gz) = 30244
+SHA256 (cabal/persistent-1.3.1.1.tar.gz) = 7db789abfdd485f6f8a5f27613115f53f0d9702b87e1d200d91fa27a22ab4159
+SIZE (cabal/persistent-1.3.1.1.tar.gz) = 37042
diff --git a/devel/Makefile b/devel/Makefile
index 283c9c2744c..9e18136d8c0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -658,8 +658,9 @@
SUBDIR += hs-BNFC
SUBDIR += hs-Boolean
SUBDIR += hs-ConfigFile
+ SUBDIR += hs-DrIFT
+ SUBDIR += hs-Glob
SUBDIR += hs-HUnit
- SUBDIR += hs-IORefCAS
SUBDIR += hs-IfElse
SUBDIR += hs-List
SUBDIR += hs-MaybeT
@@ -672,10 +673,9 @@
SUBDIR += hs-PSQueue
SUBDIR += hs-QuickCheck
SUBDIR += hs-ReadArgs
+ SUBDIR += hs-STMonadTrans
SUBDIR += hs-SafeSemaphore
- SUBDIR += hs-StateVar
SUBDIR += hs-Stream
- SUBDIR += hs-Tensor
SUBDIR += hs-TypeCompose
SUBDIR += hs-abstract-deque
SUBDIR += hs-abstract-par
@@ -685,22 +685,25 @@
SUBDIR += hs-ansi-wl-pprint
SUBDIR += hs-arrows
SUBDIR += hs-asn1-data
+ SUBDIR += hs-asn1-encoding
+ SUBDIR += hs-asn1-parse
SUBDIR += hs-asn1-types
SUBDIR += hs-async
- SUBDIR += hs-attempt
+ SUBDIR += hs-atomic-primops
+ SUBDIR += hs-auto-update
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
- SUBDIR += hs-base64-conduit
SUBDIR += hs-basic-prelude
SUBDIR += hs-bifunctors
SUBDIR += hs-bits-atomic
SUBDIR += hs-blaze-builder
- SUBDIR += hs-blaze-builder-conduit
SUBDIR += hs-blaze-builder-enumerator
SUBDIR += hs-blaze-textual
SUBDIR += hs-bloomfilter
+ SUBDIR += hs-boxes
SUBDIR += hs-bsd-sysctl
+ SUBDIR += hs-byteable
SUBDIR += hs-byteorder
SUBDIR += hs-bytestring-nums
SUBDIR += hs-bytestring-show
@@ -708,10 +711,13 @@
SUBDIR += hs-cabal-install
SUBDIR += hs-cereal
SUBDIR += hs-checkers
+ SUBDIR += hs-chunked-data
SUBDIR += hs-classy-prelude
SUBDIR += hs-classy-prelude-conduit
SUBDIR += hs-cmdargs
SUBDIR += hs-conduit
+ SUBDIR += hs-conduit-combinators
+ SUBDIR += hs-conduit-extra
SUBDIR += hs-configurator
SUBDIR += hs-convertible
SUBDIR += hs-cpphs
@@ -722,24 +728,28 @@
SUBDIR += hs-data-default-instances-containers
SUBDIR += hs-data-default-instances-dlist
SUBDIR += hs-data-default-instances-old-locale
+ SUBDIR += hs-data-hash
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
+ SUBDIR += hs-deepseq-generics
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
- SUBDIR += hs-drift
+ SUBDIR += hs-dlist-instances
SUBDIR += hs-edit-distance
SUBDIR += hs-either
+ SUBDIR += hs-enclosed-exceptions
SUBDIR += hs-enumerator
+ SUBDIR += hs-equivalence
SUBDIR += hs-errors
+ SUBDIR += hs-exceptions
SUBDIR += hs-extensible-exceptions
- SUBDIR += hs-failure
SUBDIR += hs-fast-logger
SUBDIR += hs-fgl
SUBDIR += hs-file-embed
SUBDIR += hs-filemanip
SUBDIR += hs-filestore
- SUBDIR += hs-filesystem-conduit
+ SUBDIR += hs-free
SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
SUBDIR += hs-generic-deriving
@@ -757,7 +767,6 @@
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
SUBDIR += hs-hashtables
- SUBDIR += hs-haskeline
SUBDIR += hs-haskell-platform
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
@@ -769,8 +778,10 @@
SUBDIR += hs-hlint
SUBDIR += hs-hoogle
SUBDIR += hs-hslogger
+ SUBDIR += hs-hslua
SUBDIR += hs-hspec
SUBDIR += hs-hspec-expectations
+ SUBDIR += hs-keys
SUBDIR += hs-kqueue
SUBDIR += hs-language-c
SUBDIR += hs-language-javascript
@@ -783,17 +794,20 @@
SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
SUBDIR += hs-monad-logger
+ SUBDIR += hs-monad-loops
SUBDIR += hs-monad-par
SUBDIR += hs-monad-par-extras
+ SUBDIR += hs-monads-tf
+ SUBDIR += hs-mono-traversable
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
SUBDIR += hs-optparse-applicative
SUBDIR += hs-parallel
SUBDIR += hs-pcre-light
- SUBDIR += hs-pool-conduit
+ SUBDIR += hs-prelude-extras
+ SUBDIR += hs-prettyclass
SUBDIR += hs-primitive
- SUBDIR += hs-profunctor-extras
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
SUBDIR += hs-quickcheck-io
@@ -804,13 +818,18 @@
SUBDIR += hs-resource-pool
SUBDIR += hs-resourcet
SUBDIR += hs-safe
+ SUBDIR += hs-scientific
+ SUBDIR += hs-securemem
SUBDIR += hs-setenv
+ SUBDIR += hs-shake
SUBDIR += hs-show
SUBDIR += hs-silently
SUBDIR += hs-simple-reflect
SUBDIR += hs-smallcheck
SUBDIR += hs-split
SUBDIR += hs-stm
+ SUBDIR += hs-stm-chans
+ SUBDIR += hs-streaming-commons
SUBDIR += hs-strict
SUBDIR += hs-syb
SUBDIR += hs-syb-with-class
@@ -819,19 +838,20 @@
SUBDIR += hs-system-filepath
SUBDIR += hs-tagged
SUBDIR += hs-temporary
- SUBDIR += hs-terminfo
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
SUBDIR += hs-testpack
SUBDIR += hs-text
+ SUBDIR += hs-text-icu
+ SUBDIR += hs-tf-random
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
SUBDIR += hs-timezone-olson
SUBDIR += hs-timezone-series
- SUBDIR += hs-transformers
SUBDIR += hs-transformers-base
+ SUBDIR += hs-transformers-compat
SUBDIR += hs-unamb
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
@@ -848,6 +868,9 @@
SUBDIR += hs-vault
SUBDIR += hs-vector
SUBDIR += hs-vector-algorithms
+ SUBDIR += hs-vector-binary-instances
+ SUBDIR += hs-vector-instances
+ SUBDIR += hs-vector-th-unbox
SUBDIR += hs-void
SUBDIR += hs-word8
SUBDIR += htable
diff --git a/devel/cvs2darcs/Makefile b/devel/cvs2darcs/Makefile
index 5425aeda7ef..316dcdeae2c 100644
--- a/devel/cvs2darcs/Makefile
+++ b/devel/cvs2darcs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cvs2darcs
PORTVERSION= 0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= http://ab-initio.mit.edu/${PORTNAME}/
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 1f723a2b90f..df05b064820 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BNFC
PORTVERSION= 2.6.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,8 +12,14 @@ COMMENT= Compiler front-end generator
LICENSE= GPLv2
USE_CABAL= mtl
+USE_ALEX= yes
+USE_HAPPY= yes
EXECUTABLE= bnfc
+# Force regeneration of the lexer and parser.
+post-patch::
+ @${RM} -rf ${WRKSRC}/dist
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 828bb414738..2bc3e48a5eb 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.2
-PORTREVISION= 5
+PORTVERSION= 0.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generalized Booleans and numbers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index 60aaddf4e06..faa46cd23da 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.2.tar.gz) = 23fff11419defab048b71eec4eea4a4d1154788a2cf9764721d749b79cde18e5
-SIZE (cabal/Boolean-0.2.tar.gz) = 6547
+SHA256 (cabal/Boolean-0.2.1.tar.gz) = 994a6d08702c248595b44405e39a1619925e03b2c1d182faaaa408c6594c206e
+SIZE (cabal/Boolean-0.2.1.tar.gz) = 6551
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index db0116b018d..9f061726920 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ConfigFile
-PORTVERSION= 1.1.1
-PORTREVISION= 9
+PORTVERSION= 1.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index c4d6ce01856..00591e70c9d 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ConfigFile-1.1.1.tar.gz) = 55067e4b6d5f532d6e28c739869742a011490905e24894da9015368aed825e70
-SIZE (cabal/ConfigFile-1.1.1.tar.gz) = 28269
+SHA256 (cabal/ConfigFile-1.1.2.tar.gz) = 38f6df24926c4952af198cbc9e45e72a62af73adeef097767889e9321bca2d76
+SIZE (cabal/ConfigFile-1.1.2.tar.gz) = 28947
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-DrIFT/Makefile
new file mode 100644
index 00000000000..e38d47b6acf
--- /dev/null
+++ b/devel/hs-DrIFT/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= DrIFT
+PORTVERSION= 2.4.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Program to derive type class instances
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= random
+
+EXECUTABLE= DrIFT drift-ghc
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo
new file mode 100644
index 00000000000..ba543f98bad
--- /dev/null
+++ b/devel/hs-DrIFT/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0
+SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676
diff --git a/devel/hs-DrIFT/pkg-descr b/devel/hs-DrIFT/pkg-descr
new file mode 100644
index 00000000000..7652d613645
--- /dev/null
+++ b/devel/hs-DrIFT/pkg-descr
@@ -0,0 +1,13 @@
+DrIFT is a type sensitive preprocessor for Haskell. It extracts type
+declarations and directives from modules. The directives cause rules to
+be fired on the parsed type declarations, generating new code which is
+then appended to the bottom of the input file. The rules are expressed
+as Haskell code, and it is intended that the user can add new rules as
+required. DrIFT automates instance derivation for classes that aren't
+supported by the standard compilers. In addition, instances can be
+produced in seperate modules to that containing the type declaration.
+This allows instances to be derived for a type after the original module
+has been compiled. As a bonus, simple utility functions can also be
+produced from a type.
+
+WWW: http://repetae.net/computer/haskell/DrIFT/
diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-Glob/Makefile
index 12ef77e23bb..0cf0e9174d6 100644
--- a/devel/hs-IORefCAS/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
-PORTNAME= IORefCAS
-PORTVERSION= 0.2.0.1
-PORTREVISION= 4
+PORTNAME= Glob
+PORTVERSION= 0.7.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Atomic compare and swap for IORefs and STRefs
+COMMENT= Globbing library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= bits-atomic
+USE_CABAL= dlist>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Glob/distinfo b/devel/hs-Glob/distinfo
new file mode 100644
index 00000000000..0b910e5ee19
--- /dev/null
+++ b/devel/hs-Glob/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/Glob-0.7.5.tar.gz) = 0063bbc680d90f522455c0dec1121837689da542f4d9c70924d98bfb1389be41
+SIZE (cabal/Glob-0.7.5.tar.gz) = 23443
diff --git a/devel/hs-Glob/pkg-descr b/devel/hs-Glob/pkg-descr
new file mode 100644
index 00000000000..75757f547d2
--- /dev/null
+++ b/devel/hs-Glob/pkg-descr
@@ -0,0 +1,3 @@
+A library for globbing: matching patterns against file paths.
+
+WWW: http://iki.fi/matti.niemenmaa/glob/
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 622360ff53a..d183234404b 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,13 +2,13 @@
PORTNAME= HUnit
PORTVERSION= 1.2.5.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unit testing framework for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-IORefCAS/distinfo b/devel/hs-IORefCAS/distinfo
deleted file mode 100644
index ad01ade34a7..00000000000
--- a/devel/hs-IORefCAS/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/IORefCAS-0.2.0.1.tar.gz) = abb984358deedcbc904899f19756487a86ce44264d520193c2158c9eca646e1b
-SIZE (cabal/IORefCAS-0.2.0.1.tar.gz) = 12617
diff --git a/devel/hs-IORefCAS/pkg-descr b/devel/hs-IORefCAS/pkg-descr
deleted file mode 100644
index 91d5f38f45f..00000000000
--- a/devel/hs-IORefCAS/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-After GHC 7.2 a new `casMutVar#` primop became available, but was not yet
-exposed in Data.IORef. This package fills that gap until such a time as
-Data.IORef obsoletes it. Further, in addition to exposing native Haskell
-CAS operations, this package contains "mockups" that imititate the same
-functionality using either atomicModifyIORef and unsafe pointer equality
-(in Data.CAS.Fake) or using foreign functions (Data.CAS.Foreign).
-These alternatives are useful for debugging. Note that the foreign option
-does not operate on IORefs and so is directly interchangeable with `Data.CAS`
-and `Data.CAS.Fake` only if the interface in `Data.CAS.Class` is used.
-
-WWW: https://github.com/rrnewton/haskell-lockfree-queue/wiki
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index f451d7d8712..8ee8ef01a87 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,13 +2,13 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Anaphoric and miscellaneous useful control-flow
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 79591ec786d..fd02af66c64 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -2,15 +2,13 @@
PORTNAME= List
PORTVERSION= 0.5.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= List monad transformer and class
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.2
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile
index af7c44a820f..e4e34fd93ff 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-MaybeT/Makefile
@@ -2,13 +2,13 @@
PORTNAME= MaybeT
PORTVERSION= 0.1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for computations with failures
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index b53952305d7..947b3bdfd01 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= MemoTrie
-PORTVERSION= 0.6.1
-PORTREVISION= 6
+PORTVERSION= 0.6.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Trie-based memo functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= void
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index dab3c394142..0633cd874e3 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MemoTrie-0.6.1.tar.gz) = a676cd2b02044e7a84f2477262c9c344b6dc36e839f28002ceb2e78844eba0af
-SIZE (cabal/MemoTrie-0.6.1.tar.gz) = 6227
+SHA256 (cabal/MemoTrie-0.6.2.tar.gz) = 9ddc11172db26a54681f14dd8ce881c87a3b0e72dcc7a15b74132f30b4408bbc
+SIZE (cabal/MemoTrie-0.6.2.tar.gz) = 6250
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 2d1acfb1231..19f4c27ba76 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= MissingH
-PORTVERSION= 1.2.0.0
-PORTREVISION= 6
+PORTVERSION= 1.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Large Haskell utility library
+COMMENT= Large utility library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hslogger HUnit mtl network parsec random regex-compat
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index 1c173adc247..d07a86e81d9 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MissingH-1.2.0.0.tar.gz) = a15a7c33ecea71c729de8ac11c430a77c115df2c39776d57ee11d47d850c0f2f
-SIZE (cabal/MissingH-1.2.0.0.tar.gz) = 115761
+SHA256 (cabal/MissingH-1.2.1.0.tar.gz) = 5aafea2d9e8e64644c8b7b6c149bb74422501aaff1aa3d422f838741a1fbf723
+SIZE (cabal/MissingH-1.2.1.0.tar.gz) = 116445
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index d3ff9706ca8..419a91d957c 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= MonadCatchIO-mtl
-PORTVERSION= 0.3.0.5
-PORTREVISION= 6
+PORTVERSION= 0.3.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad-transformer version of the Control.Exception module
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl
+USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0 \
+ MonadCatchIO-transformers<=0.3.1.1
.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
index 7152e6e17c2..4d2ec948365 100644
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ b/devel/hs-MonadCatchIO-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadCatchIO-mtl-0.3.0.5.tar.gz) = 1737a10a7ca6366640456c75f2b0c803db17433a314f2c5ea5c253455cec8205
-SIZE (cabal/MonadCatchIO-mtl-0.3.0.5.tar.gz) = 2985
+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/pkg-descr b/devel/hs-MonadCatchIO-mtl/pkg-descr
index 68ad06b040b..706083b2d48 100644
--- a/devel/hs-MonadCatchIO-mtl/pkg-descr
+++ b/devel/hs-MonadCatchIO-mtl/pkg-descr
@@ -3,4 +3,4 @@ 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://code.haskell.org/~jcpetruzza/MonadCatchIO-mtl
+WWW: http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index bad4caf91e5..d2b0a9f269b 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= MonadCatchIO-transformers
-PORTVERSION= 0.3.0.0
-PORTREVISION= 8
+PORTVERSION= 0.3.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad-transformer-compatible version of Control.Exception
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions>=0.1 transformers>=0.2
+USE_CABAL= extensible-exceptions monads-tf
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
index bfdeb51cd23..edba83884d1 100644
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ b/devel/hs-MonadCatchIO-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadCatchIO-transformers-0.3.0.0.tar.gz) = 8c1cf1c5df6d9e6fcaf0f3f24aea2dfac31d98363e013217d1a987ecae35f36c
-SIZE (cabal/MonadCatchIO-transformers-0.3.0.0.tar.gz) = 3965
+SHA256 (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = b62beda19ba6bb407113e5ad7b6fa63bb77d24b83e8d09fd0a48a14995f7bae4
+SIZE (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = 4530
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index 9c1fbb72dee..db7aacbafa4 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.1.9
-PORTREVISION= 4
+PORTVERSION= 0.1.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index e321a178bd4..8c3fe557f96 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadRandom-0.1.9.tar.gz) = 9f9a9767a8aedac8d85425cba732af3a656f6715331a6f643ee4d30e8a3924d9
-SIZE (cabal/MonadRandom-0.1.9.tar.gz) = 4075
+SHA256 (cabal/MonadRandom-0.1.13.tar.gz) = d3ae5f7c2e9703a31e4b81d4634457073105327a30be373c0554d0a5ab1721de
+SIZE (cabal/MonadRandom-0.1.13.tar.gz) = 4465
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index a691fef64b0..70638d9957a 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -3,13 +3,13 @@
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Explicitly handled object names for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index 45e2508b87d..e775b40a01b 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,13 +2,13 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Priority Search Queue
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 22fc551d2fc..10196aa9ac4 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -3,13 +3,13 @@
PORTNAME= QuickCheck
PORTVERSION= 2.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Automatic testing of Haskell programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= random
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index bd6b88c13c6..d7d91260175 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -2,13 +2,13 @@
PORTNAME= ReadArgs
PORTVERSION= 1.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple command line argument parsing
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
new file mode 100644
index 00000000000..360af5f4b29
--- /dev/null
+++ b/devel/hs-STMonadTrans/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= STMonadTrans
+PORTVERSION= 0.3.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Monad transformer version of the ST monad
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
new file mode 100644
index 00000000000..d032299a328
--- /dev/null
+++ b/devel/hs-STMonadTrans/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/STMonadTrans-0.3.2.tar.gz) = 70be84c06ce312a56dbf37d674ad709700850b7fd4cb55198d7ae45a985e85b2
+SIZE (cabal/STMonadTrans-0.3.2.tar.gz) = 4792
diff --git a/devel/hs-STMonadTrans/pkg-descr b/devel/hs-STMonadTrans/pkg-descr
new file mode 100644
index 00000000000..6d027636850
--- /dev/null
+++ b/devel/hs-STMonadTrans/pkg-descr
@@ -0,0 +1,3 @@
+A monad transformer version of the ST monad.
+
+WWW: http://hackage.haskell.org/package/STMonadTrans
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 2e073afb0ac..60f4cf8715d 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= SafeSemaphore
-PORTVERSION= 0.9.0
-PORTREVISION= 6
+PORTVERSION= 0.10.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Much safer replacement for QSemN, QSem, and SampleVar
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= stm
diff --git a/devel/hs-SafeSemaphore/distinfo b/devel/hs-SafeSemaphore/distinfo
index 028e1791bb6..16e51a6a699 100644
--- a/devel/hs-SafeSemaphore/distinfo
+++ b/devel/hs-SafeSemaphore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/SafeSemaphore-0.9.0.tar.gz) = e43f805c567a6bcc155cd4ff2b528199e3b22ef9bacd724ccc95231e190343f5
-SIZE (cabal/SafeSemaphore-0.9.0.tar.gz) = 23817
+SHA256 (cabal/SafeSemaphore-0.10.1.tar.gz) = 21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66
+SIZE (cabal/SafeSemaphore-0.10.1.tar.gz) = 24007
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
deleted file mode 100644
index 76d85c05505..00000000000
--- a/devel/hs-StateVar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/StateVar-1.0.0.0.tar.gz) = 8445c998f79ef34105ffc928e50f1488505e8801f77f04d4b28d056b8d322bb0
-SIZE (cabal/StateVar-1.0.0.0.tar.gz) = 2728
diff --git a/devel/hs-StateVar/pkg-descr b/devel/hs-StateVar/pkg-descr
deleted file mode 100644
index 34f30298ce1..00000000000
--- a/devel/hs-StateVar/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This Haskell package contains state variables, which are references
-in the IO monad, like IORefs or parts of the OpenGL state.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index bc7d47a8777..ac3e303fa4b 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= Stream
-PORTVERSION= 0.4.6.1
-PORTREVISION= 6
+PORTVERSION= 0.4.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for manipulating infinite lists
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= lazysmallcheck>=0.3 QuickCheck>=2.0
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index c582f49c8ff..26503246952 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Stream-0.4.6.1.tar.gz) = 97d2820308caccbcc49f2345f3f00464dd3537702002be58c1596dd0b228e0a7
-SIZE (cabal/Stream-0.4.6.1.tar.gz) = 6126
+SHA256 (cabal/Stream-0.4.7.1.tar.gz) = c3779c9c848f7f64daa69289d095c5f7a9d4cd50bfcc7aac4892b9cdaf810022
+SIZE (cabal/Stream-0.4.7.1.tar.gz) = 6208
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
deleted file mode 100644
index ad4f997df29..00000000000
--- a/devel/hs-Tensor/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= Tensor
-PORTVERSION= 1.0.0.1
-PORTREVISION= 12
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Tensor data types for Haskell
-
-LICENSE= BSD
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-Tensor/distinfo b/devel/hs-Tensor/distinfo
deleted file mode 100644
index 799a1cfba3a..00000000000
--- a/devel/hs-Tensor/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/Tensor-1.0.0.1.tar.gz) = e93260d22baf4808c88c553017ba6a4e8179e95a00e551d6edb2d8f9ca845981
-SIZE (cabal/Tensor-1.0.0.1.tar.gz) = 3314
diff --git a/devel/hs-Tensor/pkg-descr b/devel/hs-Tensor/pkg-descr
deleted file mode 100644
index 31eac879634..00000000000
--- a/devel/hs-Tensor/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This Haskell package contains tensor data types and their instances for some
-basic type classes.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 8d885b53910..034335471b7 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= TypeCompose
-PORTVERSION= 0.9.9
-PORTREVISION= 5
+PORTVERSION= 0.9.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type composition classes and instances
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index db0fce9ff4e..46f4bbd8f22 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/TypeCompose-0.9.9.tar.gz) = 8fe39768f879a80399fdad89f166bd0ce7a239241558d85c606cd2a77cc80945
-SIZE (cabal/TypeCompose-0.9.9.tar.gz) = 17834
+SHA256 (cabal/TypeCompose-0.9.10.tar.gz) = b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2
+SIZE (cabal/TypeCompose-0.9.10.tar.gz) = 17866
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index c669fdf4765..1ea1dd25c62 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -1,29 +1,21 @@
# $FreeBSD$
PORTNAME= abstract-deque
-PORTVERSION= 0.2
-PORTREVISION= 4
+PORTVERSION= 0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Abstract, parameterized interface to mutable Deques
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HUnit random
+USE_CABAL= random
-OPTIONS_DEFINE= USECAS
+FLAGS_DEFINE= USECAS
-USECAS_DESC= Use hardware compare-and-swap
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MUSECAS}
-CONFIGURE_ARGS+= --flags="useCAS"
-USE_CABAL+= IORefCas>=0.2
-.else
-CONFIGURE_ARGS+= --flags="-useCAS"
-.endif
+USECAS_DESC= Use hardware compare-and-swap
+USECAS_FLAG_ENABLE= useCAS
+USECAS_FLAG_CABAL= atomic-primops>=0.5.0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 809ccc64036..91767626804 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/abstract-deque-0.2.tar.gz) = 09e9d73cf5940fa1b2523387afc2fd7e13fbecb50ee203b7a38e14b4c8990133
-SIZE (cabal/abstract-deque-0.2.tar.gz) = 13248
+SHA256 (cabal/abstract-deque-0.3.tar.gz) = 09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2
+SIZE (cabal/abstract-deque-0.3.tar.gz) = 7219
diff --git a/devel/hs-abstract-deque/pkg-descr b/devel/hs-abstract-deque/pkg-descr
index f21a5842237..9924ce73442 100644
--- a/devel/hs-abstract-deque/pkg-descr
+++ b/devel/hs-abstract-deque/pkg-descr
@@ -11,4 +11,4 @@ using the type-system to select an efficient implementation given the
requirements (using type families). This package also includes a simple
reference implementation based on 'IORef' and "Data.Sequence".
-WWW: https://github.com/rrnewton/haskell-lockfree-queue/wiki
+WWW: https://github.com/rrnewton/haskell-lockfree/wiki
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index f23a12781fc..b5ebe052aca 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= abstract-par
-PORTVERSION= 0.3.1
-PORTREVISION= 8
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type classes generalizing the functionality of the 'monad-par' library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-par/distinfo b/devel/hs-abstract-par/distinfo
index 3212e63a7c5..122e180581d 100644
--- a/devel/hs-abstract-par/distinfo
+++ b/devel/hs-abstract-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/abstract-par-0.3.1.tar.gz) = d3ab9ea69100d90668b22cac9a2533d524e8d5bf362792333c600d818028fb63
-SIZE (cabal/abstract-par-0.3.1.tar.gz) = 4792
+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-abstract-par/pkg-descr b/devel/hs-abstract-par/pkg-descr
index c527079f0d7..11ddb6aa211 100644
--- a/devel/hs-abstract-par/pkg-descr
+++ b/devel/hs-abstract-par/pkg-descr
@@ -1,10 +1,8 @@
-The Par monad(s) offer an alternative parallel programming API to that
-provided by the 'parallel' package. A Par monad allows the simple
-description of parallel computations, and can be used to add parallelism
-to pure Haskell code. The basic API is straightforward: a Par monad
-supports forking and simple communication in terms of IVars. This module
-is an interface module only. It provides a number of type clasess, but
-not an implementation. The type classes separate different levels of Par
+The 'Par' monad offers a parallel programming API based on dataflow
+programming. To use the `Par` monad, install the monad-par package,
+which includes this package as a dependency. This package is an
+abstract interface only. It provides a number of type clasess, but not
+an implementation. The type classes separate different levels of @Par@
functionality.
WWW: https://github.com/simonmar/monad-par
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 9e26548b869..41c42636afc 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,13 +2,13 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Basic definitions for activehs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= QuickCheck>=2.4
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 395caa6400d..81d7f9fed20 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,10 +1,12 @@
--- ./activehs-base.cabal.orig 2012-09-11 09:56:08.000000000 +0200
-+++ ./activehs-base.cabal 2013-05-03 21:25:00.000000000 +0200
-@@ -22,6 +22,6 @@
++++ ./activehs-base.cabal 2014-07-12 18:56:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ Exposed-Modules:
ActiveHs.Base
Build-Depends:
- base >= 4.0 && < 4.7,
+- base >= 4.0 && < 4.7,
- QuickCheck >= 2.4 && < 2.6
++ base >= 4.0 && < 4.8,
+ QuickCheck >= 2.4 && < 2.7
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index ac8e8efc986..ee27bdf2876 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.0.5
-PORTREVISION= 4
+PORTVERSION= 3.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Tool for generating lexical analysers in Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= QuickCheck>=2
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 1035f9261d2..2fb8b8d7a09 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/alex-3.0.5.tar.gz) = c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659
-SIZE (cabal/alex-3.0.5.tar.gz) = 100004
+SHA256 (cabal/alex-3.1.3.tar.gz) = 8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92
+SIZE (cabal/alex-3.1.3.tar.gz) = 99868
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 37a5e743426..b2b55eb111f 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6
-PORTREVISION= 5
+PORTVERSION= 0.6.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple ANSI terminal support, with Windows compatibility
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-CONFIGURE_ARGS+= --flags="-Example"
+FLAGS_DISABLE= Example
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index fa8046ee241..ab587274127 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-terminal-0.6.tar.gz) = 6f3a505ece863f707d069e0bbdc5f99673730dd096a2ca844644660f10cebf28
-SIZE (cabal/ansi-terminal-0.6.tar.gz) = 13165
+SHA256 (cabal/ansi-terminal-0.6.1.1.tar.gz) = 9133a6dc6f99fff3f7d004aa400f4b40424c8999fcd392674d939f2fee65ed1a
+SIZE (cabal/ansi-terminal-0.6.1.1.tar.gz) = 14169
diff --git a/devel/hs-ansi-terminal/pkg-descr b/devel/hs-ansi-terminal/pkg-descr
index 536f3d64732..66a60875c3f 100644
--- a/devel/hs-ansi-terminal/pkg-descr
+++ b/devel/hs-ansi-terminal/pkg-descr
@@ -3,4 +3,4 @@ clearing, color output showing or hiding the cursor, and changing the
title. Compatible with Windows and those Unixes with ANSI terminals, but
only GHC is supported as a compiler.
-WWW: http://batterseapower.github.com/ansi-terminal
+WWW: https://github.com/feuerbach/ansi-terminal
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 41cc81e18d6..42d0188227b 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.6
-PORTREVISION= 6
+PORTVERSION= 0.6.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The Wadler/Leijen Pretty Printer for colored ANSI terminal output
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= ansi-terminal>=0.4.0
-CONFIGURE_ARGS+= --flags="-Example"
+FLAGS_DISABLE= Example
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index acfe75fa94c..54ada87882a 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-wl-pprint-0.6.6.tar.gz) = 1eff90ac153f66c42aa6ee10639e3c541194935030672bac8ff2b5cbca8e6bfe
-SIZE (cabal/ansi-wl-pprint-0.6.6.tar.gz) = 13775
+SHA256 (cabal/ansi-wl-pprint-0.6.7.1.tar.gz) = d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af
+SIZE (cabal/ansi-wl-pprint-0.6.7.1.tar.gz) = 14862
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 67d0cc9df0c..59f7b8f7f4c 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,13 +3,13 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell arrow classes and transformers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= Stream
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index fb572a3a6d1..e0ab9e6dfca 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,13 +2,13 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= ASN1 data reader and writer in RAW, BER, and DER forms
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cereal mtl text>=0.11
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
new file mode 100644
index 00000000000..4317a5132b4
--- /dev/null
+++ b/devel/hs-asn1-encoding/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= asn1-encoding
+PORTVERSION= 0.8.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= ASN1 data reader and writer in RAW, BER and DER forms
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= asn1-types>=0.2.1 mtl text>=0.11
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-asn1-encoding/distinfo b/devel/hs-asn1-encoding/distinfo
new file mode 100644
index 00000000000..4cbf02a2cfd
--- /dev/null
+++ b/devel/hs-asn1-encoding/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/asn1-encoding-0.8.1.3.tar.gz) = d1a26d9e2df6f0c815ff347093b20e06a21feeaee2f9204af7aeb797ba541900
+SIZE (cabal/asn1-encoding-0.8.1.3.tar.gz) = 16099
diff --git a/devel/hs-asn1-encoding/pkg-descr b/devel/hs-asn1-encoding/pkg-descr
new file mode 100644
index 00000000000..7b6c9d968a0
--- /dev/null
+++ b/devel/hs-asn1-encoding/pkg-descr
@@ -0,0 +1,4 @@
+ASN1 data reader and writer in raw form with supports for high level
+forms of ASN1 (BER, and DER).
+
+WWW: http://github.com/vincenthz/hs-asn1
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
new file mode 100644
index 00000000000..f64f6a36b0f
--- /dev/null
+++ b/devel/hs-asn1-parse/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= asn1-parse
+PORTVERSION= 0.8.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple monadic parser for ASN1 stream types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 mtl text>=0.11
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-asn1-parse/distinfo b/devel/hs-asn1-parse/distinfo
new file mode 100644
index 00000000000..24f8b3b2168
--- /dev/null
+++ b/devel/hs-asn1-parse/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/asn1-parse-0.8.1.tar.gz) = 09567b3f06d428a194fe8132acf002f8dbfb8694a113dce14edd79a54a5d3508
+SIZE (cabal/asn1-parse-0.8.1.tar.gz) = 2724
diff --git a/devel/hs-asn1-parse/pkg-descr b/devel/hs-asn1-parse/pkg-descr
new file mode 100644
index 00000000000..25477062443
--- /dev/null
+++ b/devel/hs-asn1-parse/pkg-descr
@@ -0,0 +1,4 @@
+Simple monadic parser for ASN1 stream types, when ASN1 pattern matching
+is not convenient.
+
+WWW: http://github.com/vincenthz/hs-asn1
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index 6f4eb0ca908..1d84ad304d8 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= asn1-types
-PORTVERSION= 0.1.3
-PORTREVISION= 4
+PORTVERSION= 0.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= ASN.1 types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.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 74a22bf7d26..8de841f5efb 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-types-0.1.3.tar.gz) = 4f124d162967b38b0b704843b7b7b7925c0cc3bf6808b3044ba285d315dca5b4
-SIZE (cabal/asn1-types-0.1.3.tar.gz) = 3841
+SHA256 (cabal/asn1-types-0.2.3.tar.gz) = 84c3778b36978f673fe916b325759ff9ac2294900c052190afd868fa8d84bfb1
+SIZE (cabal/asn1-types-0.2.3.tar.gz) = 5411
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index cc8624755a1..30d2a6577d2 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.1.4
-PORTREVISION= 4
+PORTVERSION= 2.0.1.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Run IO operations asynchronously and wait for their results
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= stm>=2.2
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index 61b04a87758..eb7776b972e 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/async-2.0.1.4.tar.gz) = 41ddfe012d98f3ef101651fb529753bca5bb4c804f03f9cfafc5d0cbe50224c2
-SIZE (cabal/async-2.0.1.4.tar.gz) = 8349
+SHA256 (cabal/async-2.0.1.5.tar.gz) = cd13ac558f4f63e567100805770648e89307a3210852b17038c9be4fcc3aa83c
+SIZE (cabal/async-2.0.1.5.tar.gz) = 8350
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
new file mode 100644
index 00000000000..72fe38ebf13
--- /dev/null
+++ b/devel/hs-atomic-primops/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= atomic-primops
+PORTVERSION= 0.6.0.6
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Safe approach to CAS and other atomic operations
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= primitive
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
new file mode 100644
index 00000000000..6fd81c03a08
--- /dev/null
+++ b/devel/hs-atomic-primops/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/atomic-primops-0.6.0.6.tar.gz) = 8bf1532162ec95f68de7c84d8245ed2afdb41ceb3b7084dc4a3f94949ad12982
+SIZE (cabal/atomic-primops-0.6.0.6.tar.gz) = 30305
diff --git a/devel/hs-atomic-primops/pkg-descr b/devel/hs-atomic-primops/pkg-descr
new file mode 100644
index 00000000000..dbae2316ddc
--- /dev/null
+++ b/devel/hs-atomic-primops/pkg-descr
@@ -0,0 +1,8 @@
+This library provides a safer method based on the concept of "Tickets".
+Also, this library uses the "foreign primop" capability of GHC to add
+access to other variants that may be of interest, specifically, compare
+and swap inside an array. Note that as of GHC 7.8, the relevant primops
+have been included in GHC itself. This library is engineered to work
+pre- and post-GHC-7.8, while exposing the same interface.
+
+WWW: https://github.com/rrnewton/haskell-lockfree/wiki
diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile
deleted file mode 100644
index a860fb759be..00000000000
--- a/devel/hs-attempt/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= attempt
-PORTVERSION= 0.4.0
-PORTREVISION= 8
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Concrete data type for handling exceptions as failures
-
-LICENSE= BSD
-
-USE_CABAL= failure>=0.2.0
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-attempt/distinfo b/devel/hs-attempt/distinfo
deleted file mode 100644
index ec3b7e0a1ac..00000000000
--- a/devel/hs-attempt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/attempt-0.4.0.tar.gz) = 5e7a9ce02687ee5d1057258443ba97e80096eb6bfbc78f0306ca05ff42cbfa58
-SIZE (cabal/attempt-0.4.0.tar.gz) = 3871
diff --git a/devel/hs-attempt/pkg-descr b/devel/hs-attempt/pkg-descr
deleted file mode 100644
index 467cac2fd27..00000000000
--- a/devel/hs-attempt/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Defines a data type, Attempt, which has a Success and Failure
-constructor. Failure contains an extensible exception.
-
-WWW: http://github.com/snoyberg/attempt/tree/master
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
new file mode 100644
index 00000000000..95ac38eea20
--- /dev/null
+++ b/devel/hs-auto-update/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= auto-update
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Efficiently run periodic, on-demand actions
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
new file mode 100644
index 00000000000..d13525953f8
--- /dev/null
+++ b/devel/hs-auto-update/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/auto-update-0.1.0.0.tar.gz) = 1430f24db953b022fa2d425ec3c77ecc2211464300db6aad1b67c4cb19530a00
+SIZE (cabal/auto-update-0.1.0.0.tar.gz) = 4018
diff --git a/devel/hs-auto-update/pkg-descr b/devel/hs-auto-update/pkg-descr
new file mode 100644
index 00000000000..38b60e3bacc
--- /dev/null
+++ b/devel/hs-auto-update/pkg-descr
@@ -0,0 +1,6 @@
+A common problem is the desire to have an action run at a scheduled
+interval, but only if it is needed. This library allows you to define
+actions which will either be performed by a dedicated thread or, in
+times of low volume, will be executed by the calling thread.
+
+WWW: https://github.com/yesodweb/wai
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index f302efbcdd1..643f3c06cd4 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,13 +2,13 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unicode alternatives for common functions and operators
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index cf4d299cced..6b88b688cc9 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= base16-bytestring
-PORTVERSION= 0.1.1.5
-PORTREVISION= 7
+PORTVERSION= 0.1.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast base16 (hex) encoding and deconding for ByteStrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base16-bytestring/distinfo b/devel/hs-base16-bytestring/distinfo
index 313ade7f7aa..650a4c79ede 100644
--- a/devel/hs-base16-bytestring/distinfo
+++ b/devel/hs-base16-bytestring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/base16-bytestring-0.1.1.5.tar.gz) = d5739a2576e51ee7005c55f5cec6a1653071418d9043f495343e3bf9db1fedb9
-SIZE (cabal/base16-bytestring-0.1.1.5.tar.gz) = 3698
+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-base16-bytestring/pkg-descr b/devel/hs-base16-bytestring/pkg-descr
index 5b1a9caa770..cb025a2a3f4 100644
--- a/devel/hs-base16-bytestring/pkg-descr
+++ b/devel/hs-base16-bytestring/pkg-descr
@@ -1,4 +1,3 @@
-This package provides a Haskell library for working with base16-encoded
-data quickly and efficiently, using the ByteString type.
+Fast base16 (hex) encoding and decoding for ByteStrings.
-WWW: https://github.com/mailrank/base16-bytestring
+WWW: http://github.com/bos/base16-bytestring
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 02066030b41..98716d90bff 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,13 +2,13 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast base64 encoding and decoding for ByteStrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base64-conduit/Makefile b/devel/hs-base64-conduit/Makefile
deleted file mode 100644
index 3cdad2970ea..00000000000
--- a/devel/hs-base64-conduit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= base64-conduit
-PORTVERSION= 1.0.0
-PORTREVISION= 5
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Base64-encode and decode streams of bytes
-
-LICENSE= BSD
-
-USE_CABAL= base64-bytestring>=0.1.1.1 conduit>=1.0
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-base64-conduit/distinfo b/devel/hs-base64-conduit/distinfo
deleted file mode 100644
index fa3692c5f7f..00000000000
--- a/devel/hs-base64-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/base64-conduit-1.0.0.tar.gz) = 38552198c2a399a98efdd0a8f5eebab84d36fc0e298a7a2522aa95d9637b9283
-SIZE (cabal/base64-conduit-1.0.0.tar.gz) = 2488
diff --git a/devel/hs-base64-conduit/pkg-descr b/devel/hs-base64-conduit/pkg-descr
deleted file mode 100644
index 7d01f88d5e4..00000000000
--- a/devel/hs-base64-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Base64-encode and decode streams of bytes.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index aff970bb220..6926bff6d74 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.5.0
-PORTREVISION= 4
+PORTVERSION= 0.3.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Enhanced core prelude; a common foundation for alternate preludes
LICENSE= MIT
-USE_CABAL= hashable lifted-base ReadArgs>=1.2 system-filepath>=0.4 text \
- transformers unordered-containers vector
+USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe system-filepath>=0.4 \
+ text unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 00747c3a1c0..527c7426e52 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.5.0.tar.gz) = 5991c0011058257b42ca5446909aa1f5ac24a4be11962f45fe7f17b8f78a2edb
-SIZE (cabal/basic-prelude-0.3.5.0.tar.gz) = 4648
+SHA256 (cabal/basic-prelude-0.3.8.tar.gz) = effa8e5982753ddace4ccfc6f387b81395ec7e14ec0e6d0cc93660a09bb6dc53
+SIZE (cabal/basic-prelude-0.3.8.tar.gz) = 4887
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index fe1653b0900..835d2f6b1a3 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 3.2.0.1
-PORTREVISION= 5
+PORTVERSION= 4.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 bifunctors
+COMMENT= Bifunctors
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= semigroupoids semigroups>=0.8.3.1 tagged>=0.4.4
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index 8830986c1d2..c538d89044a 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bifunctors-3.2.0.1.tar.gz) = a6ce8c875b79d9d28d7a7ae1156aad3095e95bde1fce7de2ff1c91f8416731ae
-SIZE (cabal/bifunctors-3.2.0.1.tar.gz) = 7332
+SHA256 (cabal/bifunctors-4.1.1.1.tar.gz) = 115fd3a4b592ec6de09c6e2311d365968e0e6669745a96943352357bbdc1612c
+SIZE (cabal/bifunctors-4.1.1.1.tar.gz) = 10310
diff --git a/devel/hs-bifunctors/pkg-descr b/devel/hs-bifunctors/pkg-descr
index a4f6d0ad626..2c5497a8f65 100644
--- a/devel/hs-bifunctors/pkg-descr
+++ b/devel/hs-bifunctors/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 bifunctors.
+Bifunctors.
WWW: http://github.com/ekmett/bifunctors/
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 6edf45f9a59..8e47df67c49 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,13 +2,13 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Atomic bit operations on memory locations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
deleted file mode 100644
index 6953c1afdd8..00000000000
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= blaze-builder-conduit
-PORTVERSION= 1.0.0
-PORTREVISION= 5
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Convert streams of builders to streams of bytestrings
-
-LICENSE= BSD
-
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=1.0 text>=0.11 \
- transformers>=0.2.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-conduit/distinfo b/devel/hs-blaze-builder-conduit/distinfo
deleted file mode 100644
index 75e1cc66e48..00000000000
--- a/devel/hs-blaze-builder-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/blaze-builder-conduit-1.0.0.tar.gz) = 8665a9a4f2e627968b6b20a16173af357c2e6b4d0e9325384b37f75626580097
-SIZE (cabal/blaze-builder-conduit-1.0.0.tar.gz) = 3952
diff --git a/devel/hs-blaze-builder-conduit/pkg-descr b/devel/hs-blaze-builder-conduit/pkg-descr
deleted file mode 100644
index 5e0eeea772d..00000000000
--- a/devel/hs-blaze-builder-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Convert streams of builders to streams of bytestrings.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 11b97565fad..3d7fa90d716 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= blaze-builder-enumerator
-PORTVERSION= 0.2.0.5
-PORTREVISION= 6
+PORTVERSION= 0.2.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Enumeratees for the incremental conversion of builders to bytestrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 transformers>=0.2
+USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1
.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 4e019aa35ea..4dee74024e9 100644
--- a/devel/hs-blaze-builder-enumerator/distinfo
+++ b/devel/hs-blaze-builder-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-enumerator-0.2.0.5.tar.gz) = 4a39e72f7675f6e3d75e29477e6d66d73cf8fb6f5f5701dad03af1cf79da6b2d
-SIZE (cabal/blaze-builder-enumerator-0.2.0.5.tar.gz) = 3780
+SHA256 (cabal/blaze-builder-enumerator-0.2.0.6.tar.gz) = d7cfd62b51b5c4ec82609f791a191f12dfed25476b10888b216bc69d1b0abc5d
+SIZE (cabal/blaze-builder-enumerator-0.2.0.6.tar.gz) = 3785
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 1f882c5ca02..2a14b72dcf8 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.3.1.1
-PORTREVISION= 4
+PORTVERSION= 0.3.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient buffered output
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.10
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index ca853c06cda..107715379cf 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-0.3.1.1.tar.gz) = a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde
-SIZE (cabal/blaze-builder-0.3.1.1.tar.gz) = 69061
+SHA256 (cabal/blaze-builder-0.3.3.2.tar.gz) = 80b43d4a012a513c3c012de0f76858e74765e079c58d42cd6010fc185478110d
+SIZE (cabal/blaze-builder-0.3.3.2.tar.gz) = 67371
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index a5e8103e069..9362038c9eb 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= blaze-textual
-PORTVERSION= 0.2.0.8
-PORTREVISION= 6
+PORTVERSION= 0.2.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast rendering of common datatypes
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1.4 text>=0.11.0.2 vector
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index 85622c60a59..ee3585b1d16 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-textual-0.2.0.8.tar.gz) = 873d463efb6bb99260275cb6fdb12f3e3fa4238ae3d2878ad6e87fee4781f87f
-SIZE (cabal/blaze-textual-0.2.0.8.tar.gz) = 6842
+SHA256 (cabal/blaze-textual-0.2.0.9.tar.gz) = c005e4e8e33b696b7b127384e96885c1e7e66d0ee5b064bbeb330a66e50d9ebf
+SIZE (cabal/blaze-textual-0.2.0.9.tar.gz) = 6848
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 45c4d847ffd..ce9c903e1ed 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= bloomfilter
-PORTVERSION= 1.2.6.10
-PORTREVISION= 7
+PORTVERSION= 2.0.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure and impure Bloom Filter implementations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index bdd2ecbda4a..417ce9e01d5 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bloomfilter-1.2.6.10.tar.gz) = 9b6af333db4a61e4fc9b3090e90a0adcf2eb4e096f700b0315b8381e73ba5b98
-SIZE (cabal/bloomfilter-1.2.6.10.tar.gz) = 21456
+SHA256 (cabal/bloomfilter-2.0.0.0.tar.gz) = ee1cff0f5ad4afd238e169277ed4467ccf02c81429de1a22d5dec65c2272d11d
+SIZE (cabal/bloomfilter-2.0.0.0.tar.gz) = 22090
diff --git a/devel/hs-bloomfilter/pkg-descr b/devel/hs-bloomfilter/pkg-descr
index 20d374f98d7..5db88b2e1ee 100644
--- a/devel/hs-bloomfilter/pkg-descr
+++ b/devel/hs-bloomfilter/pkg-descr
@@ -1,3 +1,3 @@
Pure and impure Bloom Filter implementations.
-WWW: http://www.serpentine.com/software/bloomfilter
+WWW: https://github.com/bos/bloomfilter
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
new file mode 100644
index 00000000000..7581bf0a81a
--- /dev/null
+++ b/devel/hs-boxes/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= boxes
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= 2D text pretty-printing library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= split>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
new file mode 100644
index 00000000000..8932bb3eb16
--- /dev/null
+++ b/devel/hs-boxes/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/boxes-0.1.3.tar.gz) = 78fe880778f3ee427b0ab4a4d6e7ddd194e7030d711d9ba491c8d4d3811c2aea
+SIZE (cabal/boxes-0.1.3.tar.gz) = 5347
diff --git a/devel/hs-boxes/pkg-descr b/devel/hs-boxes/pkg-descr
new file mode 100644
index 00000000000..4e0285d97a3
--- /dev/null
+++ b/devel/hs-boxes/pkg-descr
@@ -0,0 +1,4 @@
+A pretty-printing library for laying out text in two dimensions, using a
+simple box model.
+
+WWW: http://hackage.haskell.org/package/boxes
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 92292e8f0a6..7fe21558cee 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,13 +3,13 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Access to the BSD sysctl(3) interface
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
new file mode 100644
index 00000000000..bcba6d0b1c9
--- /dev/null
+++ b/devel/hs-byteable/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= byteable
+PORTVERSION= 0.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Type class for sequence of bytes
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-byteable/distinfo b/devel/hs-byteable/distinfo
new file mode 100644
index 00000000000..11d3c1e2095
--- /dev/null
+++ b/devel/hs-byteable/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2
+SIZE (cabal/byteable-0.1.1.tar.gz) = 2400
diff --git a/devel/hs-byteable/pkg-descr b/devel/hs-byteable/pkg-descr
new file mode 100644
index 00000000000..b0293881e87
--- /dev/null
+++ b/devel/hs-byteable/pkg-descr
@@ -0,0 +1,5 @@
+Abstract class to manipulate sequence of bytes. The use case of this
+class is abstracting manipulation of types that are just wrapping a
+bytestring with stronger and more meaniful name.
+
+WWW: http://github.com/vincenthz/hs-byteable
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index c97961d60a3..d21d4cba918 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,13 +2,13 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Exposes the native endianness or byte ordering of the system
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 0552413087a..d87b2a5f49f 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,13 +2,13 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse numeric literals from ByteStrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index ea4f1c9eb42..910aacc83cb 100644
--- a/devel/hs-bytestring-show/Makefile
+++ b/devel/hs-bytestring-show/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= bytestring-show
-PORTVERSION= 0.3.5.5
-PORTREVISION= 4
+PORTVERSION= 0.3.5.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient conversion of values into readable byte strings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bytestring-show/distinfo b/devel/hs-bytestring-show/distinfo
index beec3a1f30b..82c5cb792ba 100644
--- a/devel/hs-bytestring-show/distinfo
+++ b/devel/hs-bytestring-show/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bytestring-show-0.3.5.5.tar.gz) = c40b4a23ea32cb6003ef35e8ace2f5879a99b59940589653085ac49fe570a86d
-SIZE (cabal/bytestring-show-0.3.5.5.tar.gz) = 8491
+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-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 8f9e2bc45cb..384d05af30c 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,23 +2,22 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.16.4
-PORTREVISION= 6
+PORTVERSION= 0.17.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= C->Haskell tool that gives some cross-language type safety
+COMMENT= C->Haskell FFI tool that gives some cross-language type safety
LICENSE= GPLv2
-USE_CABAL= language-c>=0.3.1.1
+USE_CABAL= language-c>=0.4.2
XMLDOCS= doc/users_guide:html
STANDALONE= yes
EXECUTABLE= c2hs
-MAN1= c2hs.1
+MAN1PAGES= c2hs.1
MAN1SRC= doc/man1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index cf3ccb82697..a1a3c78d390 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/c2hs-0.16.4.tar.gz) = f1b15c18de884273eeab4400097a6fad8373849835e2a943d4583d9602fb1555
-SIZE (cabal/c2hs-0.16.4.tar.gz) = 138114
+SHA256 (cabal/c2hs-0.17.2.tar.gz) = b32ff232cf59d41ed875579400f95661bf5a194b94ccf4ea935315df7e0433f7
+SIZE (cabal/c2hs-0.17.2.tar.gz) = 167739
diff --git a/devel/hs-c2hs/pkg-descr b/devel/hs-c2hs/pkg-descr
index 9853bcb2643..61f5881a385 100644
--- a/devel/hs-c2hs/pkg-descr
+++ b/devel/hs-c2hs/pkg-descr
@@ -4,4 +4,4 @@ code with foreign imports and marshaling. Unlike writing foreign imports
by hand (or using hsch2s), this ensures that C functions are imported with
the correct Haskell types.
-WWW: http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
+WWW: https://github.com/haskell/c2hs
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index db06dda4916..d2d5bac5a5e 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,27 +1,18 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.16.0.2
-PORTREVISION= 4
+PORTVERSION= 1.18.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Command-line interface for Cabal and Hackage
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= network>=1 random>=1 HTTP>=4000.0.2 zlib>=0.4
+USE_CABAL= network>=1 random>=1 HTTP>=4000.0.8 stm>=2.0 zlib>=0.5.3
STANDALONE= yes
-EXECUTABLE= cabal-install
-
-# Some magic to make `cabal` work with a custom toolchain
-SUB_FILES= cabal
-SUB_LIST= AR=${AR} CC=${CC} CPP=${CPP} LD=${LD} RANLIB=${RANLIB}
-
-post-install::
- @${MV} ${STAGEDIR}${PREFIX}/bin/cabal ${STAGEDIR}${PREFIX}/bin/cabal-install
- ${INSTALL_SCRIPT} ${WRKDIR}/cabal ${STAGEDIR}${PREFIX}/bin
+EXECUTABLE= cabal
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index c5771bcd1a5..00ea6a095c5 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cabal-install-1.16.0.2.tar.gz) = 66dfacc9f33e668e56904072cadb8a36bd9d6522ba5464c6a36a5de7e65c5698
-SIZE (cabal/cabal-install-1.16.0.2.tar.gz) = 201232
+SHA256 (cabal/cabal-install-1.18.0.5.tar.gz) = 477df8ef73916e8bc23c727280a1700939131a3e2809a057668c883b0b521782
+SIZE (cabal/cabal-install-1.18.0.5.tar.gz) = 256777
diff --git a/devel/hs-cabal-install/files/cabal.in b/devel/hs-cabal-install/files/cabal.in
deleted file mode 100644
index 206cf42c79d..00000000000
--- a/devel/hs-cabal-install/files/cabal.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-export CC=%%CC%%
-export CPP=%%CPP%%
-export LD=%%LD%%
-export AR=%%AR%%
-export RANLIB=%%RANLIB%%
-
-%%PREFIX%%/bin/cabal-install $*
diff --git a/devel/hs-cabal-install/files/patch-Main.hs b/devel/hs-cabal-install/files/patch-Main.hs
deleted file mode 100644
index fa1da85aaf3..00000000000
--- a/devel/hs-cabal-install/files/patch-Main.hs
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./Main.hs.orig 2012-04-17 17:17:31.000000000 +0200
-+++ ./Main.hs 2012-11-23 20:47:29.000000000 +0100
-@@ -75,7 +75,7 @@
- ( Verbosity, normal, intToVerbosity, lessVerbose )
- import qualified Paths_cabal_install (version)
-
--import System.Environment (getArgs, getProgName)
-+import System.Environment (getArgs)
- import System.Exit (exitFailure)
- import System.FilePath (splitExtension, takeExtension)
- import System.Directory (doesFileExist)
-@@ -107,10 +107,10 @@
-
- where
- printCommandHelp help = do
-- pname <- getProgName
-+ let pname = "cabal"
- putStr (help pname)
- printGlobalHelp help = do
-- pname <- getProgName
-+ let pname = "cabal"
- configFile <- defaultConfigFile
- putStr (help pname)
- putStr $ "\nYou can edit the cabal configuration file to set defaults:\n"
diff --git a/devel/hs-cabal-install/pkg-plist b/devel/hs-cabal-install/pkg-plist
deleted file mode 100644
index bc479db4f81..00000000000
--- a/devel/hs-cabal-install/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cabal
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index af7edcc94f4..e890b2af8c0 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.3.5.2
-PORTREVISION= 7
+PORTVERSION= 0.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binary serialization library for Haskell
+COMMENT= Binary serialization library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index 137104bba6a..c4dd560509d 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cereal-0.3.5.2.tar.gz) = 34c2f77a9c8123d73f786e07d9d141a59b4f3f4dcde8ec5a14a554fd14dc5d7a
-SIZE (cabal/cereal-0.3.5.2.tar.gz) = 22047
+SHA256 (cabal/cereal-0.4.0.1.tar.gz) = 5b0adf19d17c902ecd9e875587601294f9fb47027a43b37f1ff0f52e171be289
+SIZE (cabal/cereal-0.4.0.1.tar.gz) = 22305
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index cf564b5b27f..73bf3c2ac4c 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Check properties on standard classes and data structures
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= QuickCheck>=2.3 random
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index d7cf29c0196..f9b2cfd2a3c 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/checkers-0.3.1.tar.gz) = d728c85d7d7d050932d13ab75e29c7f9ea4e3a91e6b025272045ce89e6421e52
-SIZE (cabal/checkers-0.3.1.tar.gz) = 14894
+SHA256 (cabal/checkers-0.3.2.tar.gz) = 239bae1d36304d0e95d52dbe7340ca6a723d644910375cae80727b4dca31116d
+SIZE (cabal/checkers-0.3.2.tar.gz) = 14895
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
new file mode 100644
index 00000000000..1bf986e9595
--- /dev/null
+++ b/devel/hs-chunked-data/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= chunked-data
+PORTVERSION= 0.1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Typeclasses for dealing with various chunked data representations
+
+LICENSE= MIT
+
+USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups \
+ system-filepath text>=0.11 vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
new file mode 100644
index 00000000000..e606f0a72b5
--- /dev/null
+++ b/devel/hs-chunked-data/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/chunked-data-0.1.0.1.tar.gz) = f9702c5ec695178a0de18e25dcb2e33d93ee5c7103098edbf0d0a6d86b3ab84d
+SIZE (cabal/chunked-data-0.1.0.1.tar.gz) = 4815
diff --git a/devel/hs-chunked-data/pkg-descr b/devel/hs-chunked-data/pkg-descr
new file mode 100644
index 00000000000..e977f4ecefb
--- /dev/null
+++ b/devel/hs-chunked-data/pkg-descr
@@ -0,0 +1,3 @@
+Originally present in classy-prelude.
+
+WWW: https://github.com/fpco/chunked-data
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index ad299685c0e..2483641b730 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 0.5.3
-PORTREVISION= 5
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Conduit instances for classy-prelude
LICENSE= MIT
-USE_CABAL= classy-prelude>=0.5.3 conduit>=0.5.4.1 monad-control \
- resourcet transformers void xml-conduit>=1.0
+USE_CABAL= classy-prelude>=0.9.3 conduit>=1.0 conduit-combinators>=0.2.8 \
+ monad-control resourcet system-fileio void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index d959ed4bb5c..745e0a30d05 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-conduit-0.5.3.tar.gz) = 1fe634987ad343579133335169c99aa5ac1a760f5aeca1c5f737ca36d320bde6
-SIZE (cabal/classy-prelude-conduit-0.5.3.tar.gz) = 1767
+SHA256 (cabal/classy-prelude-conduit-0.9.3.tar.gz) = f9377aeb359bfaf6ef1374102cc907e4ac160028fb3624a3a1ddc6cf601d5473
+SIZE (cabal/classy-prelude-conduit-0.9.3.tar.gz) = 1607
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 1e3d93c81c0..45542c13d6f 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.5.7
-PORTREVISION= 4
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,10 @@ COMMENT= Typeclass-based Prelude
LICENSE= MIT
-USE_CABAL= basic-prelude>=0.3.4 hashable lifted-base>=0.2 \
- system-filepath>=0.4 text transformers unordered-containers \
- vector
+USE_CABAL= basic-prelude>=0.3.8 chunked-data enclosed-exceptions \
+ exceptions>=0.5 hashable lifted-base>=0.2 mono-traversable>=0.6.1 \
+ semigroups stm system-filepath>=0.4 text 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 aff0fd3b4e8..f15efdc9f28 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.5.7.tar.gz) = 1f6bb03827dc40863622aaba5c37c5b7165dfce350328e7d10b00d6c8fa208f3
-SIZE (cabal/classy-prelude-0.5.7.tar.gz) = 15740
+SHA256 (cabal/classy-prelude-0.9.3.tar.gz) = 3bea9e24259a7c7e40ac4bf066673832ae73eca7ebf8738b8256e25a47ffc61b
+SIZE (cabal/classy-prelude-0.9.3.tar.gz) = 9343
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 22e93ef73e0..aca22a8c788 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,16 +1,21 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.3
-PORTREVISION= 4
+PORTVERSION= 0.10.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Command line argument processing
+COMMENT= Command-line argument processing
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= transformers>=0.2
+FLAGS_DEFINE= QUOTATION
+FLAGS_DEFAULT= QUOTATION
+
+QUOTATION_DESC= Build the Quote module
+QUOTATION_FLAG_ENABLE= quotation
+
+FLAGS_DISABLE= testprog
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index c2ea87159f1..f4415ad60b2 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.10.3.tar.gz) = 06665acc796b91d5ea7a1dd48bbe60e595656627cfb52dc61c5baf57e772f4b1
-SIZE (cabal/cmdargs-0.10.3.tar.gz) = 60581
+SHA256 (cabal/cmdargs-0.10.9.tar.gz) = bea251c0e5e12017062b566ad2792e40ce192b4085febe5e315bc41c85b0f08a
+SIZE (cabal/cmdargs-0.10.9.tar.gz) = 63624
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
new file mode 100644
index 00000000000..64582d1d1c6
--- /dev/null
+++ b/devel/hs-conduit-combinators/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= conduit-combinators
+PORTVERSION= 0.2.8.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Commonly used conduit functions, for both chunked and unchunked data
+
+LICENSE= MIT
+
+USE_CABAL= base16-bytestring base64-bytestring>=0.1.1.1 chunked-data \
+ conduit>=1.0.12 conduit-extra monad-control \
+ mono-traversable>=0.4 mwc-random primitive resourcet \
+ streaming-commons system-fileio system-filepath text \
+ transformers-base unix-compat vector void
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
new file mode 100644
index 00000000000..752e302cdc6
--- /dev/null
+++ b/devel/hs-conduit-combinators/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/conduit-combinators-0.2.8.2.tar.gz) = 0a06ff14ebad9778c1fe0f3bcc00aae587ce673a8553d2f99664c7e7c7184ff4
+SIZE (cabal/conduit-combinators-0.2.8.2.tar.gz) = 28058
diff --git a/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs b/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
new file mode 100644
index 00000000000..460fc8fb343
--- /dev/null
+++ b/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
@@ -0,0 +1,68 @@
+--- ./Data/Conduit/Combinators.hs.orig 2014-07-26 20:08:37.000000000 +0200
++++ ./Data/Conduit/Combinators.hs 2014-07-29 14:03:36.000000000 +0200
+@@ -204,6 +204,7 @@
+ import qualified Data.Sequences as Seq
+ import Data.Sequences.Lazy
+ import qualified Data.Vector.Generic as V
++import qualified Data.Text as T
+ import qualified Data.Vector.Generic.Mutable as VM
+ import Data.Void (absurd)
+ import qualified Filesystem as F
+@@ -228,6 +229,8 @@
+ import qualified System.PosixCompat.Files as PosixC
+ import Data.Primitive.MutVar (MutVar, newMutVar, readMutVar,
+ writeMutVar)
++import Data.Streaming.Text hiding (decodeUtf8)
++import qualified Data.Streaming.Text as DST
+
+ #ifndef WINDOWS
+ import qualified System.Posix.Directory as Dir
+@@ -1646,7 +1649,47 @@
+ --
+ -- Since 1.0.0
+ decodeUtf8Lenient :: MonadThrow m => Conduit ByteString m Text
+-decodeUtf8Lenient = CT.decodeUtf8Lenient
++decodeUtf8Lenient =
++ decodeNew onFailure "UTF8-lenient" 0 DST.decodeUtf8
++ where
++ onFailure _consumed _bs t rest = do
++ unless (T.null t) (yield t)
++ case S.uncons rest of
++ Nothing -> return ()
++ Just (_, rest') -> do
++ unless (S.null rest') (leftover rest')
++ yield $ T.singleton '\xFFFD'
++ decodeUtf8Lenient
++
++decodeNew
++ :: Monad m
++ => (Int -> S.ByteString -> T.Text -> S.ByteString -> Conduit S.ByteString m T.Text)
++ -> t
++ -> Int
++ -> (S.ByteString -> DecodeResult)
++ -> Conduit S.ByteString m T.Text
++decodeNew onFailure name =
++ loop
++ where
++ loop consumed dec =
++ await >>= maybe finish go
++ where
++ finish =
++ case dec S.empty of
++ DecodeResultSuccess _ _ -> return ()
++ DecodeResultFailure t rest -> onFailure consumed S.empty t rest
++ {-# INLINE finish #-}
++
++ go bs | S.null bs = loop consumed dec
++ go bs =
++ case dec bs of
++ DecodeResultSuccess t dec' -> do
++ let consumed' = consumed + S.length bs
++ next = do
++ unless (T.null t) (yield t)
++ loop consumed' dec'
++ in consumed' `seq` next
++ DecodeResultFailure t rest -> onFailure consumed bs t rest
+
+ -- | Stream in the entirety of a single line.
+ --
diff --git a/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal b/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal
new file mode 100644
index 00000000000..2e01c966d5a
--- /dev/null
+++ b/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal
@@ -0,0 +1,19 @@
+--- ./conduit-combinators.cabal.orig 2014-07-26 20:08:37.000000000 +0200
++++ ./conduit-combinators.cabal 2014-07-29 14:01:52.000000000 +0200
+@@ -20,7 +20,7 @@
+ build-depends: base >= 4 && < 5
+ , chunked-data
+ , conduit >= 1.0.12
+- , conduit-extra >= 1.1.1
++ , conduit-extra
+ , transformers
+ , transformers-base
+ , primitive
+@@ -37,6 +37,7 @@
+ , base64-bytestring >= 0.1.1.1
+ , resourcet
+ , monad-control
++ , streaming-commons
+ if os(windows)
+ cpp-options: -DWINDOWS
+ else
diff --git a/devel/hs-conduit-combinators/pkg-descr b/devel/hs-conduit-combinators/pkg-descr
new file mode 100644
index 00000000000..7f386cb5825
--- /dev/null
+++ b/devel/hs-conduit-combinators/pkg-descr
@@ -0,0 +1,4 @@
+Provides a replacement for Data.Conduit.List, as well as a convenient
+Conduit module.
+
+WWW: https://github.com/fpco/conduit-combinators
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
new file mode 100644
index 00000000000..9a875d6fee7
--- /dev/null
+++ b/devel/hs-conduit-extra/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= conduit-extra
+PORTVERSION= 1.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Batteries included conduit: adapters for common libraries
+
+LICENSE= MIT
+
+USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \
+ monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \
+ streaming-commons>=0.1.4 text transformers-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
new file mode 100644
index 00000000000..3c6d10869ed
--- /dev/null
+++ b/devel/hs-conduit-extra/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/conduit-extra-1.1.3.tar.gz) = 3d3ea5b83e913c8166eb94a4f2fd181e840fb8201f51f3865011d3db15bdfbbf
+SIZE (cabal/conduit-extra-1.1.3.tar.gz) = 25753
diff --git a/devel/hs-conduit-extra/pkg-descr b/devel/hs-conduit-extra/pkg-descr
new file mode 100644
index 00000000000..494a022317f
--- /dev/null
+++ b/devel/hs-conduit-extra/pkg-descr
@@ -0,0 +1,7 @@
+The conduit package itself maintains relative small dependencies. The
+purpose of this package is to collect commonly used utility functions
+wrapping other library dependencies, without depending on heavier-weight
+dependencies. The basic idea is that this package should only depend on
+haskell-platform packages and conduit.
+
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index d1e6476a60a..dc9057fa69b 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTVERSION= 1.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Streaming data processing library
-LICENSE= BSD
+LICENSE= MIT
-USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 resourcet>=0.4.3 \
- text>=0.11 transformers>=0.2.2 transformers-base>=0.4.1 \
- void>=0.5.5
+USE_CABAL= exceptions lifted-base>=0.1 mmorph monad-control>=0.3.1 \
+ mtl resourcet>=1.1 transformers-base>=0.4.1 void>=0.5.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index 8de981b976c..5123f21b357 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-1.0.5.tar.gz) = c57c8226509e4aeea81a9cb790757c94183e011de5c4798cbb5935d0e9551271
-SIZE (cabal/conduit-1.0.5.tar.gz) = 30859
+SHA256 (cabal/conduit-1.1.7.tar.gz) = e6d7df3ac473dabfb66bc86372a0ad15db75a3b48f7553f4b72d2e7c74846276
+SIZE (cabal/conduit-1.1.7.tar.gz) = 30175
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 74dec198b7f..a2c269b14e8 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= configurator
-PORTVERSION= 0.2.0.2
-PORTREVISION= 6
+PORTVERSION= 0.3.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Configuration management
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10.0.2 hashable text>=0.11.1.0 unix-compat \
unordered-containers
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index c7af3bb6f81..1ffcc4ec4af 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/configurator-0.2.0.2.tar.gz) = 0bb504b11c4f13a57b2cb80f23427dd7e8d13dade4f126e06c91ec87487b3904
-SIZE (cabal/configurator-0.2.0.2.tar.gz) = 14231
+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-convertible/Makefile b/devel/hs-convertible/Makefile
index ca6e24e9273..8bb6890dc9b 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= convertible
-PORTVERSION= 1.0.11.1
-PORTREVISION= 8
+PORTVERSION= 1.1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Typeclasses and instances for converting between types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl text>=0.7
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 22af642ccd7..7d4c407567b 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/convertible-1.0.11.1.tar.gz) = 46d26e9fec9034bcb27334ba378e8735ac3126eb8573b4dbd1a06b77b350a0e4
-SIZE (cabal/convertible-1.0.11.1.tar.gz) = 14478
+SHA256 (cabal/convertible-1.1.0.0.tar.gz) = 13c4943c302700a207426aabcd6dab5a5de85de2353acacbcf4159e924f9835d
+SIZE (cabal/convertible-1.1.0.0.tar.gz) = 14087
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 8897a34aa6d..54fcb6abb7b 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.16
-PORTREVISION= 5
+PORTVERSION= 1.18.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,6 +10,8 @@ COMMENT= Liberalised re-implementation of cpp, the C pre-processor
LICENSE= LGPL21
+USE_CABAL= polyparse>=1.9
+
EXECUTABLE= cpphs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 88bbcfd69fa..1c291b9728a 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpphs-1.16.tar.gz) = b7562ee6dd504f210a363c6bb7ea542e67f0a6ad75aca66080e66801870e69bb
-SIZE (cabal/cpphs-1.16.tar.gz) = 71105
+SHA256 (cabal/cpphs-1.18.5.tar.gz) = e71d9ea2c4999905f9910bbb1b947dcef1950dacb03e17c2d9bb5b3739f80e2f
+SIZE (cabal/cpphs-1.18.5.tar.gz) = 72221
diff --git a/devel/hs-cpphs/pkg-descr b/devel/hs-cpphs/pkg-descr
index b596c1d60cf..cc804fd3862 100644
--- a/devel/hs-cpphs/pkg-descr
+++ b/devel/hs-cpphs/pkg-descr
@@ -5,4 +5,4 @@ pretty-much feature-complete and compatible with traditional (K&R)
pre-processors. Additional features include: a plain-text mode; an option
to unlit literate code files; and an option to turn off macro-expansion.
-WWW: http://haskell.org/cpphs/
+WWW: http://projects.haskell.org/cpphs/
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index e26ceef62c0..150c34c2dc6 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darcs
PORTVERSION= 2.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,77 +11,46 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
-USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html \
- mtl>=1.0 parsec>=2.2 random regex-compat>=0.95.1 \
- regex-posix>=0.95.1 tar>=0.4 text>=0.11.0.6 unix-compat>=0.1.2 \
- utf8-string>=0.3.6 vector>=0.7 zlib>=0.5.1.0
+USE_CABAL= hashed-storage>=0.5.6 html mtl>=1.0 parsec>=2.2 random \
+ regex-compat>=0.95.1 regex-posix>=0.95.1 tar>=0.4 \
+ text>=0.11.0.6 unix-compat>=0.1.2 utf8-string>=0.3.6 \
+ vector>=0.7 zlib>=0.5.1.0
EXECUTABLE= darcs
-MAN1= darcs.1
+MAN1PAGES= darcs.1
-OPTIONS_DEFINE= STATIC TERMINFO THREADED COLOR MMAP
-OPTIONS_MULTI= HTTP
-OPTIONS_MULTI_HTTP= CURL HTTP
-OPTIONS_DEFAULT= CURL THREADED
+FLAGS_DEFINE= STATIC TERMINFO THREADED COLOR MMAP
+FLAGS_MULTI= WEB
+FLAGS_MULTI_WEB= CURL HTTP
+WEB_DESC= HTTP backend
+
+FLAGS_DEFAULT= CURL THREADED
+FLAGS_ENABLE= library executable
CURL_DESC= Use libcurl for HTTP support
+CURL_FLAG_ENABLE= curl
+CURL_FLAG_LIB= libcurl.so:${PORTSDIR}/ftp/curl
+
HTTP_DESC= Use the pure HTTP package
+HTTP_FLAG_ENABLE= http
+HTTP_FLAG_CABAL= HTTP>=4000.0.8 network>=2.2
+
STATIC_DESC= Build static binary
-TERMINFO_DESC= Use the terminfo package
+STATIC_FLAG_ENABLE= static
+
+TERMINFO_DESC= Use terminfo
+TERMINFO_FLAG_ENABLE= terminfo
+
THREADED_DESC= Use threading and SMP support
+THREADED_FLAG_ENABLE= threaded
+
COLOR_DESC= Use ANSI color escapes
-MMAP_DESC= Compile with mmap support
+COLOR_FLAG_ENABLE= color
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-CONFIGURE_ARGS+= --flags="library executable"
-
-.if ${PORT_OPTIONS:MCURL}
-CONFIGURE_ARGS+= --flags="curl"
-LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+= --flags="-curl"
-.endif
-
-.if ${PORT_OPTIONS:MHTTP}
-CONFIGURE_ARGS+= --flags="http"
-USE_CABAL+= HTTP>=4000.0.8 network>=2.2
-.else
-CONFIGURE_ARGS+= --flags="-http"
-.endif
-
-.if ${PORT_OPTIONS:MSTATIC}
-CONFIGURE_ARGS+= --flags="static"
-.else
-CONFIGURE_ARGS+= --flags="-static"
-.endif
-
-.if ${PORT_OPTIONS:MTERMINFO}
-CONFIGURE_ARGS+= --flags="terminfo"
-USE_CABAL+= terminfo>=0.3
-.else
-CONFIGURE_ARGS+= --flags="-terminfo"
-.endif
-
-.if ${PORT_OPTIONS:MTHREADED}
-CONFIGURE_ARGS+= --flags="threaded"
-.else
-CONFIGURE_ARGS+= --flags="-threaded"
-.endif
-
-.if ${PORT_OPTIONS:MCOLOR}
-CONFIGURE_ARGS+= --flags="color"
-.else
-CONFIGURE_ARGS+= --flags="-color"
-.endif
-
-.if ${PORT_OPTIONS:MMMAP}
-CONFIGURE_ARGS+= --flags="mmap"
-USE_CABAL+= mmap>=0.5
-.else
-CONFIGURE_ARGS+= --flags="-mmap"
-.endif
+MMAP_DESC= Compile with mmap support
+MMAP_FLAG_ENABLE= mmap
+MMAP_FLAG_CABAL= mmap>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index c2ecc0e43c6..c93b1212684 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,5 +1,5 @@
---- Setup.lhs.orig 2013-02-06 07:07:21.000000000 +0100
-+++ Setup.lhs 2013-02-10 10:48:49.000000000 +0100
+--- ./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 @@
import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 00000000000..db24cf9a638
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,136 @@
+--- ./darcs.cabal.orig 2013-02-06 07:07:21.000000000 +0100
++++ ./darcs.cabal 2014-07-13 22:44:31.000000000 +0200
+@@ -147,7 +147,7 @@
+ else
+ buildable: True
+
+- build-tools: ghc >= 6.10 && < 7.8
++ build-tools: ghc >= 6.10 && < 7.10
+
+ hs-source-dirs: src
+ include-dirs: src
+@@ -369,13 +369,13 @@
+ cc-options: -DHAVE_SIGINFO_H
+
+ if os(windows)
+- build-depends: base >= 4 && < 4.7
++ build-depends: base >= 4 && < 4.8
+ else
+ if flag(force-char8-encoding)
+- build-depends: base >= 4.5 && < 4.7
++ build-depends: base >= 4.5 && < 4.8
+ cpp-options: -DFORCE_CHAR8_ENCODING
+ else
+- build-depends: base >= 4 && < 4.4
++ build-depends: base >= 4 && < 4.8
+
+ build-depends: extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.95.1,
+@@ -393,15 +393,15 @@
+ build-depends: haskeline <= 0.6.4.6
+
+ if !os(windows)
+- build-depends: unix >= 1.0 && < 2.7
++ build-depends: unix >= 1.0 && < 2.8
+
+ build-depends: bytestring >= 0.9.0 && < 0.11,
+- text >= 0.11.0.6 && < 0.12.0.0,
++ text >= 0.11.0.6 && < 1.2.0.0,
+ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.3.0.0,
+- process >= 1.0.0.0 && < 1.2.0.0,
++ process >= 1.0.0.0 && < 1.3.0.0,
+ containers >= 0.1 && < 0.6,
+- array >= 0.1 && < 0.5,
++ array >= 0.1 && < 0.6,
+ random == 1.0.*
+
+
+@@ -486,7 +486,7 @@
+ buildable: False
+ else
+ buildable: True
+- build-tools: ghc >= 6.10 && < 7.8
++ build-tools: ghc >= 6.10 && < 7.10
+
+ main-is: darcs.hs
+ hs-source-dirs: src
+@@ -547,13 +547,13 @@
+ cc-options: -DHAVE_SIGINFO_H
+
+ if os(windows)
+- build-depends: base >= 4 && < 4.7
++ build-depends: base >= 4 && < 4.8
+ else
+ if flag(force-char8-encoding)
+- build-depends: base >= 4.5 && < 4.7
++ build-depends: base >= 4.5 && < 4.8
+ cpp-options: -DFORCE_CHAR8_ENCODING
+ else
+- build-depends: base >= 4 && < 4.4
++ build-depends: base >= 4 && < 4.8
+
+ build-depends: extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.95.1,
+@@ -571,15 +571,15 @@
+ build-depends: haskeline <= 0.6.4.6
+
+ if !os(windows)
+- build-depends: unix >= 1.0 && < 2.7
++ build-depends: unix >= 1.0 && < 2.8
+
+ build-depends: bytestring >= 0.9.0 && < 0.11,
+- text >= 0.11.0.6 && < 0.12.0.0,
++ text >= 0.11.0.6 && < 1.2.0.0,
+ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.3.0.0,
+- process >= 1.0.0.0 && < 1.2.0.0,
++ process >= 1.0.0.0 && < 1.3.0.0,
+ containers >= 0.1 && < 0.6,
+- array >= 0.1 && < 0.5,
++ array >= 0.1 && < 0.6,
+ random == 1.0.*
+
+ if flag(curl)
+@@ -643,7 +643,7 @@
+ Executable darcs-test
+ main-is: test.hs
+
+- build-tools: ghc >= 6.10 && < 7.8
++ build-tools: ghc >= 6.10 && < 7.10
+
+
+ if !flag(test)
+@@ -756,25 +756,25 @@
+ cc-options: -DHAVE_SIGINFO_H
+
+ if os(windows)
+- build-depends: base >= 4 && < 4.7
++ build-depends: base >= 4 && < 4.8
+ else
+ if flag(force-char8-encoding)
+- build-depends: base >= 4.5 && < 4.7
++ build-depends: base >= 4.5 && < 4.8
+ cpp-options: -DFORCE_CHAR8_ENCODING
+ else
+- build-depends: base >= 4 && < 4.4
++ build-depends: base >= 4 && < 4.8
+
+ if !os(windows)
+- build-depends: unix >= 1.0 && < 2.7
++ build-depends: unix >= 1.0 && < 2.8
+
+ build-depends: bytestring >= 0.9.0 && < 0.11,
+ haskeline >= 0.6.3 && < 0.8,
+- text >= 0.11.0.6 && < 0.12.0.0,
++ text >= 0.11.0.6 && < 1.2.0.0,
+ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.3.0.0,
+- process >= 1.0.0.0 && < 1.2.0.0,
++ process >= 1.0.0.0 && < 1.3.0.0,
+ containers >= 0.1 && < 0.6,
+- array >= 0.1 && < 0.5,
++ array >= 0.1 && < 0.6,
+ hashed-storage >= 0.5.6 && < 0.6,
+ vector >= 0.7,
+ tar >= 0.3 && < 0.5,
diff --git a/devel/hs-darcs/files/patch-src__Crypt__SHA256.hs b/devel/hs-darcs/files/patch-src__Crypt__SHA256.hs
new file mode 100644
index 00000000000..4fbf130c413
--- /dev/null
+++ b/devel/hs-darcs/files/patch-src__Crypt__SHA256.hs
@@ -0,0 +1,10 @@
+--- ./src/Crypt/SHA256.hs.orig 2013-02-06 07:07:21.000000000 +0100
++++ ./src/Crypt/SHA256.hs 2014-07-13 18:41:00.000000000 +0200
+@@ -20,6 +20,7 @@
+ import Foreign.C.String ( withCString )
+ import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
+ import qualified Data.ByteString as B
++import System.IO.Unsafe
+
+ sha256sum :: B.ByteString -> String
+ sha256sum p = unsafePerformIO $
diff --git a/devel/hs-darcs/files/patch-src__Darcs__Commands__Get.hs b/devel/hs-darcs/files/patch-src__Darcs__Commands__Get.hs
new file mode 100644
index 00000000000..0dfbd5e268a
--- /dev/null
+++ b/devel/hs-darcs/files/patch-src__Darcs__Commands__Get.hs
@@ -0,0 +1,12 @@
+--- ./src/Darcs/Commands/Get.hs.orig 2013-02-06 07:07:21.000000000 +0100
++++ ./src/Darcs/Commands/Get.hs 2014-07-13 22:39:00.000000000 +0200
+@@ -157,7 +157,8 @@
+ copyRepo
+ withRepository opts ((RepoJob $ \repository -> goToChosenVersion repository opts) :: RepoJob ())
+ putInfo opts $ text "Finished getting."
+- where copyRepo =
++ where copyRepo :: IO ()
++ copyRepo =
+ withRepository opts $ RepoJob $ \repository ->
+ if formatHas HashedInventory rfsource
+ then do
diff --git a/devel/hs-darcs/files/patch-src__Darcs__Global.hs b/devel/hs-darcs/files/patch-src__Darcs__Global.hs
new file mode 100644
index 00000000000..75472fdfc14
--- /dev/null
+++ b/devel/hs-darcs/files/patch-src__Darcs__Global.hs
@@ -0,0 +1,26 @@
+--- ./src/Darcs/Global.hs.orig 2013-02-06 07:07:21.000000000 +0100
++++ ./src/Darcs/Global.hs 2014-07-13 18:40:00.000000000 +0200
+@@ -61,7 +61,7 @@
+ import Control.Monad ( when )
+ import Control.Concurrent.MVar
+ import Control.Exception.Extensible ( bracket_, catch, catchJust, SomeException
+- , block, unblock
++ , mask_
+ )
+ import Data.IORef ( IORef, newIORef, readIORef, writeIORef )
+ import Data.IORef ( modifyIORef )
+@@ -106,12 +106,12 @@
+ exit
+ prog
+ where
+- exit = block $ do
++ exit = mask_ $ do
+ Just actions <- swapMVar atexitActions Nothing
+ -- from now on atexit will not register new actions
+ mapM_ runAction actions
+ runAction action =
+- catch (unblock action) $ \(exn :: SomeException) -> do
++ catch action $ \(exn :: SomeException) -> do
+ hPutStrLn stderr $ "Exception thrown by an atexit registered action:"
+ hPutStrLn stderr $ show exn
+
diff --git a/devel/hs-darcs/files/patch-src__Darcs__SignalHandler.hs b/devel/hs-darcs/files/patch-src__Darcs__SignalHandler.hs
new file mode 100644
index 00000000000..e495bfad5fe
--- /dev/null
+++ b/devel/hs-darcs/files/patch-src__Darcs__SignalHandler.hs
@@ -0,0 +1,23 @@
+--- ./src/Darcs/SignalHandler.hs.orig 2013-02-06 07:07:21.000000000 +0100
++++ ./src/Darcs/SignalHandler.hs 2014-07-13 18:39:00.000000000 +0200
+@@ -27,7 +27,7 @@
+ import System.Exit ( exitWith, ExitCode ( ExitFailure ) )
+ import Control.Concurrent ( ThreadId, myThreadId )
+ import Control.Exception.Extensible
+- ( catch, throw, throwTo, block, unblock,
++ ( catch, throw, throwTo, mask_,
+ Exception(..), SomeException(..), IOException )
+ import System.Posix.Files ( getFdStatus, isNamedPipe )
+ import System.Posix.IO ( stdOutput )
+@@ -128,8 +128,9 @@
+ | otherwise = throw ioe
+
+ withSignalsBlocked :: IO a -> IO a
+-withSignalsBlocked job = block (job >>= \r ->
+- unblock(return r) `catchSignal` couldnt_do r)
++withSignalsBlocked job = do
++ r <- mask_ job
++ (return r) `catchSignal` couldnt_do r
+ where couldnt_do r s | s == sigINT = oops "interrupt" r
+ | s == sigHUP = oops "HUP" r
+ | s == sigABRT = oops "ABRT" r
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index a77868d5c31..2b4b30c7253 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default-class
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Class for types with a default value
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index 13b9aa389bc..c2c791c2efd 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Default instances for types in base
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default-class
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index b236bd57019..71bb078176a 100644
--- a/devel/hs-data-default-instances-containers/Makefile
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Default instances for types in containers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default-class
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index 45f7dcd857c..fd26e147ec4 100644
--- a/devel/hs-data-default-instances-dlist/Makefile
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Default instances for types in dlist
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default-class dlist
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 22d2d5e3e64..c1813ab1461 100644
--- a/devel/hs-data-default-instances-old-locale/Makefile
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Default instances for types in old-locale
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default-class
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 45a7e824767..3a05026d76c 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -2,13 +2,13 @@
PORTNAME= data-default
PORTVERSION= 0.5.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Class for types with a default value
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default-class data-default-instances-base \
data-default-instances-containers data-default-instances-dlist \
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
new file mode 100644
index 00000000000..58388529460
--- /dev/null
+++ b/devel/hs-data-hash/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-hash
+PORTVERSION= 0.2.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Combinators for building fast hashing functions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
new file mode 100644
index 00000000000..773c4a4cdad
--- /dev/null
+++ b/devel/hs-data-hash/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-hash-0.2.0.0.tar.gz) = 35b39a4ec9efaad0c1fac2c1d5f7b6fe4717a67935a8f9d6c372bce9085bdaad
+SIZE (cabal/data-hash-0.2.0.0.tar.gz) = 8486
diff --git a/devel/hs-data-hash/pkg-descr b/devel/hs-data-hash/pkg-descr
new file mode 100644
index 00000000000..3ad409775ee
--- /dev/null
+++ b/devel/hs-data-hash/pkg-descr
@@ -0,0 +1,4 @@
+Combinators for building fast hashing functions. Includes hashing
+functions for all basic Haskell 98 types.
+
+WWW: http://hackage.haskell.org/package/data-hash
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index 2373c865010..d5fd04af973 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= data-pprint
-PORTVERSION= 0.2.1.4
-PORTREVISION= 6
+PORTVERSION= 0.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Prettyprint and compare Data values
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=2.0 parallel>=3.1
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index e73b5a4608c..8867030ad1b 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-pprint-0.2.1.4.tar.gz) = c8c180c525744bec6987e43de79ed12d5590a436d09b0f7d008ce0c0cdda7f16
-SIZE (cabal/data-pprint-0.2.1.4.tar.gz) = 9952
+SHA256 (cabal/data-pprint-0.2.3.tar.gz) = deb8f5b176409a7a7606486173d159cd4f55f2eaefbc2a5ba690b4948685ebf9
+SIZE (cabal/data-pprint-0.2.3.tar.gz) = 10099
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 00000000000..4354dd16493
--- /dev/null
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -0,0 +1,11 @@
+--- ./data-pprint.cabal.orig 2013-10-19 16:24:17.000000000 +0200
++++ ./data-pprint.cabal 2014-07-12 22:25:47.000000000 +0200
+@@ -68,7 +68,7 @@
+ System.IO.Parallel
+ other-modules:
+ build-depends:
+- base >= 4.0 && < 4.7,
++ base >= 4.0 && < 4.8,
+ pretty >= 1.0 && < 1.2,
+ mtl >= 2.0 && < 2.2,
+ deepseq >= 1.1 && < 1.4,
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index c55a50936c7..21c7fcd622f 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,13 +2,13 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Date cacher
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 0d7cead5b8e..eb2b3f6ec77 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.2.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
new file mode 100644
index 00000000000..168c66db4c4
--- /dev/null
+++ b/devel/hs-deepseq-generics/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= deepseq-generics
+PORTVERSION= 0.1.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= GHC.Generics-based Control.DeepSeq.rnf implementation
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
new file mode 100644
index 00000000000..87caaf7cfeb
--- /dev/null
+++ b/devel/hs-deepseq-generics/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/deepseq-generics-0.1.1.1.tar.gz) = 08e8438de375a822f38fa33ea1cd9a24e494b7f6deea0a4aa052daa5fb138cc5
+SIZE (cabal/deepseq-generics-0.1.1.1.tar.gz) = 5061
diff --git a/devel/hs-deepseq-generics/pkg-descr b/devel/hs-deepseq-generics/pkg-descr
new file mode 100644
index 00000000000..fef41249bf4
--- /dev/null
+++ b/devel/hs-deepseq-generics/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a "GHC.Generics"-based
+'Control.DeepSeq.Generics.genericRnf' function which can be used for
+providing a 'rnf' implementation.
+
+WWW: https://github.com/hvr/deepseq-generics
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index a192bd90cd3..f5b56a57d57 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= directory-tree
-PORTVERSION= 0.11.0
-PORTREVISION= 6
+PORTVERSION= 0.12.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple directory-like tree datatype, with useful IO functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-directory-tree/distinfo b/devel/hs-directory-tree/distinfo
index 3dde8007034..27ecf8e3d60 100644
--- a/devel/hs-directory-tree/distinfo
+++ b/devel/hs-directory-tree/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/directory-tree-0.11.0.tar.gz) = 890570cfe689d8925355944c5281a50eefef1395a5834219a75b3abebee5781f
-SIZE (cabal/directory-tree-0.11.0.tar.gz) = 10645
+SHA256 (cabal/directory-tree-0.12.0.tar.gz) = ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5
+SIZE (cabal/directory-tree-0.12.0.tar.gz) = 12024
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
new file mode 100644
index 00000000000..79f00b9a686
--- /dev/null
+++ b/devel/hs-dlist-instances/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= dlist-instances
+PORTVERSION= 0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Difference lists instances
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= dlist semigroups
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-dlist-instances/distinfo b/devel/hs-dlist-instances/distinfo
new file mode 100644
index 00000000000..315dc439451
--- /dev/null
+++ b/devel/hs-dlist-instances/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/dlist-instances-0.1.tar.gz) = 2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264
+SIZE (cabal/dlist-instances-0.1.tar.gz) = 1676
diff --git a/devel/hs-dlist-instances/pkg-descr b/devel/hs-dlist-instances/pkg-descr
new file mode 100644
index 00000000000..c8abfb79bba
--- /dev/null
+++ b/devel/hs-dlist-instances/pkg-descr
@@ -0,0 +1,4 @@
+This package is the canonical source for some orphan instances. Orphan
+instances are placed here to avoid dependencies elsewhere.
+
+WWW: https://github.com/gregwebs/dlist-instances
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index d6ae1933656..12506a3f4c0 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.5
-PORTREVISION= 13
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= List-like type supporting O(1) append for Haskell
+COMMENT= Difference lists
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index 2ce4b983344..82ec5786293 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dlist-0.5.tar.gz) = 4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea
-SIZE (cabal/dlist-0.5.tar.gz) = 5962
+SHA256 (cabal/dlist-0.7.1.tar.gz) = d9f5609dc1aa9756372a43f8f8414be6380e778754c8e7986a54906317186a8e
+SIZE (cabal/dlist-0.7.1.tar.gz) = 6137
diff --git a/devel/hs-dlist/pkg-descr b/devel/hs-dlist/pkg-descr
index 1d56e5b0e9b..96b9fcbdbef 100644
--- a/devel/hs-dlist/pkg-descr
+++ b/devel/hs-dlist/pkg-descr
@@ -2,4 +2,4 @@ Differences lists are a list-like type supporting O(1) append. This is
particularly useful for efficient logging and pretty printing, (e.g.
with the Writer monad), where list append quickly becomes too expensive.
-WWW: http://code.haskell.org/~dons/code/dlist/
+WWW: https://github.com/spl/dlist
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
deleted file mode 100644
index 56d2a75fe62..00000000000
--- a/devel/hs-drift/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-# $FreeBSD$
-
-PORTNAME= drift
-PORTVERSION= 2.2.3
-PORTREVISION= 8
-CATEGORIES= devel haskell
-MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/
-PKGNAMEPREFIX= hs-
-DISTNAME= DrIFT-${PORTVERSION}
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Type sensitive preprocessor for Haskell
-
-OPTIONS_SINGLE= COMPILER
-OPTIONS_SINGLE_COMPILER= NHC98 GHC
-OPTIONS_DEFAULT= GHC
-
-NHC98_DESC= Build with NHC98
-GHC_DESC= Build with GHC
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGHC}
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- hs-random>=0:${PORTSDIR}/devel/hs-random
-LIB_DEPENDS= libgmp.so.10:${PORTSDIR}/math/gmp \
- libffi.so.6:${PORTSDIR}/devel/libffi
-
-CONFIGURE_ARGS+= --with-hc=ghc
-.endif
-
-.if ${PORT_OPTIONS:MNHC98}
-BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-BROKEN= Does not build
-
-CONFIGURE_ARGS+= --with-hc=nhc98
-.endif
-
-USES= gmake
-GNU_CONFIGURE= yes
-
-INFO= drift
-PLIST_FILES= bin/DrIFT bin/drift-ghc
-
-.if ${PORT_OPTIONS:MGHC}
-post-patch:
- @${REINPLACE_CMD} 's|import List|import Data.List| ; \
- s|import Char|import Data.Char| ; \
- s|import Monad|import Control.Monad| ; \
- s|import IO|import System.IO.Error| ; \
- s|import Directory|import System.Directory| ; \
- s|import Maybe|import Data.Maybe| ; \
- s|import Array|import Data.Array| ; \
- s|import Time|import System.Time| ; \
- s|import Random|import System.Random| ; \
- s|import System[^\.]|import System.Exit|' \
- `${FIND} ${WRKSRC} -name '*.*hs'`
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/hs-drift/distinfo b/devel/hs-drift/distinfo
deleted file mode 100644
index 3c4546e1022..00000000000
--- a/devel/hs-drift/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (DrIFT-2.2.3.tar.gz) = c5edb6e89e3a04aa7918acd2db37413ff80f945fdd1370f3614dc0d93e8913a9
-SIZE (DrIFT-2.2.3.tar.gz) = 219321
diff --git a/devel/hs-drift/files/patch-src__ChaseImports.hs b/devel/hs-drift/files/patch-src__ChaseImports.hs
deleted file mode 100644
index 0150ecfdbbc..00000000000
--- a/devel/hs-drift/files/patch-src__ChaseImports.hs
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/ChaseImports.hs.orig 2008-02-10 15:38:31.000000000 +0100
-+++ ./src/ChaseImports.hs 2013-05-01 01:35:21.000000000 +0200
-@@ -24,13 +24,14 @@
- import DataP
- import CommandP
- import ParseLib2
--import System
-+import System.Environment
-+import System.IO.Error
- import List
- import qualified Unlit
- import Monad
- import GenUtil
-
--try x = catch (x >>= return . Right) (return . Left)
-+try x = catchIOError (x >>= return . Right) (return . Left)
-
- --- Split up input ---------------------------------------------------------
- splitString :: String -> String -> (String,String)
diff --git a/devel/hs-drift/files/patch-src__DrIFT.hs b/devel/hs-drift/files/patch-src__DrIFT.hs
deleted file mode 100644
index 0bf97251f09..00000000000
--- a/devel/hs-drift/files/patch-src__DrIFT.hs
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./src/DrIFT.hs.orig 2008-02-10 15:38:31.000000000 +0100
-+++ ./src/DrIFT.hs 2012-05-13 11:52:13.000000000 +0200
-@@ -17,7 +17,8 @@
- import RuleUtils(Rule,Tag)
- import Version
- import qualified Rules(rules)
--import qualified System
-+import qualified System.Environment
-+import System.IO
-
- data Op = OpList | OpDerive | OpVersion
-
-@@ -78,7 +79,7 @@
-
- header = "Usage: DrIFT [OPTION...] file"
- main = do
-- argv <- System.getArgs
-+ argv <- System.Environment.getArgs
- (env,n) <- case (getOpt Permute options argv) of
- (as,n,[]) -> return (foldr ($) env as ,n)
- (_,_,errs) -> putErrDie (concat errs ++ usageInfo header options)
diff --git a/devel/hs-drift/files/patch-src__GenUtil.hs b/devel/hs-drift/files/patch-src__GenUtil.hs
deleted file mode 100644
index cd7485acc98..00000000000
--- a/devel/hs-drift/files/patch-src__GenUtil.hs
+++ /dev/null
@@ -1,91 +0,0 @@
---- ./src/GenUtil.hs.orig 2008-02-10 15:38:31.000000000 +0100
-+++ ./src/GenUtil.hs 2013-05-01 00:53:12.000000000 +0200
-@@ -39,7 +39,7 @@
- -- ** Simple deconstruction
- fromLeft,fromRight,fsts,snds,splitEither,rights,lefts,
- -- ** System routines
-- exitSuccess, System.exitFailure, epoch, lookupEnv,endOfTime,
-+ exitSuccess, System.Exit.exitFailure, epoch, lookupEnv,endOfTime,
- -- ** Random routines
- repMaybe,
- liftT2, liftT3, liftT4,
-@@ -94,9 +94,11 @@
- import Char(isAlphaNum, isSpace, toLower, ord)
- import List(group,sort)
- import List(intersperse, sortBy, groupBy)
--import Monad
--import qualified IO
--import qualified System
-+import Monad hiding (replicateM, replicateM_)
-+import qualified System.IO
-+import qualified System.IO.Error
-+import qualified System.Exit
-+import qualified System.Environment
- import Random(StdGen, newStdGen, Random(randomR))
- import Time
-
-@@ -127,7 +129,7 @@
-
- -- | write string to standard error
- putErr :: String -> IO ()
--putErr = IO.hPutStr IO.stderr
-+putErr = System.IO.hPutStr System.IO.stderr
-
- -- | write string and newline to standard error
- putErrLn :: String -> IO ()
-@@ -137,13 +139,13 @@
- -- | write string and newline to standard error,
- -- then exit program with failure.
- putErrDie :: String -> IO a
--putErrDie s = putErrLn s >> System.exitFailure
-+putErrDie s = putErrLn s >> System.Exit.exitFailure
-
-
- -- | exit program successfully. 'exitFailure' is
- -- also exported from System.
- exitSuccess :: IO a
--exitSuccess = System.exitWith System.ExitSuccess
-+exitSuccess = System.Exit.exitWith System.Exit.ExitSuccess
-
-
- {-# INLINE fromRight #-}
-@@ -284,10 +286,10 @@
- lefts xs = [x | Left x <- xs]
-
- ioM :: Monad m => IO a -> IO (m a)
--ioM action = catch (fmap return action) (\e -> return (fail (show e)))
-+ioM action = System.IO.Error.catchIOError (fmap return action) (\e -> return (fail (show e)))
-
- ioMp :: MonadPlus m => IO a -> IO (m a)
--ioMp action = catch (fmap return action) (\_ -> return mzero)
-+ioMp action = System.IO.Error.catchIOError (fmap return action) (\_ -> return mzero)
-
- -- | reformat a string to not be wider than a given width, breaking it up
- -- between words.
-@@ -381,7 +383,7 @@
- -- | looks up an enviornment variable and returns it in a 'MonadPlus' rather
- -- than raising an exception if the variable is not set.
- lookupEnv :: MonadPlus m => String -> IO (m String)
--lookupEnv s = catch (fmap return $ System.getEnv s) (\e -> if IO.isDoesNotExistError e then return mzero else ioError e)
-+lookupEnv s = System.IO.Error.catchIOError (fmap return $ System.Environment.getEnv s) (\e -> if System.IO.Error.isDoesNotExistError e then return mzero else ioError e)
-
- {-# SPECIALIZE fmapLeft :: (a -> c) -> [(Either a b)] -> [(Either c b)] #-}
- fmapLeft :: Functor f => (a -> c) -> f (Either a b) -> f (Either c b)
-@@ -482,7 +484,7 @@
- _ `overlaps` _ = True
-
- -- | translate a number of seconds to a string representing the duration expressed.
--showDuration :: Integral a => a -> String
-+showDuration :: (Show a, Integral a) => a -> String
- showDuration x = st "d" dayI ++ st "h" hourI ++ st "m" minI ++ show secI ++ "s" where
- (dayI, hourI) = divMod hourI' 24
- (hourI', minI) = divMod minI' 60
-@@ -495,7 +497,7 @@
- -- arguments are given, read stdin.
-
- getArgContents = do
-- as <- System.getArgs
-+ as <- System.Environment.getArgs
- let f "-" = getContents
- f fn = readFile fn
- cs <- mapM f as
diff --git a/devel/hs-drift/files/patch-src__Makefile.in b/devel/hs-drift/files/patch-src__Makefile.in
deleted file mode 100644
index 2dd1390e47a..00000000000
--- a/devel/hs-drift/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Makefile.in.orig 2008-02-10 15:41:19.000000000 +0100
-+++ ./src/Makefile.in 2012-05-13 11:54:07.000000000 +0200
-@@ -364,7 +364,7 @@
-
- # all: DrIFT
- DrIFT: $(DrIFT_SOURCES) $(nodist_DrIFT_SOURCES)
-- $(HC) $(HCFLAGS) -i. -i@srcdir@ -hidir . -odir . -o $@ --make @srcdir@/DrIFT.hs
-+ $(HC) $(HCFLAGS) -i. -i@srcdir@ -hidir . -odir . -o $@ --make @srcdir@/DrIFT.hs -package random
-
- #.hs.o:
- # $(HC) -O -i. -i@srcdir@ $(HCFLAGS) -hidir . -o $@ -c $<
diff --git a/devel/hs-drift/pkg-descr b/devel/hs-drift/pkg-descr
deleted file mode 100644
index 31bc63ae2aa..00000000000
--- a/devel/hs-drift/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-DrIFT is a type sensitive preprocessor for Haskell. It extracts type
-declarations and directives from modules. The directives cause rules to be
-fired on the parsed type declarations, generating new code which is then
-appended to the bottom of the input file. The rules are expressed as Haskell
-code, and it is intended that the user can add new rules as required.
-
-DrIFT automates instance derivation for classes that aren't supported by the
-standard compilers. In addition, instances can be produced in separate modules
-to that containing the type declaration. This allows instances to be derived
-for a type after the original module has been compiled. As a bonus, simple
-utility functions can also be produced from a type.
-
-WWW: http://repetae.net/john/computer/haskell/DrIFT/
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 0d8a1e9c514..10f6fce878b 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,13 +2,13 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Levenshtein and restricted Damerau-Levenshtein edit distances
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= random>=1.0
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 6d905aebe62..2fd3a612482 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,17 +1,17 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 3.4
-PORTREVISION= 5
+PORTVERSION= 4.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Either monad transformer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= MonadRandom mtl>=2.0 semigroupoids>=3 semigroups>=0.8.3.1 \
- transformers>=0.2
+USE_CABAL= exceptions>=0.5 free>=4.9 monad-control>=0.3.2 MonadRandom \
+ mtl>=2.0 semigroupoids>=4 semigroups>=0.8.3.1 \
+ transformers-base>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 9073f6d40af..b4f4f679250 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/either-3.4.tar.gz) = e2c71edae6e117b31cfe7156f36fb212576eeebf593733452a9883721fbacb16
-SIZE (cabal/either-3.4.tar.gz) = 5314
+SHA256 (cabal/either-4.3.0.1.tar.gz) = 2e60523cabe1190389ccec1e503be6b422543084bfa114bca80efffe101266c5
+SIZE (cabal/either-4.3.0.1.tar.gz) = 7420
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
new file mode 100644
index 00000000000..2563cc14ecf
--- /dev/null
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= enclosed-exceptions
+PORTVERSION= 1.0.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Catching all exceptions from within an enclosed computation
+
+LICENSE= MIT
+
+USE_CABAL= async>=2.0 lifted-base>=0.2 monad-control transformers-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
new file mode 100644
index 00000000000..e2eb5044773
--- /dev/null
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 90002c271fe779ffe054f4f65ad489beb27cc2866d9d9057e9e2c3b915c66fc9
+SIZE (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 3635
diff --git a/devel/hs-enclosed-exceptions/pkg-descr b/devel/hs-enclosed-exceptions/pkg-descr
new file mode 100644
index 00000000000..d08fe8f7c1e
--- /dev/null
+++ b/devel/hs-enclosed-exceptions/pkg-descr
@@ -0,0 +1,4 @@
+Catching all exceptions raised within an enclosed computation, while
+remaining responsive to (external) asynchronous exceptions.
+
+WWW: https://github.com/jcristovao/enclosed-exceptions
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index cd9d7c78b37..48af3ce17e0 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= enumerator
-PORTVERSION= 0.4.19
-PORTREVISION= 8
+PORTVERSION= 0.4.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Reliable, high-performance processing with left-fold enumerators
LICENSE= MIT
-USE_CABAL= text>=0.7 transformers>=0.2
+USE_CABAL= text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-enumerator/distinfo b/devel/hs-enumerator/distinfo
index ce5e9b1d0dc..c1f9e82e96b 100644
--- a/devel/hs-enumerator/distinfo
+++ b/devel/hs-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/enumerator-0.4.19.tar.gz) = afe8c08fb2a2f1c11c2d2c312416a8c31b949658738950a4377feeb54bf17dab
-SIZE (cabal/enumerator-0.4.19.tar.gz) = 53867
+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
new file mode 100644
index 00000000000..657f369324a
--- /dev/null
+++ b/devel/hs-equivalence/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= equivalence
+PORTVERSION= 0.2.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Maintaining an equivalence relation implemented as union-find using STT
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl STMonadTrans
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
new file mode 100644
index 00000000000..43736c030af
--- /dev/null
+++ b/devel/hs-equivalence/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/equivalence-0.2.5.tar.gz) = 03969a9a89bc90a4d282b33f37442060425229517c4c67fd2dd29e1cd04e9904
+SIZE (cabal/equivalence-0.2.5.tar.gz) = 8013
diff --git a/devel/hs-equivalence/pkg-descr b/devel/hs-equivalence/pkg-descr
new file mode 100644
index 00000000000..35c17b1f452
--- /dev/null
+++ b/devel/hs-equivalence/pkg-descr
@@ -0,0 +1,5 @@
+This is an implementation of Tarjan's Union-Find algorithm (Robert E.
+Tarjan. "Efficiency of a Good But Not Linear Set Union Algorithm", JACM
+22(2), 1975) in order to maintain an equivalence relation.
+
+WWW: https://bitbucket.org/paba/equivalence/
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index 1942442db4c..5ebbb2d0666 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 1.4.1
-PORTREVISION= 5
+PORTVERSION= 1.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simplified error-handling
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= either>=3.1 safe>=0.3.3 transformers>=0.2
+USE_CABAL= either>=3.1 safe>=0.3.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index d16e37569f9..2d963a2d5ee 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/errors-1.4.1.tar.gz) = 80b01229cf6dc9318e227ef6d501136903f744b6fe769c565400fa653277d7a2
-SIZE (cabal/errors-1.4.1.tar.gz) = 6910
+SHA256 (cabal/errors-1.4.7.tar.gz) = 8732ebeae477feeb5b669532bc6ffc985f7b115e13fe823bbc816b4e7d1be525
+SIZE (cabal/errors-1.4.7.tar.gz) = 7922
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
new file mode 100644
index 00000000000..e699a554eb5
--- /dev/null
+++ b/devel/hs-exceptions/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= exceptions
+PORTVERSION= 0.6.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Extensible optionally-pure exceptions
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl>=2.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
new file mode 100644
index 00000000000..6b64d996d48
--- /dev/null
+++ b/devel/hs-exceptions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/exceptions-0.6.1.tar.gz) = f56b3f97f5ad49c6e7efde386683ec52c8c4b853bbdda068690e913db52c5b26
+SIZE (cabal/exceptions-0.6.1.tar.gz) = 11392
diff --git a/devel/hs-exceptions/pkg-descr b/devel/hs-exceptions/pkg-descr
new file mode 100644
index 00000000000..46a031f7ade
--- /dev/null
+++ b/devel/hs-exceptions/pkg-descr
@@ -0,0 +1,3 @@
+Extensible optionally-pure exceptions.
+
+WWW: http://github.com/ekmett/exceptions/
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 4b17232aa35..8450a7f98bb 100644
--- a/devel/hs-extensible-exceptions/Makefile
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -2,13 +2,13 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Extensible exceptions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
CABAL_SETUP= Setup.hs
diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile
deleted file mode 100644
index 516d665b887..00000000000
--- a/devel/hs-failure/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= failure
-PORTVERSION= 0.2.0.1
-PORTREVISION= 8
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Simple type class for success/failure computations
-
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-failure/distinfo b/devel/hs-failure/distinfo
deleted file mode 100644
index 6d616b96b20..00000000000
--- a/devel/hs-failure/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/failure-0.2.0.1.tar.gz) = cd01e1d6f42396feb5262c7e4cc0aeb3ec73d5ec8dbaa5b96c8dc82e96166616
-SIZE (cabal/failure-0.2.0.1.tar.gz) = 1771
diff --git a/devel/hs-failure/pkg-descr b/devel/hs-failure/pkg-descr
deleted file mode 100644
index e207cc568ca..00000000000
--- a/devel/hs-failure/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A simple type class for success/failure computations.
-
-WWW: http://www.haskell.org/haskellwiki/Failure
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 1d25325e3c8..7d6e0cc49be 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 0.3.1
-PORTREVISION= 7
+PORTVERSION= 2.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast logging system
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder date-cache>=0.3 text unix-time
+USE_CABAL= auto-update blaze-builder text
.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 a2dd1255395..5e8025b5cf6 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fast-logger-0.3.1.tar.gz) = 7a0627c62211e4652f4c305d33a1b39cc2681d0fe72ae8c2866c39d0d41e566a
-SIZE (cabal/fast-logger-0.3.1.tar.gz) = 4606
+SHA256 (cabal/fast-logger-2.2.0.tar.gz) = 3973fbc26e028e5547c5c4405e006d8b8e4173ef244eae1ca4cdf1b78f2bec09
+SIZE (cabal/fast-logger-2.2.0.tar.gz) = 6205
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 6ad9d8d05d5..0699b97d5cb 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.4.2.4
-PORTREVISION= 9
+PORTVERSION= 5.5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Martin Erwig Functional Graph Library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 256c6c86a2e..f26e2d68263 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fgl-5.4.2.4.tar.gz) = ce98ccb83e2d271a7b3266426a0762a0e902252f07ec09b7bef50c67d0110266
-SIZE (cabal/fgl-5.4.2.4.tar.gz) = 36574
+SHA256 (cabal/fgl-5.5.0.1.tar.gz) = aa61664ba38db3e54124b702b1ee92a72a569c981b759e48cfb567078b038763
+SIZE (cabal/fgl-5.5.0.1.tar.gz) = 35963
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 8061e1615af..a952a7ab609 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.4.7
-PORTREVISION= 5
+PORTVERSION= 0.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Use Template Haskell to embed file contents directly
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index aa4fa73b58e..7f3d2f6fe01 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/file-embed-0.0.4.7.tar.gz) = 71cf7f79316511154d7c5b9910dcb701a68c342a3afc32a3f1c0ab991241c0c2
-SIZE (cabal/file-embed-0.0.4.7.tar.gz) = 3630
+SHA256 (cabal/file-embed-0.0.7.tar.gz) = 4f4489207dcfeb5eafd699e51442ad4e49f535323c95cebee4e8cce4c0714856
+SIZE (cabal/file-embed-0.0.7.tar.gz) = 4283
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index dbe00e996db..1d8c1d6a59a 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,13 +3,13 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Expressive file and directory manipulation for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl unix-compat
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index a0e29351ad2..1dfba6fbb09 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.0.1
-PORTREVISION= 5
+PORTVERSION= 0.6.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interface for versioning file stores
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= Diff>=0.2 parsec>=2 split>=0.1 utf8-string>=0.3 xml>=1.3
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 1d65d6e10e0..82ab6707690 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.6.0.1.tar.gz) = 6eabe0a7d5c8c95a3c827f92db80fe84a14c514f2a74dfca66cf4a56e30243d1
-SIZE (cabal/filestore-0.6.0.1.tar.gz) = 29807
+SHA256 (cabal/filestore-0.6.0.3.tar.gz) = 0006c8d3e43821ece6661336c9f9926e1db19808bdc976cf3adb858bd9d8150f
+SIZE (cabal/filestore-0.6.0.3.tar.gz) = 29910
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
deleted file mode 100644
index b2414782b51..00000000000
--- a/devel/hs-filesystem-conduit/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= filesystem-conduit
-PORTVERSION= 1.0.0
-PORTREVISION= 5
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Use system-filepath data types with conduits
-
-LICENSE= BSD
-
-USE_CABAL= conduit>=1.0 system-fileio>=0.3.3 system-filepath>=0.4.3 \
- text>=0.11 transformers>=0.2.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-filesystem-conduit/distinfo b/devel/hs-filesystem-conduit/distinfo
deleted file mode 100644
index a28be43136f..00000000000
--- a/devel/hs-filesystem-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/filesystem-conduit-1.0.0.tar.gz) = db4448dfec7b8cc1c74a7a3164712949fd3b3745af61b9f5a8e65dcc608ce3bb
-SIZE (cabal/filesystem-conduit-1.0.0.tar.gz) = 3066
diff --git a/devel/hs-filesystem-conduit/pkg-descr b/devel/hs-filesystem-conduit/pkg-descr
deleted file mode 100644
index 38f1a13f1c6..00000000000
--- a/devel/hs-filesystem-conduit/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Provides ability to traverse a folder structure efficiently, as well as
-convenience wrappers for reading from and writing to files.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
new file mode 100644
index 00000000000..f0ccf2aa69b
--- /dev/null
+++ b/devel/hs-free/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= free
+PORTVERSION= 4.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Monads for free
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= bifunctors comonad distributive>=0.2.1 mtl>=2.0.1.0 \
+ prelude-extras>=0.4 profunctors semigroupoids \
+ semigroups>=0.8.3.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
new file mode 100644
index 00000000000..2c157b78691
--- /dev/null
+++ b/devel/hs-free/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/free-4.9.tar.gz) = dd3292f587e96cf5337aa7d46ca685bbeba34b6f1632555482f39298ba4aea06
+SIZE (cabal/free-4.9.tar.gz) = 43414
diff --git a/devel/hs-free/pkg-descr b/devel/hs-free/pkg-descr
new file mode 100644
index 00000000000..c7b56af0b03
--- /dev/null
+++ b/devel/hs-free/pkg-descr
@@ -0,0 +1,4 @@
+Free monads are useful for many tree-like structures and Domain-Specific
+Languages.
+
+WWW: http://github.com/ekmett/free/
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 10f827596a7..91f507c94c5 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.0.11
-PORTREVISION= 4
+PORTVERSION= 0.1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cross-platform library for file system notifications
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= hinotify>=0.3.5 system-fileio>=0.3.8 system-filepath>=0.4.6 \
- text>=0.11.0
+USE_CABAL= async>=2.0.1 hinotify>=0.3.7 system-fileio>=0.3.8 \
+ system-filepath>=0.4.6 text>=0.11.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 48b0b29c260..05cdbe745c4 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fsnotify-0.0.11.tar.gz) = 987be41d188782fd8fe081263d6a7345c8bad6576848457a73ef7b666f08a90e
-SIZE (cabal/fsnotify-0.0.11.tar.gz) = 14530
+SHA256 (cabal/fsnotify-0.1.0.3.tar.gz) = 1f15cc1380d3feaf12f4d7fed23a2327e0927ac69e3f3ae539637e55c8f3d254
+SIZE (cabal/fsnotify-0.1.0.3.tar.gz) = 14116
diff --git a/devel/hs-fsnotify/pkg-descr b/devel/hs-fsnotify/pkg-descr
index 3a14903bcb5..55616f3cdca 100644
--- a/devel/hs-fsnotify/pkg-descr
+++ b/devel/hs-fsnotify/pkg-descr
@@ -1,5 +1,5 @@
Cross-platform library for file creation, modification, and deletion
-notification. This library builds upon existing libraries for platform-specific
-Window, Mac, and Linux filesystem event notification.
+notification. This library builds upon existing libraries for
+platform-specific Window, Mac, and Linux file system event notification.
WWW: http://hackage.haskell.org/package/fsnotify
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 1c79385033e..63c43d4bc44 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gconf
-PORTVERSION= 0.12.1.1
-PORTREVISION= 6
+PORTVERSION= 0.12.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GNOME configuration database system
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk2hs-buildtools
+USE_CABAL= glib>=0.12.5.0 gtk2hs-buildtools
USE_GNOME= gconf2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index fe57666833a..6e3486ac942 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gconf-0.12.1.1.tar.gz) = 7677eb8a6947ce3bd2b2c3c854f289dc3b59b77b66bac0f8a75be26d8fbfc4da
-SIZE (cabal/gconf-0.12.1.1.tar.gz) = 34104
+SHA256 (cabal/gconf-0.12.5.0.tar.gz) = 075b4cbd9797dcf555b24bc1f3310ebddabd60eb096b996a5104dda0afdbed34
+SIZE (cabal/gconf-0.12.5.0.tar.gz) = 34938
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 0a0d5f68440..2dcc5987efd 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.5.0
-PORTREVISION= 4
+PORTVERSION= 1.6.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generic programming library for generalised deriving
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 4182bdb600e..90e9abb1653 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/generic-deriving-1.5.0.tar.gz) = 1988bfac75714acb50b3e7cd84aef14d193486fa42e02eeaa659d57ff96470d4
-SIZE (cabal/generic-deriving-1.5.0.tar.gz) = 19220
+SHA256 (cabal/generic-deriving-1.6.3.tar.gz) = c738b1947aa2cc86a8baf68b7f0e73a10489738bb51cbb1636c3c1ab0af59211
+SIZE (cabal/generic-deriving-1.6.3.tar.gz) = 25268
diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate/Makefile
index 0bc1800efa8..2b6cfe4dcdc 100644
--- a/devel/hs-geniplate/Makefile
+++ b/devel/hs-geniplate/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= geniplate
-PORTVERSION= 0.6.0.3
-PORTREVISION= 5
+PORTVERSION= 0.6.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Use template Haskell to generate Uniplate-like functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/devel/hs-geniplate/distinfo b/devel/hs-geniplate/distinfo
index 1d3e94b05ee..ec4ecabef47 100644
--- a/devel/hs-geniplate/distinfo
+++ b/devel/hs-geniplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/geniplate-0.6.0.3.tar.gz) = 76eeb3356a3c588fd80b31fde44d4c8df97fd8f53f9262e57138d9f94eb9e3d8
-SIZE (cabal/geniplate-0.6.0.3.tar.gz) = 6824
+SHA256 (cabal/geniplate-0.6.0.4.tar.gz) = 40ec6e1296d54b1cb789a17fbddfc48d230f08bdc5bce2e1ddb5ad6f875e81eb
+SIZE (cabal/geniplate-0.6.0.4.tar.gz) = 6819
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index a1e81679f5d..136fb06e990 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.4.2.0
-PORTREVISION= 6
+PORTVERSION= 0.4.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library and tool for parsing .eventlog files from GHC
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=1.1
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 94e5b36aa0b..b10cacdac26 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-events-0.4.2.0.tar.gz) = 94ec7628b996b32a8e55060cd640997e0755a751d9cd36b8d22e125e5eca0908
-SIZE (cabal/ghc-events-0.4.2.0.tar.gz) = 69355
+SHA256 (cabal/ghc-events-0.4.3.0.tar.gz) = f94743d5b5ef86a347414bc2d87e66525173d580ae32a6228861a30b43311789
+SIZE (cabal/ghc-events-0.4.3.0.tar.gz) = 69875
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 13cb81edf0b..8105243450b 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= ghc-mtl
-PORTVERSION= 1.0.1.2
-PORTREVISION= 6
+PORTVERSION= 1.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Mtl-compatible version of the Ghc-Api monads and monad-transformers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= MonadCatchIO-mtl>=0.2.0.0 mtl
+USE_CABAL= exceptions>=0.6 extensible-exceptions mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index acc413bdbf5..9c319377b28 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-mtl-1.0.1.2.tar.gz) = 6acf35a5e0a806c56d8b87a67e84cfe46dba79a3338620f8197aef45b1f5a81a
-SIZE (cabal/ghc-mtl-1.0.1.2.tar.gz) = 2364
+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-mtl/pkg-descr b/devel/hs-ghc-mtl/pkg-descr
index 4c7b2bde0c4..78107337605 100644
--- a/devel/hs-ghc-mtl/pkg-descr
+++ b/devel/hs-ghc-mtl/pkg-descr
@@ -1,4 +1,4 @@
Provides an 'mtl' compatible version of the 'GhcT' monad-transformer
defined in the 'GHC-API' since version 6.10.1.
-WWW: http://darcsden.com/jcpetruzza/ghc-mtl
+WWW: http://hub.darcs.net/jcpetruzza/ghc-mtl
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 873068e30af..b39d799967a 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,13 +3,13 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Knowledge of GHC's installation directories
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index bb6f9213df7..e74c5504e00 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gio
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GIO
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12.0 mtl
+USE_CABAL= glib>=0.12.5.3 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index 30008c917c0..02f158eac3c 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gio-0.12.4.tar.gz) = 3efe74e15c2df03fcf390d37879e91f88dbd93257ae79900f88989f3cfc1fb5a
-SIZE (cabal/gio-0.12.4.tar.gz) = 77980
+SHA256 (cabal/gio-0.12.5.3.tar.gz) = 8cfbfe99d3c019d8f804717ebaefdbe6bccc95238b83e9ea0a1c8c0a548d3ad9
+SIZE (cabal/gio-0.12.5.3.tar.gz) = 79099
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 21552bb1841..f8bb74ee564 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 4.20130601
-PORTREVISION= 4
+PORTVERSION= 5.20140717
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,15 +10,17 @@ COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-USE_CABAL= bloomfilter dataenc dlist edit-distance extensible-exceptions \
- hslogger HTTP IfElse json MissingH MonadCatchIO-transformers \
- monad-control mtl>=2 network>=2.0 QuickCheck>=2.1 random \
- SafeSemaphore SHA text unix-compat utf8-string uuid
+USE_CABAL= MissingH hslogger utf8-string network>=2.0 mtl>=2 HTTP \
+ extensible-exceptions exceptions>=0.5 dataenc SHA json \
+ monad-control MonadCatchIO-transformers IfElse text \
+ QuickCheck>=2.1 bloomfilter edit-distance SafeSemaphore \
+ uuid random dlist unix-compat aeson data-default \
+ case-insensitive
USES= gmake perl5
USE_PERL5= build
-MAN1= git-annex.1 git-annex-shell.1
+MAN1PAGES= git-annex.1 git-annex-shell.1
BUILD_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
git:${PORTSDIR}/devel/git \
@@ -32,72 +33,80 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
-OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION TDFA
-OPTIONS_DEFAULT= S3 ASSISTANT
+FLAGS_DEFINE= S3 ASSISTANT INOTIFY WEBDAV WEBAPP WEBAPP_SECURE PAIRING \
+ XMPP DNS PRODUCTION TDFA FEED QUVI CRYPTOHASH EKG TAHOE
+FLAGS_DEFAULT= S3 ASSISTANT
S3_DESC= S3 support
+S3_FLAG_ENABLE= S3
+S3_FLAG_CABAL= hS3
+
ASSISTANT_DESC= 'assistant' and 'watch' commands
+ASSISTANT_FLAG_ENABLE= Assistant
+ASSISTANT_FLAG_CABAL= async stm>=2.3
+
INOTIFY_DESC= File system notifications support
+INOTIFY_FLAG_ENABLE= Inotify
+INOTIFY_FLAG_CABAL= kqueue
+
WEBAPP_DESC= Web application (requires assistant)
+WEBAPP_FLAG_DEPENDS= ASSISTANT
+WEBAPP_FLAG_ENABLE= Webapp
+WEBAPP_FLAG_CABAL= yesod yesod-static yesod-static yesod-form yesod-core \
+ case-insensitive http-types wai wai-logger warp \
+ blaze-builder crypto-api shakespeare clientsession \
+ data-default warp-tls path-pieces
+
+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
+
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
+
+CRYPTOHASH_DESC= cryptohash for checksumming
+CRYPTOHASH_FLAG_ENABLE= CryptoHash
+CRYPTOHASH_FLAG_CABAL= cryptohash>=0.10.0
+
+EKG_DESC= EKG for run-time monitoring
+EKG_FLAG_ENABLE= EKG
+EKG_FLAG_CABAL= ekg
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MS3}
-CONFIGURE_ARGS+= --flags="S3"
-USE_CABAL+= hS3
-.else
-CONFIGURE_ARGS+= --flags="-S3"
-.endif
-
-.if ${PORT_OPTIONS:MASSISTANT}
-CONFIGURE_ARGS+= --flags="Assistant"
-USE_CABAL+= async stm>=2.3
-.else
-CONFIGURE_ARGS+= --flags="-Assistant"
-.endif
-
-.if ${PORT_OPTIONS:MINOTIFY}
-CONFIGURE_ARGS+= --flags="Inotify"
-USE_CABAL+= kqueue
-.else
-CONFIGURE_ARGS+= --flags="-Inotify"
-.endif
-
-.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MASSISTANT}
-CONFIGURE_ARGS+= --flags="Webapp"
-USE_CABAL+= yesod yesod-static case-insensitive http-types \
- transformers wai wai-logger warp blaze-builder \
- blaze-html crypto-api hamlet clientsession \
- yesod-default>=1.1.0 data-default
-.else
-CONFIGURE_ARGS+= --flags="-Webapp"
-.endif
-
-.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MPAIRING}
-CONFIGURE_ARGS+= --flags="Pairing"
-USE_CABAL+= network-multicast network-info
-.else
-CONFIGURE_ARGS+= --flags="-Pairing"
-.endif
-
-# Disable all the other options
-CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus -WebDAV"
-
-.if ${PORT_OPTIONS:MPRODUCTION}
-CONFIGURE_ARGS+= --flags="Production"
-.else
-CONFIGURE_ARGS+= --flags="-Production"
-.endif
-
-.if ${PORT_OPTIONS:MTDFA}
-CONFIGURE_ARGS+= --flags="TDFA"
-USE_CABAL+= regex-tdfa
-.else
-CONFIGURE_ARGS+= --flags="-TDFA"
-.endif
+TAHOE_DESC= Enable the tahoe special remote
+TAHOE_FLAG_ENABLE= Tahoe
+TAHOE_FLAG_CABAL= aeson
.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 7e93e176970..ab6ca678c4f 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-4.20130601.tar.gz) = 96228918c356bc3e23693fd0c48e2557c68d97c769a7e76082851b91535cd250
-SIZE (cabal/git-annex-4.20130601.tar.gz) = 3332000
+SHA256 (cabal/git-annex-5.20140717.tar.gz) = 746570ffafc92b3acd19bef84ffea6ee126cf2b043e8adc7f3b61b57d0c52fa5
+SIZE (cabal/git-annex-5.20140717.tar.gz) = 4390361
diff --git a/devel/hs-git-annex/files/patch-Build__Configure.hs b/devel/hs-git-annex/files/patch-Build__Configure.hs
new file mode 100644
index 00000000000..ea06e561b74
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Build__Configure.hs
@@ -0,0 +1,11 @@
+--- ./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 @@
+ else search cmds
+
+ shacmds n = concatMap (\x -> [x, 'g':x]) $
+- map (\x -> "sha" ++ show n ++ x) ["sum", ""]
++ map (\x -> "gsha" ++ show n ++ x) ["sum", ""]
+
+ tmpDir :: String
+ tmpDir = "tmp"
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
index 8dfb7d3275f..5a5352bc2d4 100644
--- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
+++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
@@ -1,20 +1,30 @@
---- ./Build/DesktopFile.hs.orig 2013-05-03 05:20:19.000000000 +0200
-+++ ./Build/DesktopFile.hs 2013-05-09 22:23:06.000000000 +0200
-@@ -42,11 +42,15 @@
+--- ./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 @@
+ #ifndef mingw32_HOST_OS
+ import System.Posix.User
+ #endif
++import System.FilePath.Posix
+ import Data.Maybe
- writeFDODesktop :: FilePath -> IO ()
+ systemwideInstall :: IO Bool
+@@ -48,12 +49,17 @@
writeFDODesktop command = do
-- datadir <- ifM systemwideInstall ( return systemDataDir, userDataDir )
+ systemwide <- systemwideInstall
+
+- datadir <- if systemwide then return systemDataDir else userDataDir
+ prefix <- catchMaybeIO (getEnv "PREFIX")
+ let (sddir,scdir) = case prefix of
-+ Just p -> (p </> "share", p </> "etc/xdg")
-+ Nothing -> (systemDataDir, systemConfigDir)
-+ datadir <- ifM systemwideInstall ( return sddir, userDataDir )
- installMenu command
- =<< inDestDir (desktopMenuFilePath "git-annex" datadir)
++ Just p -> (p </> "share", p </> "etc/xdg")
++ Nothing -> (systemDataDir, systemConfigDir)
++
++ datadir <- if systemwide then return sddir else userDataDir
+ menufile <- inDestDir (desktopMenuFilePath "git-annex" datadir)
+ icondir <- inDestDir (iconDir datadir)
+ installMenu command menufile "doc" icondir
-- configdir <- ifM systemwideInstall ( return systemConfigDir, userConfigDir )
-+ configdir <- ifM systemwideInstall ( return scdir, userConfigDir )
+- configdir <- if systemwide then return systemConfigDir else userConfigDir
++ configdir <- if systemwide then return scdir else userConfigDir
installAutoStart command
=<< inDestDir (autoStartPath "git-annex" configdir)
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index 7f82bdb2d34..e08c40a737d 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,5 +1,5 @@
---- Setup.hs.orig 2013-08-27 21:23:35.000000000 +0100
-+++ Setup.hs 2013-12-08 17:28:34.656382191 +0000
+--- ./Setup.hs.orig 2014-01-22 21:23:18.000000000 +0100
++++ ./Setup.hs 2014-07-10 21:52:00.000000000 +0200
@@ -19,6 +19,7 @@
main = defaultMainWithHooks simpleUserHooks
{ preConf = configure
@@ -33,3 +33,9 @@
srcManpages = zip (repeat srcManDir)
<$> filterM doesFileExist manpages
srcManDir = ""
+@@ -60,4 +70,4 @@
+ installDesktopFile copyDest verbosity pkg lbi =
+ DesktopFile.install $ dstBinDir </> "git-annex"
+ where
+- dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
++ dstBinDir = bindir $ absoluteInstallDirs pkg lbi NoCopyDest
diff --git a/devel/hs-git-annex/files/patch-Utility__Yesod.hs b/devel/hs-git-annex/files/patch-Utility__Yesod.hs
new file mode 100644
index 00000000000..2dd51c659a7
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Utility__Yesod.hs
@@ -0,0 +1,20 @@
+--- ./Utility/Yesod.hs.orig 2013-07-09 22:04:16.000000000 +0200
++++ ./Utility/Yesod.hs 2013-07-16 12:02:57.000000000 +0200
+@@ -31,7 +31,7 @@
+ #ifndef __ANDROID__
+ import Yesod.Default.Util
+ import Language.Haskell.TH.Syntax (Q, Exp)
+-#if MIN_VERSION_yesod_default(1,1,0)
++#if MIN_VERSION_yesod(1,2,0)
+ import Data.Default (def)
+ import Text.Hamlet hiding (Html)
+ #endif
+@@ -39,7 +39,7 @@
+
+ #ifndef __ANDROID__
+ widgetFile :: String -> Q Exp
+-#if ! MIN_VERSION_yesod_default(1,1,0)
++#if ! MIN_VERSION_yesod(1,2,0)
+ widgetFile = widgetFileNoReload
+ #else
+ widgetFile = widgetFileNoReload $ def
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
new file mode 100644
index 00000000000..ec18d885ef7
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -0,0 +1,16 @@
+--- ./git-annex.cabal.orig 2014-07-17 17:53:21.000000000 +0200
++++ ./git-annex.cabal 2014-07-28 19:40:41.000000000 +0200
+@@ -187,10 +187,11 @@
+ CPP-Options: -DANDROID_SPLICES
+
+ if flag(Webapp)
++ extensions: TemplateHaskell
+ Build-Depends:
+- yesod, yesod-default, yesod-static, yesod-form, yesod-core,
++ yesod (>= 1.2), yesod-static, yesod-form, yesod-core,
+ http-types, transformers, wai, wai-extra, warp, warp-tls,
+- blaze-builder, crypto-api, hamlet, clientsession,
++ blaze-builder, crypto-api, clientsession,
+ template-haskell, data-default, aeson, path-pieces,
+ shakespeare
+ CPP-Options: -DWITH_WEBAPP
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
index 44bf29b07db..3e52b062370 100644
--- a/devel/hs-git-annex/pkg-plist
+++ b/devel/hs-git-annex/pkg-plist
@@ -1,4 +1,12 @@
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
@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
index 73d49ce3d8a..c68508aedea 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= glade
-PORTVERSION= 0.12.1
-PORTREVISION= 10
+PORTVERSION= 0.12.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the glade library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk>=0.12
+USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0
USE_GNOME= libglade2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-glade/distinfo b/devel/hs-glade/distinfo
index 52b9a11f07e..ca737bc048e 100644
--- a/devel/hs-glade/distinfo
+++ b/devel/hs-glade/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/glade-0.12.1.tar.gz) = 2025c44fbaada6463a99e3c5b39bdc8c9b846b59fe04194ec5dffd65be6c8f84
-SIZE (cabal/glade-0.12.1.tar.gz) = 153938
+SHA256 (cabal/glade-0.12.5.0.tar.gz) = 79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435
+SIZE (cabal/glade-0.12.5.0.tar.gz) = 152942
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index ea438dfb03e..08329044a87 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GLIB library for Gtk2Hs
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools
+USE_CABAL= utf8-string>=0.2 gtk2hs-buildtools
USE_GNOME= glib20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 4907f52b0ba..004653def22 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/glib-0.12.4.tar.gz) = 5d9df40d0891ec45cd4b96485ae00815a57563dcf4167f18fef2d11e3cbc2269
-SIZE (cabal/glib-0.12.4.tar.gz) = 45391
+SHA256 (cabal/glib-0.12.5.4.tar.gz) = e63346df27cb45aa7c76bfffe5ba81bb5332b48bde4ccbe931183e5d357378c9
+SIZE (cabal/glib-0.12.5.4.tar.gz) = 46080
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index bd9f9ade6e8..b13c1002626 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Tools to build the Gtk2Hs suite of User Interface Libraries
LICENSE= GPLv2
-USE_CABAL= random
+USE_CABAL= hashtables random
USE_ALEX= yes
USE_HAPPY= yes
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 470daee5a72..6a0c90a018b 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk2hs-buildtools-0.12.4.tar.gz) = 5fe05fee08484ee9a8515b04536426fe263c830094c548534304971e2ffa0576
-SIZE (cabal/gtk2hs-buildtools-0.12.4.tar.gz) = 212505
+SHA256 (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 3c7a0c106acaad01b9816c13755687c650bbcdaa1112da43eb89461c277795f0
+SIZE (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 169072
diff --git a/devel/hs-gtk2hs-buildtools/pkg-descr b/devel/hs-gtk2hs-buildtools/pkg-descr
index 0b409f26bed..a58060b5398 100644
--- a/devel/hs-gtk2hs-buildtools/pkg-descr
+++ b/devel/hs-gtk2hs-buildtools/pkg-descr
@@ -1,8 +1,8 @@
-This package provides a set of helper programs necessary to build the Gtk2Hs
-suite of libraries. These tools include a modified c2hs binding tool that
-is used to generated FFI declarations, a tool to build a type hiearchy that
-mirrors the C type hiearchy of GObjects found in glib, and a generator for
-signal declarations that are used to call back from C to Haskell. These tools
-are not needed to actually run Gtk2Hs programs.
+This package provides a set of helper programs necessary to build the
+Gtk2Hs suite of libraries. These tools include a modified c2hs binding
+tool that is used to generated FFI declarations, a tool to build a type
+hiearchy that mirrors the C type hiearchy of GObjects found in glib, and
+a generator for signal declarations that are used to call back from C to
+Haskell. These tools are not needed to actually run Gtk2Hs programs.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 6b405af332a..509b9dff477 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.13.2
-PORTREVISION= 4
+PORTVERSION= 2.14.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Documentation-generation tool for Haskell libraries
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= ghc-paths xhtml>=3000.2
+USE_CABAL= ghc-paths
USE_ALEX= true
USE_HAPPY= true
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index f74d8b06375..3d28abb0fb9 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.13.2.tar.gz) = 25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3
-SIZE (cabal/haddock-2.13.2.tar.gz) = 174973
+SHA256 (cabal/haddock-2.14.2.tar.gz) = 33df230cd8baeed87caa31fc13257a921778b6b700c78bd9237024e08d942641
+SIZE (cabal/haddock-2.14.2.tar.gz) = 230365
diff --git a/devel/hs-haddock/files/patch-src__Haddock__Convert.hs b/devel/hs-haddock/files/patch-src__Haddock__Convert.hs
new file mode 100644
index 00000000000..860c2384bec
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src__Haddock__Convert.hs
@@ -0,0 +1,15 @@
+--- ./src/Haddock/Convert.hs.orig 2014-04-02 23:25:15.000000000 +0200
++++ ./src/Haddock/Convert.hs 2014-07-14 06:39:49.000000000 +0200
+@@ -94,10 +94,10 @@
+ (synifyType ImplicitizeForAll (dataConUserType dc)))
+
+ AConLike (PatSynCon ps) ->
+- let (_, _, (req_theta, prov_theta)) = patSynSig ps
++ let (_, _, req_theta, prov_theta,_, res_ty) = patSynSig ps
+ in SigD $ PatSynSig (synifyName ps)
+ (fmap (synifyType WithinType) (patSynTyDetails ps))
+- (synifyType WithinType (patSynType ps))
++ (synifyType WithinType res_ty)
+ (synifyCtx req_theta)
+ (synifyCtx prov_theta)
+
diff --git a/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs b/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs
new file mode 100644
index 00000000000..919d0d5271a
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src__Haddock__Interface__Create.hs
@@ -0,0 +1,20 @@
+--- ./src/Haddock/Interface/Create.hs.orig 2014-04-02 23:25:15.000000000 +0200
++++ ./src/Haddock/Interface/Create.hs 2014-07-14 06:40:22.000000000 +0200
+@@ -364,7 +364,7 @@
+ where
+ decls = docs ++ defs ++ sigs ++ ats
+ docs = mkDecls tcdDocs DocD class_
+- defs = mkDecls (map snd . bagToList . tcdMeths) ValD class_
++ defs = mkDecls (bagToList . tcdMeths) ValD class_
+ sigs = mkDecls tcdSigs SigD class_
+ ats = mkDecls tcdATs (TyClD . FamDecl) class_
+
+@@ -390,7 +390,7 @@
+ mkDecls hs_docs DocD group_ ++
+ mkDecls hs_instds InstD group_ ++
+ mkDecls (typesigs . hs_valds) SigD group_ ++
+- mkDecls (map snd . valbinds . hs_valds) ValD group_
++ mkDecls (valbinds . hs_valds) ValD group_
+ where
+ typesigs (ValBindsOut _ sigs) = filter isVanillaLSig sigs
+ typesigs _ = error "expected ValBindsOut"
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 6a5272aad64..44a64c503c1 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= happy
-PORTVERSION= 1.18.10
-PORTREVISION= 6
+PORTVERSION= 1.19.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Happy is a parser generator for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=1.0
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index fefe11034ae..d8bed0a2932 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happy-1.18.10.tar.gz) = c1c920f77906740252e261e2baec5b7519e584344d6080aa5a9cc0b677b9064b
-SIZE (cabal/happy-1.18.10.tar.gz) = 159994
+SHA256 (cabal/happy-1.19.4.tar.gz) = 6be499f66c61f8c48cbbbcb70515eb8e62c2bfa08adcc8c9474e7ae343a6936d
+SIZE (cabal/happy-1.19.4.tar.gz) = 160497
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 0c0203a33ed..ffda59724c8 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,17 +1,28 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.1.2.5
-PORTREVISION= 4
+PORTVERSION= 1.2.2.0
PORTEPOCH= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Class for types that can be converted to a hash value
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.0.5
+FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41
+FLAGS_DEFAULT= INTEGER_GMP SSE2
+
+INTEGER_GMP_DESC= Use integer-gmp for fast Integer instances
+INTEGER_GMP_FLAG_ENABLE= integer-gmp
+
+SSE2_DESC= Support for SSE 2
+SSE2_FLAG_ENABLE= sse2
+
+SSE41_DESC= Support for SSE 4.1
+SSE41_FLAG_ENABLE= sse41
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 5a166ac6bda..734f99f3e5c 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.1.2.5.tar.gz) = 3fb5d430c9289ebada4991a76fd78f028aaaf17957dc666ddc7b89c98a54713d
-SIZE (cabal/hashable-1.1.2.5.tar.gz) = 9129
+SHA256 (cabal/hashable-1.2.2.0.tar.gz) = 033a90b0369af59bf922d0c2af8d73a18432b46b0a47607f436d38f873a88e21
+SIZE (cabal/hashable-1.2.2.0.tar.gz) = 23456
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index c8737aaf823..39dbea7bfa1 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= hashed-storage
-PORTVERSION= 0.5.10
-PORTREVISION= 6
+PORTVERSION= 0.5.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Hashed file storage support code
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= dataenc extensible-exceptions mmap>=0.5 mtl zlib
-CONFIGURE_ARGS+= --flags="-test"
+FLAGS_DISABLE= test
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 29d35a601b0..80c49d2722d 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashed-storage-0.5.10.tar.gz) = 05824a4cedd2be03444fd0bc664f5c94f6edc50005f1a8f99657150fa6cdedcc
-SIZE (cabal/hashed-storage-0.5.10.tar.gz) = 57658
+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 d39cf68b578..5da4a28464f 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.1.0.2
-PORTREVISION= 5
+PORTVERSION= 1.1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Mutable hash tables in the ST monad
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1 primitive vector>=0.7
+USE_CABAL= hashable primitive vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index 91bd54a6231..8921c6fa0c5 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashtables-1.1.0.2.tar.gz) = e92edb65f776e06e1ae52f16d2452a377c4af231d7990a9f7f109990371b2034
-SIZE (cabal/hashtables-1.1.0.2.tar.gz) = 48598
+SHA256 (cabal/hashtables-1.1.2.1.tar.gz) = c50d910fea2e81eca53d9a2dfbc925246be5b7cc2d0854c6d9e95eaab05ac684
+SIZE (cabal/hashtables-1.1.2.1.tar.gz) = 48553
diff --git a/devel/hs-hashtables/pkg-descr b/devel/hs-hashtables/pkg-descr
index 25312ea14af..ebc1f151225 100644
--- a/devel/hs-hashtables/pkg-descr
+++ b/devel/hs-hashtables/pkg-descr
@@ -1,5 +1,6 @@
-This package provides a couple of different implementations of mutable hash tables
-in the ST monad, as well as a type class abstracting their common operations, and
-a set of wrappers to use the hash tables in the IO monad.
+This package provides a couple of different implementations of mutable
+hash tables in the ST monad, as well as a type class abstracting their
+common operations, and a set of wrappers to use the hash tables in the
+IO monad.
WWW: http://github.com/gregorycollins/hashtables
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
deleted file mode 100644
index 82c9803ee6b..00000000000
--- a/devel/hs-haskeline/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= haskeline
-PORTVERSION= 0.7.0.3
-PORTREVISION= 5
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Command-line interface for user input, written in Haskell
-
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.2
-USES+= iconv
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-haskeline/distinfo b/devel/hs-haskeline/distinfo
deleted file mode 100644
index 4a3df6b79a1..00000000000
--- a/devel/hs-haskeline/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/haskeline-0.7.0.3.tar.gz) = 4f23c5dc8b4e9f5ed67b966300ba4322467db25bf26d74e2418fccd69210ac83
-SIZE (cabal/haskeline-0.7.0.3.tar.gz) = 67803
diff --git a/devel/hs-haskeline/pkg-descr b/devel/hs-haskeline/pkg-descr
deleted file mode 100644
index ee03e3397bb..00000000000
--- a/devel/hs-haskeline/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Haskeline provides a user interface for line input in command-line programs.
-This library is similar in purpose to readline, but since it is written in
-Haskell it is (hopefully) more easily used in other Haskell programs.
-Haskeline runs both on POSIX-compatible systems and on Windows.
-
-WWW: http://trac.haskell.org/haskeline
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index 7385083c593..40800de13c2 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -1,53 +1,58 @@
# $FreeBSD$
PORTNAME= haskell-platform
-PORTVERSION= 2013.2.0.0
+PORTVERSION= 2014.2.0.0
# Please note that the port *strictly depends* on certain versions of other
# ports, so revisit the USE_CABAL line on bumping the portrevision. Thanks!
-PORTREVISION= 4
+PORTREVISION= 0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The Haskell Platform
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
METAPORT= yes
-USE_CABAL= async==2.0.1.4_4 \
- attoparsec==0.10.4.0_5 \
- cgi==3001.1.7.5_4,1 \
- fgl==5.4.2.4_9 \
- GLUT==2.4.0.0_5,1 \
- GLURaw==1.3.0.0_4 \
- haskell-src==1.0.1.5_8 \
- hashable==1.1.2.5_4,1 \
- html==1.0.1.2_11 \
- HTTP==4000.2.8_4 \
- HUnit==1.2.5.2_4 \
- mtl==2.1.2_6 \
- network==2.4.1.2_4 \
- OpenGL==2.8.0.0_4,1 \
- OpenGLRaw==1.3.0.0_5 \
- parallel==3.2.0.3_6 \
- parsec==3.1.3_6 \
- primitive==0.5.0.1_6 \
- QuickCheck==2.6_4 \
- random==1.0.1.1_8 \
- regex-base==0.93.2_11 \
- regex-compat==0.95.1_9 \
- regex-posix==0.95.2_6 \
- split==0.2.2_4 \
- stm==2.4.2_4 \
- syb==0.4.0_4 \
- text==0.11.3.1_4 \
- transformers==0.3.0.0_8 \
- vector==0.10.0.1_6 \
- xhtml==3000.2.1_8 \
- zlib==0.5.4.1_4 \
- cabal-install==1.16.0.2_4 \
- alex==3.0.5_4 \
- happy==1.18.10_6
+USE_CABAL= async==2.0.1.5 \
+ attoparsec==0.10.4.0_6 \
+ case-insensitive==1.1.0.3 \
+ fgl==5.5.0.1 \
+ GLUT==2.5.1.1,1 \
+ GLURaw==1.4.0.1 \
+ haskell-src==1.0.1.6 \
+ hashable==1.2.2.0,1 \
+ html==1.0.1.2_12 \
+ HTTP==4000.2.10 \
+ HUnit==1.2.5.2_5 \
+ mtl==2.1.3.1 \
+ network==2.4.2.3 \
+ OpenGL==2.9.2.0,1 \
+ OpenGLRaw==1.5.0.0 \
+ parallel==3.2.0.4 \
+ parsec==3.1.5 \
+ primitive==0.5.2.1 \
+ QuickCheck==2.6_5 \
+ random==1.0.1.1_9 \
+ regex-base==0.93.2_12 \
+ regex-compat==0.95.1_10 \
+ regex-posix==0.95.2_7 \
+ split==0.2.2_5 \
+ stm==2.4.2_5 \
+ syb==0.4.1 \
+ text==1.1.0.0 \
+ unordered-containers==0.2.4.0 \
+ vector==0.10.9.1 \
+ zlib==0.5.4.1_5 \
+ cabal-install==1.18.0.5 \
+ alex==3.1.3 \
+ happy==1.19.4 \
+ hscolour==1.20.3_7,1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${GHC_VERSION} != 7.8.3
+IGNORE= will not work: GHC ${GHC_VERSION} is not supported
+.endif
+
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 57f39988997..da3c0f65850 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.13.5
-PORTREVISION= 6
+PORTVERSION= 1.15.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Manipulating Haskell source
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cpphs>=1.3
USE_HAPPY= yes
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index 8b3e968c80d..53c47d63c43 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-exts-1.13.5.tar.gz) = 7c5adc74bc76b26a2ba7de6927877c6ed930c64039371c0c84c5257aae837f0d
-SIZE (cabal/haskell-src-exts-1.13.5.tar.gz) = 291329
+SHA256 (cabal/haskell-src-exts-1.15.0.1.tar.gz) = 85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576
+SIZE (cabal/haskell-src-exts-1.15.0.1.tar.gz) = 1605910
diff --git a/devel/hs-haskell-src-exts/pkg-descr b/devel/hs-haskell-src-exts/pkg-descr
index 033d20510a5..f591d63b87e 100644
--- a/devel/hs-haskell-src-exts/pkg-descr
+++ b/devel/hs-haskell-src-exts/pkg-descr
@@ -13,4 +13,4 @@ and a few more. All extensions implemented in GHC are supported.
Apart from these standard extensions, it also handles regular patterns as
per the HaRP extension as well as HSX-style embedded XML syntax.
-WWW: http://code.haskell.org/haskell-src-exts/
+WWW: https://github.com/haskell-suite/haskell-src-exts
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 10998ecdeda..0b3797fa41a 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= haskell-src
-PORTVERSION= 1.0.1.5
-PORTREVISION= 8
+PORTVERSION= 1.0.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for manipulating Haskell source code
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_HAPPY= yes
USE_CABAL= syb
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 813e37a8919..27d292c4338 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-1.0.1.5.tar.gz) = 9f3726902247cc955d085997254bb58c16cc337ee83de5ccfb17dcbcb488c3ab
-SIZE (cabal/haskell-src-1.0.1.5.tar.gz) = 51827
+SHA256 (cabal/haskell-src-1.0.1.6.tar.gz) = c7c556366025d9895d1110ecfa30a29e29d7d0a8cb447716fe601e4ff5da4cef
+SIZE (cabal/haskell-src-1.0.1.6.tar.gz) = 52967
diff --git a/devel/hs-haskell-src/pkg-descr b/devel/hs-haskell-src/pkg-descr
index 02c68f4750b..6c8e2a9c5c5 100644
--- a/devel/hs-haskell-src/pkg-descr
+++ b/devel/hs-haskell-src/pkg-descr
@@ -1,6 +1,6 @@
-The 'haskell-src' package provides support for manipulating Haskell
-source code. The package provides a lexer, parser and pretty-printer,
-and a definition of a Haskell abstract syntax tree (AST). Common uses
-of this package are to parse or generate Haskell 98 code.
+The haskell-src package provides support for manipulating Haskell source
+code. The package provides a lexer, parser and pretty-printer, and a
+definition of a Haskell abstract syntax tree (AST). Common uses of this
+package are to parse or generate Haskell 98 code.
WWW: http://hackage.haskell.org/package/haskell-src
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 2f1488d1509..cc0cd834b3b 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= hasktags
-PORTVERSION= 0.68.2
-PORTREVISION= 5
+PORTVERSION= 0.69.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Produces ctags "tags" and etags "TAGS" files for Haskell programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= json>=0.5 utf8-string
EXECUTABLE= hasktags
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index bfa8200033c..7acaf6d87f0 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hasktags-0.68.2.tar.gz) = 5a5f5fcd1d0a47fd3f930a306f0ee43e8401e47af2f263079f5ac18ae4466251
-SIZE (cabal/hasktags-0.68.2.tar.gz) = 9542
+SHA256 (cabal/hasktags-0.69.0.tar.gz) = 08e200e30929e4a950307e61464db40d47a83debb4b19410cbaea8020b376aad
+SIZE (cabal/hasktags-0.69.0.tar.gz) = 55885
diff --git a/devel/hs-hasktags/pkg-descr b/devel/hs-hasktags/pkg-descr
index bce99cc24f2..297bd55c5ff 100644
--- a/devel/hs-hasktags/pkg-descr
+++ b/devel/hs-hasktags/pkg-descr
@@ -1,3 +1,3 @@
Produces ctags "tags" and etags "TAGS" files for Haskell programs.
-WWW: http://hackage.haskell.org/package/hasktags
+WWW: http://github.com/MarcWeber/hasktags
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index 597c46ad039..d6b9b218eb7 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= hastache
-PORTVERSION= 0.5.0
-PORTREVISION= 5
+PORTVERSION= 0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell implementation of Mustache templates
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder ieee754 mtl syb text transformers utf8-string
+USE_CABAL= blaze-builder ieee754 mtl syb text utf8-string
INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR}
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 563fcafcb3c..7a3ef324cb7 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hastache-0.5.0.tar.gz) = c8fa5525433bbed0f684da356429589c672fee861132ec9a2bb4747c38bc37b0
-SIZE (cabal/hastache-0.5.0.tar.gz) = 12670
+SHA256 (cabal/hastache-0.6.0.tar.gz) = b033a0dd3a38e0ef0772562bb1d5ed8f535c2fa6955633875ae520a6614dc0fc
+SIZE (cabal/hastache-0.6.0.tar.gz) = 13195
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 1dc6a6fbc78..f2bcbd08d48 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.5
-PORTREVISION= 6
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell binding to inotify
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index 69880f0354a..d53c2ea68fc 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hinotify-0.3.5.tar.gz) = 14c42e1fe3b7cef1bf5a545615c33b20ce7c6affe8474824faeb0d2e38deff02
-SIZE (cabal/hinotify-0.3.5.tar.gz) = 11030
+SHA256 (cabal/hinotify-0.3.7.tar.gz) = 0b702d104f35ca925c748deb9e2a1faaaf6b7b517e48a39a8c8f7d1ad3ebf544
+SIZE (cabal/hinotify-0.3.7.tar.gz) = 6760
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 22f44e9673e..796506dfa50 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,21 +2,23 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.3.3.6
-PORTREVISION= 5
+PORTVERSION= 0.4.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Runtime Haskell interpreter (GHC API wrapper)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= ghc-mtl>=1.0.1.0 ghc-paths haskell-src MonadCatchIO-mtl>=0.3 \
+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}/Changes \
+INSTALL_PORTDATA= ${INSTALL_DATA} \
+ ${WRKSRC}/AUTHORS \
+ ${WRKSRC}/README \
+ ${WRKSRC}/CHANGELOG.markdown \
${STAGEDIR}${DATADIR}
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 834a37403a2..50473e463e5 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hint-0.3.3.6.tar.gz) = 5631b14854d80e8772b0da8b1a07fb7e9cb9df5da425282cb9e9d19474b31c20
-SIZE (cabal/hint-0.3.3.6.tar.gz) = 28600
+SHA256 (cabal/hint-0.4.2.0.tar.gz) = add643926ef91cb886968cb36efb92621bbe6d7e4d570906ebecf8ecfd4f9821
+SIZE (cabal/hint-0.4.2.0.tar.gz) = 29449
diff --git a/devel/hs-hint/pkg-descr b/devel/hs-hint/pkg-descr
index 32b30f834e0..50dc7bbe9ff 100644
--- a/devel/hs-hint/pkg-descr
+++ b/devel/hs-hint/pkg-descr
@@ -3,4 +3,4 @@ modules, browse them, type-check and evaluate strings with Haskell
expressions and even coerce them into values. The library is thread-safe
and type-safe (even the coercion of expressions to values).
-WWW: http://darcsden.com/jcpetruzza/hint
+WWW: http://hub.darcs.net/jcpetruzza/hint
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 833f737c34b..917aa741176 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,13 +2,13 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= FFI interface to libev
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= network
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index 245b78899e4..da22e7f0a55 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.8.45
-PORTREVISION= 4
+PORTVERSION= 1.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Source code suggestions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cpphs>=1.11 haskell-src-exts>=1.11 hscolour>=1.17 \
- transformers>=0.0 uniplate>=1.5
+USE_CABAL= cmdargs>=0.10 cpphs>=1.18.1 haskell-src-exts>=1.14 \
+ hscolour>=1.17 uniplate>=1.5
EXECUTABLE= hlint
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index a03691a115e..f0331999dee 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.8.45.tar.gz) = e9e7062347c6a8173fc26dcd3454c977262145b6b01a35c12fbfeb56e53a4792
-SIZE (cabal/hlint-1.8.45.tar.gz) = 68579
+SHA256 (cabal/hlint-1.9.3.tar.gz) = 2b017bc6bcf02ef2dfb0439f734b57d92bd02656a0438313d75501ec034abfe9
+SIZE (cabal/hlint-1.9.3.tar.gz) = 86068
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 4b8e2d9637c..423cc3cb58f 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,19 +2,19 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.16
-PORTREVISION= 5
+PORTVERSION= 4.2.34
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell API Search
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 case-insensitive>=0.2 cmdargs>=0.7 \
- conduit>=0.2 haskell-src-exts>=1.12 http-types>=0.7 \
- parsec>=2.1 random safe tagsoup>=0.11 transformers>=0.2 \
- uniplate>=1.6 wai>=1.1 warp>=1.1
+USE_CABAL= aeson>=0.6.1 blaze-builder>=0.2 case-insensitive>=0.2 \
+ cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.14 \
+ http-types>=0.7 parsec>=2.1 QuickCheck random resourcet \
+ safe shake>=0.11 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
+ vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=1.1
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index d39112a891c..310494b7a06 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.16.tar.gz) = 0a39ec2557928866fce8dd79edc51fae529b4586aef7dd49956ae66621e655c1
-SIZE (cabal/hoogle-4.2.16.tar.gz) = 118748
+SHA256 (cabal/hoogle-4.2.34.tar.gz) = 4f960af1947a0a49e7288dd18029e0fd82c76976f4b76e6b97e0603bf4618d6e
+SIZE (cabal/hoogle-4.2.34.tar.gz) = 131854
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 9519eb3bf0d..ef449435a0b 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.1
-PORTREVISION= 6
+PORTVERSION= 1.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Versatile logging framework
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl network
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index 7b9d53dc311..a86565507bf 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslogger-1.2.1.tar.gz) = c5538c3f79b9e8aac97a6f1377c82b9f70b88ee5e39f62f358953467e271cded
-SIZE (cabal/hslogger-1.2.1.tar.gz) = 35813
+SHA256 (cabal/hslogger-1.2.4.tar.gz) = 8c0fa8051efb693e398eddeece3486dfdb5eb9357c4ea5cfeb9f26f2313f0c64
+SIZE (cabal/hslogger-1.2.4.tar.gz) = 35794
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
new file mode 100644
index 00000000000..48e297941fd
--- /dev/null
+++ b/devel/hs-hslua/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= hslua
+PORTVERSION= 0.3.13
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Lua language interpreter embedding in Haskell
+
+LICENSE= MIT
+
+USE_CABAL= mtl>=2.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
new file mode 100644
index 00000000000..f767b1adbd5
--- /dev/null
+++ b/devel/hs-hslua/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hslua-0.3.13.tar.gz) = e95774d21ac4378e799af4b8dce9068bfedd3109bf13b717d9ecb5817f86430a
+SIZE (cabal/hslua-0.3.13.tar.gz) = 128230
diff --git a/devel/hs-hslua/pkg-descr b/devel/hs-hslua/pkg-descr
new file mode 100644
index 00000000000..c4496cb8548
--- /dev/null
+++ b/devel/hs-hslua/pkg-descr
@@ -0,0 +1,4 @@
+The Scripting.Lua module is a wrapper of Lua language interpreter. This
+package contains full Lua interpreter version 5.1.4.
+
+WWW: http://hackage.haskell.org/package/hslua
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index a4b8317207e..0a626e444d0 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.3.2
-PORTREVISION= 4
+PORTVERSION= 0.6.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index ed4cb198468..f32a4a72dfe 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-expectations-0.3.2.tar.gz) = b11b2618749197a56c4ea3ea1d924a0de910d95fc92f560fe36032fc2ce5c224
-SIZE (cabal/hspec-expectations-0.3.2.tar.gz) = 3707
+SHA256 (cabal/hspec-expectations-0.6.0.1.tar.gz) = 941f27d0fa358889ac43496a49570a4baea93fcd59fdab03249e7eb34f1f0198
+SIZE (cabal/hspec-expectations-0.6.0.1.tar.gz) = 4212
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index a14eef9bb4e..5f6a9be8e6f 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.5.4
-PORTREVISION= 4
+PORTVERSION= 1.11.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Behavior-Driven Development for Haskell
-LICENSE= BSD
+LICENSE= MIT
-USE_CABAL= ansi-terminal>=0.5 hspec-expectations HUnit>=1.2.5 \
- QuickCheck>=2.5.1 quickcheck-io random setenv \
- transformers>=0.2.2.0
+USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.5.0 \
+ HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random \
+ setenv tf-random
EXECUTABLE= hspec-discover
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index db1676476ab..9c734f63255 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.5.4.tar.gz) = 8dce8de068eb84eec2bf72de37f6727a2dfddd85f2289d969e07038885ac87a1
-SIZE (cabal/hspec-1.5.4.tar.gz) = 30050
+SHA256 (cabal/hspec-1.11.0.tar.gz) = 4eff14713863b2b882d1e28eaf8fb8b6007c0bcd03d7c0c2023ff153b5a26ec2
+SIZE (cabal/hspec-1.11.0.tar.gz) = 32083
diff --git a/devel/hs-hspec/pkg-descr b/devel/hs-hspec/pkg-descr
index b609ae0a967..d0dedf68e90 100644
--- a/devel/hs-hspec/pkg-descr
+++ b/devel/hs-hspec/pkg-descr
@@ -3,4 +3,4 @@ Ruby library RSpec. However, Hspec is just a framework for running
HUnit and QuickCheck tests. Compared to other options, it provides a
much nicer syntax that makes tests very easy to read.
-WWW: http://hspec.github.com/
+WWW: http://hspec.github.io/
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
new file mode 100644
index 00000000000..0ad8113fb04
--- /dev/null
+++ b/devel/hs-keys/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= keys
+PORTVERSION= 3.10.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Keyed functors and containers
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= comonad>=4 free>=4 semigroupoids>=4 semigroups>=0.8.3.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
new file mode 100644
index 00000000000..4ec78f7a844
--- /dev/null
+++ b/devel/hs-keys/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/keys-3.10.1.tar.gz) = 9644f4aeb3744cfe46c59712bb5396554eb06527ec67cdf563c116abdc5df400
+SIZE (cabal/keys-3.10.1.tar.gz) = 7702
diff --git a/devel/hs-keys/pkg-descr b/devel/hs-keys/pkg-descr
new file mode 100644
index 00000000000..e105976d228
--- /dev/null
+++ b/devel/hs-keys/pkg-descr
@@ -0,0 +1,3 @@
+Keyed functors and containers.
+
+WWW: http://github.com/ekmett/keys/
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index c355afab513..47bdbf91f85 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= kqueue
-PORTVERSION= 0.1.2.4
-PORTREVISION= 6
+PORTVERSION= 0.1.2.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the kqueue event library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=1.1
USE_C2HS= yes
diff --git a/devel/hs-kqueue/distinfo b/devel/hs-kqueue/distinfo
index 443e6c2eb68..716fbaf364f 100644
--- a/devel/hs-kqueue/distinfo
+++ b/devel/hs-kqueue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/kqueue-0.1.2.4.tar.gz) = f9aa0609a8ce74857068e66f014851542e61f5c97ac144327028a66e33a47740
-SIZE (cabal/kqueue-0.1.2.4.tar.gz) = 7342
+SHA256 (cabal/kqueue-0.1.2.6.tar.gz) = e851243826ecadda865809289d6f6921483ab5fed54f9d12453277dd355445e0
+SIZE (cabal/kqueue-0.1.2.6.tar.gz) = 7398
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index ebcefd64d2d..1947a86c0ec 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,15 +1,13 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.3.2.1
-PORTREVISION= 11
+PORTVERSION= 0.4.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Analysis and generation of C code in Haskell
-
-LICENSE= BSD
+COMMENT= Analysis and generation of C code
+LICENSE= BSD3CLAUSE
USE_ALEX= yes
USE_HAPPY= yes
USE_CABAL= syb
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 6c3a16a4b3e..c5a5d34fce0 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-c-0.3.2.1.tar.gz) = bdc6680ef0b66454989245b626c437d08e1b5378e522fa160b538a8bd03568e2
-SIZE (cabal/language-c-0.3.2.1.tar.gz) = 141660
+SHA256 (cabal/language-c-0.4.5.tar.gz) = 644a7f6657f0325149f16c755ba3e51353f0d18484282989cf473c726a0e1d60
+SIZE (cabal/language-c-0.4.5.tar.gz) = 168971
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index ebaa9a3dd2b..cb5381c1b9c 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.5.7
-PORTREVISION= 6
+PORTVERSION= 0.5.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parser for JavaScript
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 mtl>=1.1 utf8-light>=0.4 utf8-string>=0.3.7
+USE_CABAL= blaze-builder>=0.2 mtl>=1.1 utf8-string>=0.3.7
+USE_ALEX= yes
USE_HAPPY= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index bc5691944c9..965cdf82631 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-javascript-0.5.7.tar.gz) = a3a9924a212d28afa06ce97a9d52d6352da852549b89f44efd5ecd8e17f8cd56
-SIZE (cabal/language-javascript-0.5.7.tar.gz) = 96118
+SHA256 (cabal/language-javascript-0.5.13.tar.gz) = 5cd824989ab56a87874dacc4335aa89cb97a649d71747a555c6fc45ea0e38640
+SIZE (cabal/language-javascript-0.5.13.tar.gz) = 48398
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index d6231c5c239..77038763ef5 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= largeword
-PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTVERSION= 1.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Provides a way of producing other large words
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index 702a4106843..ef21db6dec0 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/largeword-1.0.5.tar.gz) = b42164506e521be1d296055086f109a62bc5c3e71b46751d06ada7622fc79c45
-SIZE (cabal/largeword-1.0.5.tar.gz) = 3069
+SHA256 (cabal/largeword-1.2.3.tar.gz) = 960e341af0de950db4e7c47a987bb0789f7759bb27c801ac26e89a28add5acd1
+SIZE (cabal/largeword-1.2.3.tar.gz) = 4278
diff --git a/devel/hs-largeword/pkg-descr b/devel/hs-largeword/pkg-descr
index 93702a590bc..6b73b9d0392 100644
--- a/devel/hs-largeword/pkg-descr
+++ b/devel/hs-largeword/pkg-descr
@@ -1,4 +1,4 @@
Provides Word128, Word192 and Word256 and a way of producing other large
words if required.
-WWW: http://github.com/idontgetoutmuch/largeword
+WWW: https://github.com/idontgetoutmuch/largeword
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 31f3afd131b..c2d3909fc5f 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,13 +2,13 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for demand-driven testing of Haskell programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index 8168de7b4f8..bee61eb88ae 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,23 +1,21 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 3.9.0.2
-PORTREVISION= 4
+PORTVERSION= 4.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Lenses, Folds and Traversals
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= bifunctors>=3 comonad>=3 comonad-transformers>=3 \
- comonads-fd>=3 contravariant>=0.2.0.2 distributive>=0.3 \
- generic-deriving hashable>=1.1.2.3 \
- MonadCatchIO-transformers>=0.3 mtl>=2.0.1 parallel>=3.1.0.1 \
- profunctor-extras>=3.3 profunctors>=3.2 reflection>=1.1.6 \
- semigroupoids>=3 semigroups>=0.8.4 split tagged>=0.4.4 \
- text>=0.11 transformers>=0.3 unordered-containers>=0.2 \
- vector>=0.9 void>=0.5
+USE_CABAL= aeson>=0.7.0.5 attoparsec>=0.10 bifunctors>=4 comonad>=4 \
+ contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \
+ free>=4 hashable>=1.1.2.3 mtl>=2.0.1 parallel>=3.1.0.1 \
+ primitive>=0.4.0.1 profunctors>=4 reflection>=1.1.6 \
+ scientific>=0.3.2 semigroupoids>=4 semigroups>=0.8.4 \
+ split>=0.2 tagged>=0.4.4 text>=0.11 transformers-compat>=0.3 \
+ unordered-containers>=0.2 vector>=0.9 void>=0.5 zlib>=0.5.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 1955fae9f9f..ff8c3ae1099 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lens-3.9.0.2.tar.gz) = 825e75c46d986d47dafd7cc17f596c312283f9521ccbc3aafcbebd3fc6470332
-SIZE (cabal/lens-3.9.0.2.tar.gz) = 454635
+SHA256 (cabal/lens-4.3.3.tar.gz) = 2e6449fb0a4a93b7779dbd8147541d663cf3770557736e90ccb697002dd5f84c
+SIZE (cabal/lens-4.3.3.tar.gz) = 767895
diff --git a/devel/hs-lens/files/patch-lens.cabal b/devel/hs-lens/files/patch-lens.cabal
deleted file mode 100644
index 73cb26baa09..00000000000
--- a/devel/hs-lens/files/patch-lens.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./lens.cabal.orig 2013-01-26 15:22:29.000000000 +0100
-+++ ./lens.cabal 2013-01-29 07:57:12.000000000 +0100
-@@ -186,8 +186,7 @@
- tagged >= 0.4.4 && < 1,
- template-haskell >= 2.4 && < 2.10,
- text >= 0.11 && < 0.12,
-- transformers >= 0.2 && < 0.4,
-- transformers-compat >= 0.1 && < 1,
-+ transformers >= 0.3 && < 0.4,
- unordered-containers >= 0.2 && < 0.3,
- vector >= 0.9 && < 0.11
-
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 4536311d72a..c53e0593ce5 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.0.5
-PORTREVISION= 4
+PORTVERSION= 0.2.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Lifted IO operations from the base library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= base-unicode-symbols>=0.1.1 monad-control>=0.3 \
- transformers-base>=0.4
+USE_CABAL= monad-control>=0.3 transformers-base>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index 5fe6d35689c..6d5d9075105 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.2.0.5.tar.gz) = 799c126a04588cf6a3fa20ba250fac20087f474c05e675fd62eceb303ee5c7aa
-SIZE (cabal/lifted-base-0.2.0.5.tar.gz) = 11697
+SHA256 (cabal/lifted-base-0.2.3.0.tar.gz) = 365d6fbe9f87dfeaa89fda8ba6ff21811b6cd1babb2adfe975fb2d0d0f4d7071
+SIZE (cabal/lifted-base-0.2.3.0.tar.gz) = 11610
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index fbc98756c38..f1808fcc89d 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= logict
-PORTVERSION= 0.6
-PORTREVISION= 5
+PORTVERSION= 0.6.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Backtracking logic-programming monad
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=1.0.1
+USE_CABAL= mtl>=2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-logict/distinfo b/devel/hs-logict/distinfo
index 0a4269f39e8..9f889cc47ee 100644
--- a/devel/hs-logict/distinfo
+++ b/devel/hs-logict/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/logict-0.6.tar.gz) = 2e915fbc82068692beb595e8153c49275c8611ccad5683272aa453be7fe4e4da
-SIZE (cabal/logict-0.6.tar.gz) = 5287
+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-mmap/Makefile b/devel/hs-mmap/Makefile
index 698c7c4db4a..6805b3e2358 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= mmap
-PORTVERSION= 0.5.8
-PORTREVISION= 7
+PORTVERSION= 0.5.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Memory-mapped files for POSIX and Windows
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mmap/distinfo b/devel/hs-mmap/distinfo
index 0e575abc34c..9569fa6a7e8 100644
--- a/devel/hs-mmap/distinfo
+++ b/devel/hs-mmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mmap-0.5.8.tar.gz) = fed460c4ded1953f027fccf705c7c09bc0a8e94bb14b024391387beb4b5afa9f
-SIZE (cabal/mmap-0.5.8.tar.gz) = 11657
+SHA256 (cabal/mmap-0.5.9.tar.gz) = 58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8
+SIZE (cabal/mmap-0.5.9.tar.gz) = 11731
diff --git a/devel/hs-mmap/pkg-descr b/devel/hs-mmap/pkg-descr
index c1d1e1c6a89..097d5db52da 100644
--- a/devel/hs-mmap/pkg-descr
+++ b/devel/hs-mmap/pkg-descr
@@ -1,6 +1,6 @@
-This library provides a wrapper to mmap(2) or MapViewOfFile, allowing files or
-devices to be lazily loaded into memory as strict or lazy ByteStrings,
-ForeignPtrs or plain Ptrs, using the virtual memory subsystem to do on-demand
-loading. Modifications are also supported.
+This library provides a wrapper to mmap(2) or MapViewOfFile, allowing
+files or devices to be lazily loaded into memory as strict or lazy
+ByteStrings, ForeignPtrs or plain Ptrs, using the virtual memory
+subsystem to do on-demand loading. Modifications are also supported.
WWW: http://hackage.haskell.org/packages/archive/mmap
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index 16fbc2eadab..3633e817032 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= mmorph
-PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad morphisms
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.2.0.0
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
index dd4fe0a9734..9d29f3816de 100644
--- a/devel/hs-mmorph/distinfo
+++ b/devel/hs-mmorph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mmorph-1.0.0.tar.gz) = 13c369262821a86915ee18598567474e1489b49f19f9be8335252b6359762883
-SIZE (cabal/mmorph-1.0.0.tar.gz) = 4989
+SHA256 (cabal/mmorph-1.0.3.tar.gz) = 151bd6a93bcaabbc7ad0b106fe286129568837d7e3488fb86483f73fccfa172d
+SIZE (cabal/mmorph-1.0.3.tar.gz) = 6023
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 4ffc596fd36..452907fabc2 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 0.3.2.1
-PORTREVISION= 4
+PORTVERSION= 0.3.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Lift control operations through monad transformers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= base-unicode-symbols>=0.1.1 transformers>=0.2 \
- transformers-base>=0.4.1
+USE_CABAL= transformers-base>=0.4.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index 74f82f27e98..3237fa4a4e3 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-control-0.3.2.1.tar.gz) = 4395df5ea2b9278a96d7c8e93c81202b9441ba5fcfbd03b90c7d4ea1c66b8e9f
-SIZE (cabal/monad-control-0.3.2.1.tar.gz) = 10685
+SHA256 (cabal/monad-control-0.3.3.0.tar.gz) = ef44c9943760f2120eb450182852d6150390daa2de4b87e9dda9591e89714e6e
+SIZE (cabal/monad-control-0.3.3.0.tar.gz) = 10518
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index a86c4cfaa8b..a0161e70a0e 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.1.1
-PORTREVISION= 4
+PORTVERSION= 0.3.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Class of monads which can log messages
LICENSE= MIT
-USE_CABAL= conduit>=1.0 fast-logger>=0.2 monad-control mtl \
- resourcet>=0.4 text transformers transformers-base
+USE_CABAL= blaze-builder conduit>=1.0 conduit-extra>=1.0 exceptions \
+ fast-logger>=2.0 lifted-base monad-control monad-loops \
+ mtl resourcet>=0.4 stm stm-chans text transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index fb42586c205..389c81d5839 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.3.1.1.tar.gz) = a66f3b938aaa4ae07849cef5df27e17056d0708a6be6e36fa94e36cfa8ab1887
-SIZE (cabal/monad-logger-0.3.1.1.tar.gz) = 4648
+SHA256 (cabal/monad-logger-0.3.7.1.tar.gz) = 31c1f7769652e40f0688b965a7fd399df97762a426921c924aa1bacbde0ab946
+SIZE (cabal/monad-logger-0.3.7.1.tar.gz) = 6185
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
new file mode 100644
index 00000000000..c686c2324b7
--- /dev/null
+++ b/devel/hs-monad-loops/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME= monad-loops
+PORTVERSION= 0.4.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Monadic loops
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monad-loops/distinfo b/devel/hs-monad-loops/distinfo
new file mode 100644
index 00000000000..5016f3397d6
--- /dev/null
+++ b/devel/hs-monad-loops/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/monad-loops-0.4.2.1.tar.gz) = a6e888a462aff46297527e90a7bf0171bc2cff4cab073973bdbf2fc09ae5f9b6
+SIZE (cabal/monad-loops-0.4.2.1.tar.gz) = 4515
diff --git a/devel/hs-monad-loops/pkg-descr b/devel/hs-monad-loops/pkg-descr
new file mode 100644
index 00000000000..5335434d9c7
--- /dev/null
+++ b/devel/hs-monad-loops/pkg-descr
@@ -0,0 +1,3 @@
+Some useful control operators for looping.
+
+WWW: https://github.com/mokus0/monad-loops
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index f2537b4a881..a69e3e2f7ca 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= monad-par-extras
-PORTVERSION= 0.3.2
-PORTREVISION= 8
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Combinators and extra features for Par monads
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= abstract-par>=0.3 cereal>=0.3 mtl>=2.0 random>=1.0 \
- transformers>=0.2
+USE_CABAL= abstract-par>=0.3 cereal>=0.3 mtl>=2.0 random>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-par-extras/distinfo b/devel/hs-monad-par-extras/distinfo
index 3b1b4f4a510..09e69d5ca34 100644
--- a/devel/hs-monad-par-extras/distinfo
+++ b/devel/hs-monad-par-extras/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-extras-0.3.2.tar.gz) = cbecb6af5b2bbc77afe0d422e30a6d656cf56d68ddfc5b63d994fc01901d12cc
-SIZE (cabal/monad-par-extras-0.3.2.tar.gz) = 8958
+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 ea1b0c9fcce..7f8eeb81414 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.2
-PORTREVISION= 4
+PORTVERSION= 0.3.4.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for parallel programming based on a monad
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= abstract-deque>=0.1.4 abstract-par monad-par-extras \
+USE_CABAL= abstract-deque>=0.1.4 abstract-par monad-par-extras>=0.3 \
mtl>=2.0.1.0 mwc-random>=0.11 parallel>=3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index d4842967257..863fa2c8169 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-0.3.4.2.tar.gz) = 7a1dd6fb1359c41bf5a2865c19ad2a8f87c1344ad1b3ada1d257a42738a920cc
-SIZE (cabal/monad-par-0.3.4.2.tar.gz) = 28843
+SHA256 (cabal/monad-par-0.3.4.6.tar.gz) = fe9b0955a83e45b58f29f91573e96ea85ba6f90057a1e976054f8681af2b64cc
+SIZE (cabal/monad-par-0.3.4.6.tar.gz) = 30200
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
new file mode 100644
index 00000000000..790b1bd7173
--- /dev/null
+++ b/devel/hs-monads-tf/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= monads-tf
+PORTVERSION= 0.1.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Monad classes, using type families
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monads-tf/distinfo b/devel/hs-monads-tf/distinfo
new file mode 100644
index 00000000000..300f91bf0a2
--- /dev/null
+++ b/devel/hs-monads-tf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/monads-tf-0.1.0.2.tar.gz) = cb6f495443f526b00b3d06535aa29e393473244acd410cba1b898eeaa8f8077c
+SIZE (cabal/monads-tf-0.1.0.2.tar.gz) = 14206
diff --git a/devel/hs-monads-tf/pkg-descr b/devel/hs-monads-tf/pkg-descr
new file mode 100644
index 00000000000..0895946eb19
--- /dev/null
+++ b/devel/hs-monads-tf/pkg-descr
@@ -0,0 +1,4 @@
+Monad classes using type families, with instances for various monad
+transformers.
+
+WWW: http://hackage.haskell.org/package/monads-tf
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
new file mode 100644
index 00000000000..63cf72a4942
--- /dev/null
+++ b/devel/hs-mono-traversable/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= mono-traversable
+PORTVERSION= 0.6.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Type classes for mapping, folding, and traversing monomorphic containers
+
+LICENSE= MIT
+
+USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances hashable \
+ semigroupoids>=3.0 semigroups>=0.10 text>=0.11 \
+ unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \
+ vector-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo
new file mode 100644
index 00000000000..5ef69f0776b
--- /dev/null
+++ b/devel/hs-mono-traversable/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/mono-traversable-0.6.1.tar.gz) = ae4c578f73bb46aefcd2db27b510bdcff92a47d0f90f3f1e3419b4299d73de18
+SIZE (cabal/mono-traversable-0.6.1.tar.gz) = 23230
diff --git a/devel/hs-mono-traversable/pkg-descr b/devel/hs-mono-traversable/pkg-descr
new file mode 100644
index 00000000000..8b4e27a4fbe
--- /dev/null
+++ b/devel/hs-mono-traversable/pkg-descr
@@ -0,0 +1,5 @@
+Monomorphic variants of the Functor, Foldable, and Traversable
+typeclasses. Contains even more experimental code for abstracting
+containers and sequences.
+
+WWW: https://github.com/snoyberg/mono-traversable
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index 79b9bd2d128..de9efb14bff 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= mtl
-PORTVERSION= 2.1.2
-PORTREVISION= 6
+PORTVERSION= 2.1.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad classes, using functional dependencies
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.3
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 611b054ca49..902fb2a08ba 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mtl-2.1.2.tar.gz) = 8c775764333420a4391823f9cb9b640306a262552280ea9bbdd2ca11194a8bef
-SIZE (cabal/mtl-2.1.2.tar.gz) = 13723
+SHA256 (cabal/mtl-2.1.3.1.tar.gz) = 77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6
+SIZE (cabal/mtl-2.1.3.1.tar.gz) = 13955
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index abb08c4805b..48bfea01d7e 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.9
-PORTREVISION= 5
+PORTVERSION= 0.9.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Safely evaluate pure Haskell expressions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= hint>=0.3.1 mtl>2 show>=0.3 simple-reflect utf8-string
+USE_CABAL= extensible-exceptions hint>=0.3.1 mtl>2 show>=0.3 \
+ simple-reflect utf8-string
EXECUTABLE= mueval mueval-core
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index 24c29be11c6..003ebf5f660 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mueval-0.9.tar.gz) = eba209424b5a877be6156fa849631023f9e70c53e7ab1c222cb47fdaf61fd6f8
-SIZE (cabal/mueval-0.9.tar.gz) = 15501
+SHA256 (cabal/mueval-0.9.1.1.tar.gz) = ff8a460a09e3371cedb9e4393fb84b2bcb65b6b164257af1413eb0b12872385d
+SIZE (cabal/mueval-0.9.1.1.tar.gz) = 15346
diff --git a/devel/hs-mueval/pkg-descr b/devel/hs-mueval/pkg-descr
index c68364fa4a9..325ad5f6659 100644
--- a/devel/hs-mueval/pkg-descr
+++ b/devel/hs-mueval/pkg-descr
@@ -6,4 +6,5 @@ and so on to sandbox the Haskell code. It is, in short, intended to be a
standalone version of Lambdabot's famous evaluation functionality. For
examples and explanations, please see the README file. Mueval is POSIX-only.
-WWW: http://code.haskell.org/mubot/
+WWW: https://github.com/gwern/mueval
+
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 754a31df1fa..59136390990 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.6
-PORTREVISION= 6
+PORTVERSION= 0.1.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= MurmurHash2 implementation for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 3e93a97a4ee..7eecfe66cbf 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/murmur-hash-0.1.0.6.tar.gz) = ff5a8032599c5f95eb36fd4f3231e2770f6093088e13a977260ef4a406e5d372
-SIZE (cabal/murmur-hash-0.1.0.6.tar.gz) = 4070
+SHA256 (cabal/murmur-hash-0.1.0.7.tar.gz) = 775ef5836344f30c37a9f07b70553ade9bf4f33524fad03eaac2a21daf27bb88
+SIZE (cabal/murmur-hash-0.1.0.7.tar.gz) = 4073
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 668f6a5391c..1aa931a05e3 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.5.2.1
-PORTREVISION= 5
+PORTVERSION= 0.9.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities and combinators for parsing command line options
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= transformers>=0.2
+USE_CABAL= ansi-wl-pprint>=0.6 transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index dc278360e40..c7b28de0419 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/optparse-applicative-0.5.2.1.tar.gz) = 1110b926d9c601f8bc24c3e57e08d3f957ad047a60324b11640df51a0a9a9570
-SIZE (cabal/optparse-applicative-0.5.2.1.tar.gz) = 24123
+SHA256 (cabal/optparse-applicative-0.9.1.1.tar.gz) = e6093c36f9b996f8431f588c1b95439fe151278e72a9236f51e2b5e4d340c8bb
+SIZE (cabal/optparse-applicative-0.9.1.1.tar.gz) = 32757
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 67d5c7e49c7..e23853d726a 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.0.3
-PORTREVISION= 6
+PORTVERSION= 3.2.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parallel programming library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index 394ba677b4f..7e67f42e767 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parallel-3.2.0.3.tar.gz) = 163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd
-SIZE (cabal/parallel-3.2.0.3.tar.gz) = 12527
+SHA256 (cabal/parallel-3.2.0.4.tar.gz) = 8cdb637fc04e4dd62f9deb0fe3c191b8068526009960f297f54dc9cf5616146d
+SIZE (cabal/parallel-3.2.0.4.tar.gz) = 12842
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 480fb369133..5db5a776c38 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= pcre-light
-PORTVERSION= 0.4
-PORTREVISION= 13
+PORTVERSION= 0.4.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Lightweight Haskell regex library compatible with Perl 5
+COMMENT= Small, efficient, and portable regex library for Perl 5 compatible
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index c51dbb154e7..c153f1d756a 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pcre-light-0.4.tar.gz) = b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6
-SIZE (cabal/pcre-light-0.4.tar.gz) = 28943
+SHA256 (cabal/pcre-light-0.4.0.2.tar.gz) = ddda356c3dc0075d7fa2740a56845a68360baf896e3e9420ace68c399a21582d
+SIZE (cabal/pcre-light-0.4.0.2.tar.gz) = 15355
diff --git a/devel/hs-pcre-light/pkg-descr b/devel/hs-pcre-light/pkg-descr
index b4cc9d1c14d..65984c91a08 100644
--- a/devel/hs-pcre-light/pkg-descr
+++ b/devel/hs-pcre-light/pkg-descr
@@ -1,7 +1,6 @@
-A small, efficient and portable Haskell regex library for Perl 5 compatible
-regular expressions.
+A small, efficient and portable Haskell regex library for Perl 5
+compatible regular expressions. The PCRE library is a set of functions
+that implement regular expression pattern matching using the same syntax
+and semantics as Perl 5.
-The PCRE library is a set of functions that implement regular expression
-pattern matching using the same syntax and semantics as Perl 5.
-
-WWW: http://code.haskell.org/~dons/code/pcre-light
+WWW: https://github.com/Daniel-Diaz/pcre-light
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
deleted file mode 100644
index 054a59847ed..00000000000
--- a/devel/hs-pool-conduit/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= pool-conduit
-PORTVERSION= 0.1.2
-PORTREVISION= 4
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Resource pool allocations via ResourceT
-
-LICENSE= MIT
-
-USE_CABAL= monad-control resource-pool>=0.2.1 resourcet>=0.3 \
- transformers>=0.2.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-pool-conduit/distinfo b/devel/hs-pool-conduit/distinfo
deleted file mode 100644
index cd4a75aba27..00000000000
--- a/devel/hs-pool-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/pool-conduit-0.1.2.tar.gz) = 68e7c1c510e58116fe3afafd4a1fe50b139f58d838e41c8ba2a4a57951c09b82
-SIZE (cabal/pool-conduit-0.1.2.tar.gz) = 2586
diff --git a/devel/hs-pool-conduit/pkg-descr b/devel/hs-pool-conduit/pkg-descr
deleted file mode 100644
index b870847700a..00000000000
--- a/devel/hs-pool-conduit/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Allocate resources from a pool, guaranteeing resource handling via the
-ResourceT transformer.
-
-WWW: http://www.yesodweb.com/book/persistent
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
new file mode 100644
index 00000000000..fe6601a7805
--- /dev/null
+++ b/devel/hs-prelude-extras/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= prelude-extras
+PORTVERSION= 0.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Higher-order versions of Prelude classes
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-prelude-extras/distinfo b/devel/hs-prelude-extras/distinfo
new file mode 100644
index 00000000000..cb1337f371f
--- /dev/null
+++ b/devel/hs-prelude-extras/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/prelude-extras-0.4.tar.gz) = 56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57
+SIZE (cabal/prelude-extras-0.4.tar.gz) = 4958
diff --git a/devel/hs-prelude-extras/pkg-descr b/devel/hs-prelude-extras/pkg-descr
new file mode 100644
index 00000000000..2c96dac4c8e
--- /dev/null
+++ b/devel/hs-prelude-extras/pkg-descr
@@ -0,0 +1,4 @@
+Haskell 98 - higher order versions of Prelude classes to ease
+programming with polymorphic recursion and reduce UndecidableInstances.
+
+WWW: http://github.com/ekmett/prelude-extras
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-prettyclass/Makefile
index 85914d7fd98..b49158cd129 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -1,15 +1,13 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-PORTNAME= StateVar
+PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= State variables for Haskell
+COMMENT= Pretty printing class similar to Show
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-prettyclass/distinfo b/devel/hs-prettyclass/distinfo
new file mode 100644
index 00000000000..39e26b6ddb9
--- /dev/null
+++ b/devel/hs-prettyclass/distinfo
@@ -0,0 +1,2 @@
+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-prettyclass/pkg-descr b/devel/hs-prettyclass/pkg-descr
new file mode 100644
index 00000000000..aaabf76f284
--- /dev/null
+++ b/devel/hs-prettyclass/pkg-descr
@@ -0,0 +1,5 @@
+Pretty printing class similar to Show, based on the HughesPJ pretty
+printing library. Provides the pretty printing class and instances for
+the Prelude types.
+
+WWW: http://hackage.haskell.org/package/prettyclass
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index c0855f1b2db..a944921d21d 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.5.0.1
-PORTREVISION= 6
+PORTVERSION= 0.5.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Primitive memory-related operations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 20184ed7690..1cb1df22712 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/primitive-0.5.0.1.tar.gz) = 526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313
-SIZE (cabal/primitive-0.5.0.1.tar.gz) = 10372
+SHA256 (cabal/primitive-0.5.2.1.tar.gz) = 0e516b81c2ef2c96d47dc40561663cc2cbfece0f135948e77e9b53025ff1c3ee
+SIZE (cabal/primitive-0.5.2.1.tar.gz) = 10923
diff --git a/devel/hs-primitive/pkg-descr b/devel/hs-primitive/pkg-descr
index f01b8ae8ab6..77662894d8b 100644
--- a/devel/hs-primitive/pkg-descr
+++ b/devel/hs-primitive/pkg-descr
@@ -1,3 +1,3 @@
-This package provides wrappers for primitive array operations.
+This package provides wrappers for primitive memory-related operations.
-WWW: http://code.haskell.org/primitive
+WWW: https://github.com/haskell/primitive
diff --git a/devel/hs-profunctor-extras/Makefile b/devel/hs-profunctor-extras/Makefile
deleted file mode 100644
index 6dd5613d9cb..00000000000
--- a/devel/hs-profunctor-extras/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= profunctor-extras
-PORTVERSION= 3.3
-PORTREVISION= 6
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Profunctor extras
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3 profunctors>=3.2 semigroupoid-extras>=3 \
- semigroupoids>=3 tagged>=0.4.4 transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-profunctor-extras/distinfo b/devel/hs-profunctor-extras/distinfo
deleted file mode 100644
index 35fe032471c..00000000000
--- a/devel/hs-profunctor-extras/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/profunctor-extras-3.3.tar.gz) = 79bfbe8087295e3bd18175a32a325dc4115111945dcbae7feea24bd102e3b169
-SIZE (cabal/profunctor-extras-3.3.tar.gz) = 5811
diff --git a/devel/hs-profunctor-extras/pkg-descr b/devel/hs-profunctor-extras/pkg-descr
deleted file mode 100644
index afdaceb77f1..00000000000
--- a/devel/hs-profunctor-extras/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package provides a number of utilities and constructions that arise
-when working with profunctors that require minor extensions to Haskell
-98.
-
-WWW: http://github.com/ekmett/profunctor-extras/
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 15f6a23bf73..78d8d395f23 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 3.3.0.1
-PORTREVISION= 4
+PORTVERSION= 4.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 Profunctors
+COMMENT= Profunctors
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=3 tagged>=0.4.4
+USE_CABAL= comonad>=4 distributive>=0.4.4 semigroupoids>=4 \
+ tagged>=0.4.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index 8b4c11adacf..d90d35d340e 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/profunctors-3.3.0.1.tar.gz) = 0216dec6bd529b3108fdbb653df535ba4b9dcf5fa4c4c76aad9ae424d2eba799
-SIZE (cabal/profunctors-3.3.0.1.tar.gz) = 6480
+SHA256 (cabal/profunctors-4.2.0.1.tar.gz) = 0cdb27e871e167e24935caee6435c08701227a116a8c526dea32ca3f54cc8e01
+SIZE (cabal/profunctors-4.2.0.1.tar.gz) = 15005
diff --git a/devel/hs-profunctors/pkg-descr b/devel/hs-profunctors/pkg-descr
index 1f9e7b99e2b..2a6e4ad459a 100644
--- a/devel/hs-profunctors/pkg-descr
+++ b/devel/hs-profunctors/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 Profunctors.
+Profunctors.
WWW: http://github.com/ekmett/profunctors/
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index a78b810bb51..f540999df67 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.1.3
-PORTREVISION= 5
+PORTVERSION= 0.1.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Specify Haskell project templates and generate files
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring base64-conduit classy-prelude>=0.4 \
- conduit>=0.5.4 mtl>=2.0 resourcet>=0.4.3 system-fileio>=0.3 \
- system-filepath>=0.4 text>=0.11 transformers>=0.2
+USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \
+ resourcet>=0.4.3 system-fileio>=0.3 system-filepath>=0.4 \
+ text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index e9d7f950ef9..52888d7e202 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/project-template-0.1.3.tar.gz) = b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb
-SIZE (cabal/project-template-0.1.3.tar.gz) = 3930
+SHA256 (cabal/project-template-0.1.4.1.tar.gz) = 8b16b378f3852d9ba8f2531a8c97515a2a2bc6e762c1437c5b9cb53f89425def
+SIZE (cabal/project-template-0.1.4.1.tar.gz) = 4483
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index f7bf1a545c9..e484823d6b0 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= quickcheck-io
-PORTVERSION= 0.1.0
-PORTREVISION= 4
+PORTVERSION= 0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-quickcheck-io/distinfo b/devel/hs-quickcheck-io/distinfo
index d49d9ea6124..0b718d1a65c 100644
--- a/devel/hs-quickcheck-io/distinfo
+++ b/devel/hs-quickcheck-io/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/quickcheck-io-0.1.0.tar.gz) = 5a32c4bf8266010db2874d101b6af471af2e41d602c34ebd768c867bd8d1ed98
-SIZE (cabal/quickcheck-io-0.1.0.tar.gz) = 1604
+SHA256 (cabal/quickcheck-io-0.1.1.tar.gz) = a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b
+SIZE (cabal/quickcheck-io-0.1.1.tar.gz) = 1646
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index 5a54688d735..345dcb89f44 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,13 +2,13 @@
PORTNAME= random
PORTVERSION= 1.0.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random number library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile
index 31a36cf42cd..aaeb0148d77 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-ranges/Makefile
@@ -2,13 +2,13 @@
PORTNAME= ranges
PORTVERSION= 0.2.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Ranges and various functions on them
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 74a0b7e6d69..a5c59c0f508 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Interface to the GNU readline library
LICENSE= GPLv2
-USES= readline
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index b3eaca62f0a..1bfc6cbeba9 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 1.3.2
-PORTREVISION= 4
+PORTVERSION= 1.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Reifies arbitrary terms into types that can be reflected back into terms
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= tagged>=0.4.4
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 68032108a4e..7a21bf3a6d0 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/reflection-1.3.2.tar.gz) = a69fa05f8a8faff42dbfbfe0b7847beebd91a092609e29b10282c35df7f3ad4a
-SIZE (cabal/reflection-1.3.2.tar.gz) = 8530
+SHA256 (cabal/reflection-1.5.1.tar.gz) = 9d4ad85c11a4986c904629c226c2be56f129f7691ddefe9373b2e87ca4a151a1
+SIZE (cabal/reflection-1.5.1.tar.gz) = 9436
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index f44b4e48014..6c1145b4c17 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= resource-pool
-PORTVERSION= 0.2.1.1
-PORTREVISION= 6
+PORTVERSION= 0.2.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= High-performance striped resource pooling implementation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= hashable monad-control>=0.2.0.1 stm transformers \
- transformers-base>=0.4 vector>=0.7
+USE_CABAL= hashable monad-control>=0.2.0.1 stm transformers-base>=0.4 \
+ vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resource-pool/distinfo b/devel/hs-resource-pool/distinfo
index 135b3b97cc3..001e24e4bef 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resource-pool-0.2.1.1.tar.gz) = 2fc44795d068b32a4f37a576ce94a0a32a954dcf3f6af8b259ead6598ffffefa
-SIZE (cabal/resource-pool-0.2.1.1.tar.gz) = 5029
+SHA256 (cabal/resource-pool-0.2.3.0.tar.gz) = b086b50dea777db4ab2eea3f5e4b98c72b60a27f560e0ac60c2f1a8ded5e2f96
+SIZE (cabal/resource-pool-0.2.3.0.tar.gz) = 6500
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 690765ffcab..d34f07ca23e 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 0.4.7.1
-PORTREVISION= 4
+PORTVERSION= 1.1.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Deterministic allocation and freeing of scarce resources
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 mtl>=2.0 \
- transformers>=0.2.2 transformers-base>=0.4.1
+USE_CABAL= exceptions>=0.5 lifted-base>=0.1 mmorph monad-control>=0.3.1 \
+ mtl>=2.0 transformers-base>=0.4.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index 21ee65207b1..af2a3d04cc5 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-0.4.7.1.tar.gz) = f02bb18c79d99152a241a65bbb0cd509d0bf9fba4fbb63b72360f7aa8a9336f5
-SIZE (cabal/resourcet-0.4.7.1.tar.gz) = 9251
+SHA256 (cabal/resourcet-1.1.2.3.tar.gz) = 351e9451b5d9001078084916385f403774ba6ba28ed53c1be6e35134070e3fd8
+SIZE (cabal/resourcet-1.1.2.3.tar.gz) = 10745
diff --git a/devel/hs-resourcet/pkg-descr b/devel/hs-resourcet/pkg-descr
index 1d3620bef6b..a092845ddc1 100644
--- a/devel/hs-resourcet/pkg-descr
+++ b/devel/hs-resourcet/pkg-descr
@@ -1,4 +1,5 @@
-This package was originally included with the conduit package, and has
-since been split off.
+This package was originally included with the conduit package, but has
+existed as a separate package for quite a while. It is fully usable
+outside of conduit.
WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index a8bad2c8755..28d936e3bc3 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= safe
-PORTVERSION= 0.3.3
-PORTREVISION= 9
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Library for safe (pattern match free) functions
+COMMENT= Library for safe (exception free) functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 4582bc81f00..839ff0dcd4e 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/safe-0.3.3.tar.gz) = 099154c843ac9c4b1831b06f0a92f56d6bba2b0163c9aa896031921bb0a2e945
-SIZE (cabal/safe-0.3.3.tar.gz) = 4245
+SHA256 (cabal/safe-0.3.7.tar.gz) = c114c41e1403441e3f873c9c9943368bda7069ff007fe60ce3f9509e95ac8867
+SIZE (cabal/safe-0.3.7.tar.gz) = 6294
diff --git a/devel/hs-safe/pkg-descr b/devel/hs-safe/pkg-descr
index 381c4a0f6a1..8e6aa56937f 100644
--- a/devel/hs-safe/pkg-descr
+++ b/devel/hs-safe/pkg-descr
@@ -1,8 +1,6 @@
Partial functions from the Haskell base library, such as head and !!, modified
to return more descriptive error messages, programmer defined error messages,
-Maybe wrapped results and default values.
+Maybe wrapped results and default values. These functions can be used to
+reduce the number of unsafe pattern matches in your code.
-These functions can be used to reduce the number of unsafe pattern matches in
-your code.
-
-WWW: http://www-users.cs.york.ac.uk/~ndm/safe/
+WWW: http://community.haskell.org/~ndm/safe/
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
new file mode 100644
index 00000000000..39474fa224a
--- /dev/null
+++ b/devel/hs-scientific/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= scientific
+PORTVERSION= 0.3.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Numbers represented using scientific notation
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1.2 text>=0.8
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
new file mode 100644
index 00000000000..23832d6b488
--- /dev/null
+++ b/devel/hs-scientific/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/scientific-0.3.3.0.tar.gz) = 3bab5bc2df22feac6b2e461daf3ececae2e5083569e09bb463a78e82574c44ce
+SIZE (cabal/scientific-0.3.3.0.tar.gz) = 17182
diff --git a/devel/hs-scientific/pkg-descr b/devel/hs-scientific/pkg-descr
new file mode 100644
index 00000000000..c5d02c8a388
--- /dev/null
+++ b/devel/hs-scientific/pkg-descr
@@ -0,0 +1,4 @@
+Data.Scientific provides a space efficient and arbitrary precision
+scientific number type.
+
+WWW: https://github.com/basvandijk/scientific
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
new file mode 100644
index 00000000000..52c10b85470
--- /dev/null
+++ b/devel/hs-securemem/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= securemem
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Abstraction to an auto scrubbing and const time eq, memory chunk
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable>=0.1.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
new file mode 100644
index 00000000000..c826a19bc91
--- /dev/null
+++ b/devel/hs-securemem/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/securemem-0.1.3.tar.gz) = 12a42caa7b09076197f14eb8511ec98969becdd81596617fe71cc13dcebccccf
+SIZE (cabal/securemem-0.1.3.tar.gz) = 4585
diff --git a/devel/hs-securemem/pkg-descr b/devel/hs-securemem/pkg-descr
new file mode 100644
index 00000000000..3e3a5bb9276
--- /dev/null
+++ b/devel/hs-securemem/pkg-descr
@@ -0,0 +1,4 @@
+SecureMem is similar to ByteString, except that it provides a memory
+chunk that will be auto-scrubbed after it run out of scope.
+
+WWW: http://github.com/vincenthz/hs-securemem
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index 44afc6ca3ce..c55973f4e03 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= setenv
-PORTVERSION= 0.1.0
-PORTREVISION= 6
+PORTVERSION= 0.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
index ea99ef16926..c0147ffa90e 100644
--- a/devel/hs-setenv/distinfo
+++ b/devel/hs-setenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/setenv-0.1.0.tar.gz) = 5e37d7a0a7abe3830fdb42cbba39f9b707f35a8affa770656645e7e5ee128413
-SIZE (cabal/setenv-0.1.0.tar.gz) = 2478
+SHA256 (cabal/setenv-0.1.1.1.tar.gz) = 230d87b0d04b2b05460ddf5a31569250ee1c3df6f91762733a29c434b7def32b
+SIZE (cabal/setenv-0.1.1.1.tar.gz) = 3019
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
new file mode 100644
index 00000000000..40f43a9c249
--- /dev/null
+++ b/devel/hs-shake/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= shake
+PORTVERSION= 0.13.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Build system library, like Make, but more accurate dependencies
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1.2.3 random unordered-containers>=0.2.1 \
+ utf8-string>=0.3
+
+EXECUTABLE= shake
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
new file mode 100644
index 00000000000..b151993e11e
--- /dev/null
+++ b/devel/hs-shake/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/shake-0.13.2.tar.gz) = cafa769e1b04f989ab5bc87d9f8fac38d7421774b2aacd1e7750f5de80077845
+SIZE (cabal/shake-0.13.2.tar.gz) = 1235826
diff --git a/devel/hs-shake/pkg-descr b/devel/hs-shake/pkg-descr
new file mode 100644
index 00000000000..1c1dd5c5b28
--- /dev/null
+++ b/devel/hs-shake/pkg-descr
@@ -0,0 +1,14 @@
+Shake is a Haskell library for writing build systems - designed as a
+replacement for make. To use Shake the user writes a Haskell program that
+imports the Shake library, defines some build rules, and calls shake.
+Thanks to do notation and infix operators, a simple Shake program is not
+too dissimilar from a simple Makefile. However, as build systems get more
+complex, Shake is able to take advantage of the excellent abstraction
+facilities offered by Haskell and easily support much larger projects.
+The Shake library provides all the standard features available in other
+build systems, including automatic parallelism and minimal rebuilds. Shake
+provides highly accurate dependency tracking, including seamless support
+for generated files, and dependencies on system information (e.g. compiler
+version).
+
+WWW: https://github.com/ndmitchell/shake
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 41022d455ee..8cb32270517 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index b519b55ce13..5ba14a13805 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,13 +2,13 @@
PORTNAME= silently
PORTVERSION= 1.2.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Prevent or capture writing to stdout and other handles
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 8b1297221a1..bb631e8863d 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= simple-reflect
-PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple reflection of expressions containing variables
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
index 38ca573ac2b..f8fcfcbeb90 100644
--- a/devel/hs-simple-reflect/distinfo
+++ b/devel/hs-simple-reflect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-reflect-0.3.1.tar.gz) = daf0d8cdc82011b5b97077939507101611c0a6008543832ba07c2131dd6137a1
-SIZE (cabal/simple-reflect-0.3.1.tar.gz) = 4286
+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-simple-reflect/pkg-descr b/devel/hs-simple-reflect/pkg-descr
index a0e47cf36f1..425b87364bf 100644
--- a/devel/hs-simple-reflect/pkg-descr
+++ b/devel/hs-simple-reflect/pkg-descr
@@ -3,4 +3,4 @@ Reflection here means that a Haskell expression is turned into a string.
The primary aim of this package is teaching and understanding; there are
no options for manipulating the reflected expressions beyond showing them.
-WWW: http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details
+WWW: http://twanvl.nl/blog/haskell/simple-reflection-of-expressions
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 5959eb1759d..8a46e86ddf9 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= smallcheck
-PORTVERSION= 1.0.2
-PORTREVISION= 5
+PORTVERSION= 1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Property-based testing library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= logict mtl
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index ad3940b7d2c..1d9ad5cb7b2 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/smallcheck-1.0.2.tar.gz) = b1adf57b922c28e57ec79e04e1e6ee7e6e2b38ff7ffd08e5e4f23ebeded6f427
-SIZE (cabal/smallcheck-1.0.2.tar.gz) = 13850
+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 17777fd3935..0c999f420e3 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -3,13 +3,13 @@
PORTNAME= split
PORTVERSION= 0.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Combinator library for splitting lists
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile
new file mode 100644
index 00000000000..de271aa856c
--- /dev/null
+++ b/devel/hs-stm-chans/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= stm-chans
+PORTVERSION= 3.0.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Additional types of channels for STM
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= stm>=2.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-stm-chans/distinfo b/devel/hs-stm-chans/distinfo
new file mode 100644
index 00000000000..48eb7bb3c9a
--- /dev/null
+++ b/devel/hs-stm-chans/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/stm-chans-3.0.0.2.tar.gz) = d07abf7a8bf9689b92f69bb73e9c1b71dc785d7b0a7b512dc24d77e945024aff
+SIZE (cabal/stm-chans-3.0.0.2.tar.gz) = 9401
diff --git a/devel/hs-stm-chans/pkg-descr b/devel/hs-stm-chans/pkg-descr
new file mode 100644
index 00000000000..60ac5d319ac
--- /dev/null
+++ b/devel/hs-stm-chans/pkg-descr
@@ -0,0 +1,3 @@
+Additional types of channels for STM.
+
+WWW: http://code.haskell.org/~wren/
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 84210f2246b..4f0430b2ad7 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -2,13 +2,13 @@
PORTNAME= stm
PORTVERSION= 2.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Software Transactional Memory
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
new file mode 100644
index 00000000000..c95fcc8c8e9
--- /dev/null
+++ b/devel/hs-streaming-commons/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= streaming-commons
+PORTVERSION= 0.1.4.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Common lower-level functions needed by various streaming data libraries
+
+LICENSE= MIT
+
+USE_CABAL= blaze-builder>=0.3 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
new file mode 100644
index 00000000000..7cc5d80a0e4
--- /dev/null
+++ b/devel/hs-streaming-commons/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/streaming-commons-0.1.4.1.tar.gz) = 8caada6a54ec1e469510701426748af60e3633835679e05d5c107c58a4a8bd58
+SIZE (cabal/streaming-commons-0.1.4.1.tar.gz) = 77980
diff --git a/devel/hs-streaming-commons/pkg-descr b/devel/hs-streaming-commons/pkg-descr
new file mode 100644
index 00000000000..cf662b16dd1
--- /dev/null
+++ b/devel/hs-streaming-commons/pkg-descr
@@ -0,0 +1,4 @@
+Provides low-dependency functionality commonly needed by various streaming
+data libraries, such as conduit and pipes.
+
+WWW: https://github.com/fpco/streaming-commons
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 1ca30b295e5..09db076421c 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index 8d2071401aa..f1914350f82 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -2,13 +2,13 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Scrap Your Boilerplate With Class Text instance
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= syb-with-class text>=0.7.1
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index aa7fc72c6c8..c86295411c4 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.4
-PORTREVISION= 6
+PORTVERSION= 0.6.1.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Scrap Your Boilerplate With Class
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 6316c152265..0c6d837bf0b 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-with-class-0.6.1.4.tar.gz) = 6cba1af7474ecbb3ac8040dc46d994e9e8b9fede3bc8daa610e4044054a8263a
-SIZE (cabal/syb-with-class-0.6.1.4.tar.gz) = 12349
+SHA256 (cabal/syb-with-class-0.6.1.5.tar.gz) = f617ee2dc6f2b0ad35e130c50500a2f67fe76b94df86b7ce5cfb2d2545bac4be
+SIZE (cabal/syb-with-class-0.6.1.5.tar.gz) = 12443
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 6a8ca82e702..7b297d7e680 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTVERSION= 0.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Scrap Your Boilerplate
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index 2d7a62264f4..31909939c6a 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-0.4.0.tar.gz) = f201089aa7e74b6cbca7fc73a259596b2a9628e31a9b54e801844ad68447bff3
-SIZE (cabal/syb-0.4.0.tar.gz) = 71729
+SHA256 (cabal/syb-0.4.1.tar.gz) = aa32cb3d9a0cbcfb24ac1c5d567886e8908dd017fd009ffd446bff86732670d2
+SIZE (cabal/syb-0.4.1.tar.gz) = 38699
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 104bee6e6c6..f3103747e41 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-fileio
-PORTVERSION= 0.3.11
-PORTREVISION= 5
+PORTVERSION= 0.3.14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index f45ea98ea67..df65aaa3308 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-fileio-0.3.11.tar.gz) = eb13a13315dd946f2a827258465089531c47ca2ad436c446a2a9e3f5e1cfd242
-SIZE (cabal/system-fileio-0.3.11.tar.gz) = 15498
+SHA256 (cabal/system-fileio-0.3.14.tar.gz) = 49c03f08ec03a0647392738e9d445048ac3734c22392a6dae63c58d159ccacf4
+SIZE (cabal/system-fileio-0.3.14.tar.gz) = 15390
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 93741e90b26..66172ee8840 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-filepath
-PORTVERSION= 0.4.7
-PORTREVISION= 6
+PORTVERSION= 0.4.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index 54bdb6b5ef6..e7181fbe34e 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-filepath-0.4.7.tar.gz) = 09d93ad801ed0f9ea166c9e7bfb1d761c056f5019a5f9297f2d3fa6cfeab0b81
-SIZE (cabal/system-filepath-0.4.7.tar.gz) = 13989
+SHA256 (cabal/system-filepath-0.4.12.tar.gz) = a2714835ac25263b64c340a497e4d9409b8475181b885bb1836995f63855d969
+SIZE (cabal/system-filepath-0.4.12.tar.gz) = 15860
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 88118944c3f..5be1627a877 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.6
-PORTREVISION= 4
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell 98 phantom types to avoid unsafely passing dummy arguments
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index 49a95d2536f..3fac8553644 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagged-0.6.tar.gz) = 55a2c61efc446616eba3d4c0359975378da96a1b85523159f1e400eda9e95a70
-SIZE (cabal/tagged-0.6.tar.gz) = 5177
+SHA256 (cabal/tagged-0.7.2.tar.gz) = 055b2d9f7124176197f3564bcdbbb62374090c9e103819bff0d4e22db47e871b
+SIZE (cabal/tagged-0.7.2.tar.gz) = 5534
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index 40119c9200b..bc4592b5786 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= temporary
-PORTVERSION= 1.1.2.4
-PORTREVISION= 6
+PORTVERSION= 1.2.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Portable temporary file and directory support for Windows and Unix
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= exceptions>=0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-temporary/distinfo b/devel/hs-temporary/distinfo
index 79c44b4f615..c7bacf28cc1 100644
--- a/devel/hs-temporary/distinfo
+++ b/devel/hs-temporary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/temporary-1.1.2.4.tar.gz) = 5f9ebb2aac8767c8f73c071073bea56363ea0d589df162417a988b9f856013c9
-SIZE (cabal/temporary-1.1.2.4.tar.gz) = 5220
+SHA256 (cabal/temporary-1.2.0.3.tar.gz) = 8a889c7e62a2bb144eb9e394fab51e5dbd843d473ac2eab9e16b55a9eb3a4647
+SIZE (cabal/temporary-1.2.0.3.tar.gz) = 5308
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
deleted file mode 100644
index 3a10b26b689..00000000000
--- a/devel/hs-terminfo/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= terminfo
-PORTVERSION= 0.3.2.5
-PORTREVISION= 6
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell bindings to the terminfo library
-
-LICENSE= BSD
-
-USES= ncurses
-
-CONFIGURE_ARGS+= --configure-option=--with-curses-includes=${NCURSESINC} \
- --configure-option=--with-curses-libraries=${NCURSESLIB}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-terminfo/distinfo b/devel/hs-terminfo/distinfo
deleted file mode 100644
index 3e1b9918427..00000000000
--- a/devel/hs-terminfo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/terminfo-0.3.2.5.tar.gz) = 6f419fa3a9afe995993f18022d6a347aedffc9a28a6974701f8421b15f584dc1
-SIZE (cabal/terminfo-0.3.2.5.tar.gz) = 45361
diff --git a/devel/hs-terminfo/pkg-descr b/devel/hs-terminfo/pkg-descr
deleted file mode 100644
index b6be137b4f1..00000000000
--- a/devel/hs-terminfo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This library provides an interface to the terminfo database (via
-bindings to the curses library). Terminfo allows POSIX systems to
-interact with a variety of terminals using a standard set of
-capabilities.
-
-WWW: http://code.haskell.org/terminfo
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index d983ea5c1a3..75486846c1e 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= test-framework-hunit
-PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTVERSION= 0.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HUnit support for the test-framework package
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HUnit>=1.2 test-framework>=0.2.0
+USE_CABAL= extensible-exceptions>=0.1.1 HUnit>=1.2 test-framework>=0.2.0
.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 745ab5cc1e9..001155ebfd0 100644
--- a/devel/hs-test-framework-hunit/distinfo
+++ b/devel/hs-test-framework-hunit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-hunit-0.3.0.tar.gz) = 04b1536f4d40f04a65d0d540c462d45c50301014c384339f19e90d9cdcba8bcb
-SIZE (cabal/test-framework-hunit-0.3.0.tar.gz) = 2679
+SHA256 (cabal/test-framework-hunit-0.3.0.1.tar.gz) = d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0
+SIZE (cabal/test-framework-hunit-0.3.0.1.tar.gz) = 2690
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index bd7196b2cce..efae607b92e 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= test-framework-quickcheck2
-PORTVERSION= 0.3.0.1
-PORTREVISION= 7
+PORTVERSION= 0.3.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= QuickCheck2 support for the test-framework package
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= QuickCheck>=2.4 test-framework>=0.7.1
+USE_CABAL= extensible-exceptions>=0.1.1 QuickCheck>=2.4 \
+ test-framework>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-quickcheck2/distinfo b/devel/hs-test-framework-quickcheck2/distinfo
index 3f6ce7f52d6..5d1611734de 100644
--- a/devel/hs-test-framework-quickcheck2/distinfo
+++ b/devel/hs-test-framework-quickcheck2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-quickcheck2-0.3.0.1.tar.gz) = 3a10264a977032a51259cf872c47f38d84753c30ad8930452f4a63b2e866e784
-SIZE (cabal/test-framework-quickcheck2-0.3.0.1.tar.gz) = 3379
+SHA256 (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = cc96c6f30c29b16a3f7ec5c108f320a6c0f0d3ef71afff8a1cb98caf33ffe18a
+SIZE (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = 3518
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 94ba9ad0709..00000000000
--- a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./test-framework-quickcheck2.cabal.orig 2012-12-06 17:59:40.000000000 +0100
-+++ ./test-framework-quickcheck2.cabal 2013-05-03 21:35:58.000000000 +0200
-@@ -22,7 +22,7 @@
- Library
- Exposed-Modules: Test.Framework.Providers.QuickCheck2
-
-- Build-Depends: test-framework >= 0.7.1, QuickCheck >= 2.4 && < 2.6, extensible-exceptions >= 0.1.1 && < 0.2.0
-+ Build-Depends: test-framework >= 0.7.1, QuickCheck >= 2.4 && < 2.7, extensible-exceptions >= 0.1.1 && < 0.2.0
- if flag(base3)
- Build-Depends: base >= 3 && < 4, random >= 1
- else
diff --git a/devel/hs-test-framework-quickcheck2/pkg-descr b/devel/hs-test-framework-quickcheck2/pkg-descr
index b5f8f13880c..97660b32d7d 100644
--- a/devel/hs-test-framework-quickcheck2/pkg-descr
+++ b/devel/hs-test-framework-quickcheck2/pkg-descr
@@ -1,3 +1,3 @@
QuickCheck2 support for the test-framework package.
-WWW: http://batterseapower.github.com/test-framework/
+WWW: https://batterseapower.github.io/test-framework/
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 2fd2d28efec..8bb979b1ce1 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PORTNAME= test-framework
-PORTVERSION= 0.8
-PORTREVISION= 7
+PORTVERSION= 0.8.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Framework for running and organising tests, with HUnit and QuickCheck support
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 \
- extensible-exceptions>=0.1.1 hostname>=1.0 random>=1.0 \
- regex-posix>=0.72 xml>=1.3.5
+USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 hostname>=1.0 \
+ random>=1.0 regex-posix>=0.72 xml>=1.3.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index c68e5ba7aa4..400287472d4 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-0.8.tar.gz) = 94c958a5bc6e81d0da4643ae82a5beecf0ecbf5eb6e46d3661f79f32b02d09f1
-SIZE (cabal/test-framework-0.8.tar.gz) = 20253
+SHA256 (cabal/test-framework-0.8.0.3.tar.gz) = 5915bebf20a36f524241d1b85c45be2f767a9f9caeddc06d96e3ebab5ae1d68c
+SIZE (cabal/test-framework-0.8.0.3.tar.gz) = 20777
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index aac754e8a9b..6439388c533 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -3,7 +3,7 @@
PORTNAME= testpack
PORTVERSION= 2.1.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
new file mode 100644
index 00000000000..3f8d8f24c22
--- /dev/null
+++ b/devel/hs-text-icu/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= text-icu
+PORTVERSION= 0.6.3.7
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings to the ICU library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text>=0.9.1.0
+
+LIB_DEPENDS+= libicui18n.so:${PORTSDIR}/devel/icu
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-text-icu/distinfo b/devel/hs-text-icu/distinfo
new file mode 100644
index 00000000000..5a68d6e191f
--- /dev/null
+++ b/devel/hs-text-icu/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/text-icu-0.6.3.7.tar.gz) = c4c13df96bb5c7fcd32f7ba08543ac6ffe0f121a9cb7c77b6a34bbceaa92ff57
+SIZE (cabal/text-icu-0.6.3.7.tar.gz) = 44748
diff --git a/devel/hs-text-icu/pkg-descr b/devel/hs-text-icu/pkg-descr
new file mode 100644
index 00000000000..dcc8a02f673
--- /dev/null
+++ b/devel/hs-text-icu/pkg-descr
@@ -0,0 +1,21 @@
+Haskell bindings to the International Components for Unicode (ICU)
+libraries. These libraries provide robust and full-featured Unicode
+services on a wide variety of platforms.
+
+Features include:
+
+ * Both pure and impure bindings, to allow for fine control over efficiency
+ and ease of use.
+ * Breaking of strings on character, word, sentence, and line boundaries.
+ * Access to the Unicode Character Database (UCD) of character metadata.
+ * String collation functions, for locales where the conventions for
+ lexicographic ordering differ from the simple numeric ordering of
+ character codes.
+ * Character set conversion functions, allowing conversion between Unicode
+ and over 220 character encodings.
+ * Unicode normalization. (When implementations keep strings in a normalized
+ form, they can be assured that equivalent strings have a unique binary
+ representation.)
+ * Regular expression search and replace.
+
+WWW: https://github.com/bos/text-icu
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 83a0b067c84..b2f69425c50 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 0.11.3.1
-PORTREVISION= 4
+PORTVERSION= 1.1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient packed Unicode text type
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index f04ba0558d2..87f24e14565 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-0.11.3.1.tar.gz) = 76aad4a647cad7099b5a693eb9a4bc5263f7751392d8d1f87b14c78e2069559f
-SIZE (cabal/text-0.11.3.1.tar.gz) = 126477
+SHA256 (cabal/text-1.1.0.0.tar.gz) = 80f1ada824f0e3886bb49dc7fd128707ca1a34e06bbf4419873b1677c4d7ba92
+SIZE (cabal/text-1.1.0.0.tar.gz) = 136463
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
new file mode 100644
index 00000000000..5e519ecac5c
--- /dev/null
+++ b/devel/hs-tf-random/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= tf-random
+PORTVERSION= 0.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= High-quality splittable pseudorandom number generator
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= primitive>=0.3 random
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-tf-random/distinfo b/devel/hs-tf-random/distinfo
new file mode 100644
index 00000000000..262758d3ae1
--- /dev/null
+++ b/devel/hs-tf-random/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/tf-random-0.5.tar.gz) = 2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510
+SIZE (cabal/tf-random-0.5.tar.gz) = 18483
diff --git a/devel/hs-tf-random/pkg-descr b/devel/hs-tf-random/pkg-descr
new file mode 100644
index 00000000000..07bb74e4fb6
--- /dev/null
+++ b/devel/hs-tf-random/pkg-descr
@@ -0,0 +1,5 @@
+This package contains an implementation of a high-quality splittable
+pseudorandom number generator. The generator is based on a
+cryptographic hash function built on top of the ThreeFish block cipher.
+
+WWW: http://hackage.haskell.org/package/tf-random
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index 9592295ebe9..7eb57c0da3e 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.0.2
-PORTREVISION= 5
+PORTVERSION= 0.5.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fork threads and wait for their result
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= base-unicode-symbols>=0.1.1 stm>=2.1
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index 4b1131b6cc1..3949eaac1f3 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threads-0.5.0.2.tar.gz) = 559a0750565289de60bd6b26784d7978ee85c2662c84feeb504910539eac8c91
-SIZE (cabal/threads-0.5.0.2.tar.gz) = 7337
+SHA256 (cabal/threads-0.5.1.2.tar.gz) = 49a4d776b9c8c8d11467a95bab500cca8a3921251db977dffca42a6dd45702af
+SIZE (cabal/threads-0.5.1.2.tar.gz) = 7418
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 1d8f6088e8e..0bd6d5f3a1c 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,19 +1,19 @@
# $FreeBSD$
PORTNAME= threadscope
-PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Graphical tool for profiling parallel Haskell programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
pango
EXECUTABLE= threadscope
+
STANDALONE= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index 5201049b94d..565e5568354 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threadscope-0.2.2.tar.gz) = 8345bd2334ddec44b23b400f359d2b50ff7590102f55d4e93958c29086fa951d
-SIZE (cabal/threadscope-0.2.2.tar.gz) = 79239
+SHA256 (cabal/threadscope-0.2.4.tar.gz) = 2915c8ba9a5bb249cc915860fe56402140e2cb9441664bd8b36dc80dd07d0888
+SIZE (cabal/threadscope-0.2.4.tar.gz) = 79582
diff --git a/devel/hs-threadscope/files/patch-GUI__Main.hs b/devel/hs-threadscope/files/patch-GUI__Main.hs
deleted file mode 100644
index e6d2e694f4d..00000000000
--- a/devel/hs-threadscope/files/patch-GUI__Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./GUI/Main.hs.orig 2011-09-05 04:33:21.000000000 +0200
-+++ ./GUI/Main.hs 2011-12-07 01:27:00.000000000 +0100
-@@ -79,7 +79,6 @@
- | EventFileReload
- | EventFileExport FilePath FileExportFormat
-
---- | EventStateClear
- | EventSetState HECs (Maybe FilePath) String Int Double
-
- | EventShowSidebar Bool
diff --git a/devel/hs-threadscope/files/patch-GUI__Timeline__Render.hs b/devel/hs-threadscope/files/patch-GUI__Timeline__Render.hs
deleted file mode 100644
index 4136bc29984..00000000000
--- a/devel/hs-threadscope/files/patch-GUI__Timeline__Render.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./GUI/Timeline/Render.hs.orig 2011-12-07 01:21:24.000000000 +0100
-+++ ./GUI/Timeline/Render.hs 2011-12-07 01:24:29.000000000 +0100
-@@ -91,7 +91,7 @@
- region exposeRegion
- clip
- setSourceSurface surface 0 (-vadj_value)
-- -- ^^ this is where we adjust for the vertical scrollbar
-+ -- this is where we adjust for the vertical scrollbar
- setOperator OperatorSource
- paint
- when (scaleValue params > 0) $ do
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index b8baf0aafa3..b7beb4a4598 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,13 +2,13 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Compatibility with old-time for the time package
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 707c396b070..824597efd2e 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.2
-PORTREVISION= 5
+PORTVERSION= 0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure Haskell parser and renderer for binary Olson timezone files
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions>=0.1.0 timezone-series>=0.1.0
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index cb7d4fa40ab..5b49e5153f8 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-olson-0.1.2.tar.gz) = 3ee1eb5401607750d328cc6ec3dc6b93f4290dc77e2d7f8f60629cbeefb5e0b6
-SIZE (cabal/timezone-olson-0.1.2.tar.gz) = 11598
+SHA256 (cabal/timezone-olson-0.1.4.tar.gz) = b38853e003bb8d8db927ba393a0d1c0aa64ffc1a7b1feba23e9dee14f133b2d0
+SIZE (cabal/timezone-olson-0.1.4.tar.gz) = 11639
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index 7e54e769930..6c017861a93 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= timezone-series
-PORTVERSION= 0.1.2
-PORTREVISION= 5
+PORTVERSION= 0.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Enhanced timezone handling for Data.Time
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
index 24dac99ba60..1ead3afffaa 100644
--- a/devel/hs-timezone-series/distinfo
+++ b/devel/hs-timezone-series/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-series-0.1.2.tar.gz) = f719e45de1679c130759df553385739a58ebffcd6f93b3e02a2df6ca67a89b32
-SIZE (cabal/timezone-series-0.1.2.tar.gz) = 5923
+SHA256 (cabal/timezone-series-0.1.3.tar.gz) = e37034f21c309b700fcb1a50527f325c25e47969e3faf954a0ee659e4452232c
+SIZE (cabal/timezone-series-0.1.3.tar.gz) = 5416
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index e4a2d92aeb1..b22a1b076c6 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= transformers-base
-PORTVERSION= 0.4.1
-PORTREVISION= 9
+PORTVERSION= 0.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Lift computations from the bottom of a transformer stack
-LICENSE= BSD
-
-USE_CABAL= transformers>=0.2
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-transformers-base/distinfo b/devel/hs-transformers-base/distinfo
index 143e8ac7c48..81b1d7d7bd5 100644
--- a/devel/hs-transformers-base/distinfo
+++ b/devel/hs-transformers-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/transformers-base-0.4.1.tar.gz) = 4fa9e8ae38f0ed0633251f7a18c51946ee9fa486ed768389b5b6edaacf3c7cb4
-SIZE (cabal/transformers-base-0.4.1.tar.gz) = 2449
+SHA256 (cabal/transformers-base-0.4.2.tar.gz) = 35258378843a77ab786119ded355b8916f8ed31106e767fe3955ad04c42d1c0c
+SIZE (cabal/transformers-base-0.4.2.tar.gz) = 2538
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
new file mode 100644
index 00000000000..062e8ea276d
--- /dev/null
+++ b/devel/hs-transformers-compat/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= transformers-compat
+PORTVERSION= 0.3.3.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compatibility shim exposing the new types from transformers 0.3 and 0.4
+
+LICENSE= BSD3CLAUSE
+
+FLAGS_ENABLE= three
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-transformers-compat/distinfo b/devel/hs-transformers-compat/distinfo
new file mode 100644
index 00000000000..79201bc19f9
--- /dev/null
+++ b/devel/hs-transformers-compat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/transformers-compat-0.3.3.4.tar.gz) = 257712be0c2d5eedc6c835421751fce8daf45cf2687f2d6c27b92bff5e204bc1
+SIZE (cabal/transformers-compat-0.3.3.4.tar.gz) = 11143
diff --git a/devel/hs-transformers-compat/pkg-descr b/devel/hs-transformers-compat/pkg-descr
new file mode 100644
index 00000000000..82862576663
--- /dev/null
+++ b/devel/hs-transformers-compat/pkg-descr
@@ -0,0 +1,6 @@
+This package includes backported versions of types that were added to
+transformers in transformers 0.3 an 0.4 for users who need strict
+transformers 0.2 or 0.3 compatibility to run on old versions of the
+platform, but also need those types.
+
+WWW: http://github.com/ekmett/transformers-compat/
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
deleted file mode 100644
index a275ea3416d..00000000000
--- a/devel/hs-transformers/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= transformers
-PORTVERSION= 0.3.0.0
-PORTREVISION= 8
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Concrete functor monad transformers
-
-LICENSE= BSD
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-transformers/distinfo b/devel/hs-transformers/distinfo
deleted file mode 100644
index 053de5a1c86..00000000000
--- a/devel/hs-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/transformers-0.3.0.0.tar.gz) = e5aa0c1ec97ad98c389e78f59aca25ab028980a7068a3e585e39564662739591
-SIZE (cabal/transformers-0.3.0.0.tar.gz) = 20087
diff --git a/devel/hs-transformers/pkg-descr b/devel/hs-transformers/pkg-descr
deleted file mode 100644
index 4ab06b1b4c7..00000000000
--- a/devel/hs-transformers/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-A portable library of functor and monad transformers, inspired by the
-paper "Functional Programming with Overloading and Higher-Order
-Polymorphism" by Mark P Jones, in Advanced School of Functional
-Programming, 1995.
-
-This package contains:
-
- * the monad transformer class (in Control.Monad.Trans.Class)
- * concrete functor and monad transformers, each with associated
- operations and functions to lift operations associated with other
- transformers.
-
-It can be used on its own in portable Haskell code, or with the monad
-classes in the mtl or monads-tf packages, which automatically lift
-operations introduced by monad transformers through other transformers.
-
-WWW: http://hackage.haskell.org/package/transformers
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index d2c869c7b33..009c770eec5 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,13 +3,13 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unambiguous choice
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 6fdad34af86..fb3652510c9 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= uniplate
-PORTVERSION= 1.6.10
-PORTREVISION= 6
+PORTVERSION= 1.6.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Help writing simple, concise, and fast generic operations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hashable>=1.1.2.3 syb unordered-containers>=0.2.1
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index 3fa97fd5ae8..c0b8784e5f0 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uniplate-1.6.10.tar.gz) = 433aa7ac4bb939d27b4ed4b2fedf99d5768b51c18fc918914b1bd13ae9d61048
-SIZE (cabal/uniplate-1.6.10.tar.gz) = 30033
+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 da00a884f55..8c2fc31aa33 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.1
-PORTREVISION= 4
+PORTVERSION= 0.4.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Portable POSIX-compatibility layer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index bc749da7036..63f8be2f5e5 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.4.1.1.tar.gz) = ee45e5bf7e961b2f7fcc3ade90ac9db3a0a66857534e53da918d17c5bef156b2
-SIZE (cabal/unix-compat-0.4.1.1.tar.gz) = 13013
+SHA256 (cabal/unix-compat-0.4.1.3.tar.gz) = ab930a71d3cd9884a6c2bf58f330fa13c68cecb26d5cff20d435cdf69d1bdced
+SIZE (cabal/unix-compat-0.4.1.3.tar.gz) = 12823
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index 263ba85a577..39d110901bd 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,14 +1,18 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.1.8
-PORTREVISION= 4
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unix time parser/formatter and utilities
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${OSVERSION} >= 901000 && ${OSVERSION} < 902001 && ${ARCH} == i386
+EXTRA_PATCHES+= ${PATCHDIR}/nopatch-unix-time.cabal
+.endif
+
.include <bsd.port.mk>
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index 5bb9d3a8c67..35c54c6995a 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-time-0.1.8.tar.gz) = 5b17e5e88590e97478f8f12b168a5f917a2514c00328ff890bd51e0a491439e9
-SIZE (cabal/unix-time-0.1.8.tar.gz) = 35023
+SHA256 (cabal/unix-time-0.3.3.tar.gz) = 1dc532d337484e957777b462804ed0fcec00b126c69c24bd465b4ed14abe1c05
+SIZE (cabal/unix-time-0.3.3.tar.gz) = 39845
diff --git a/devel/hs-unix-time/files/nopatch-unix-time.cabal b/devel/hs-unix-time/files/nopatch-unix-time.cabal
new file mode 100644
index 00000000000..5b96f7aa063
--- /dev/null
+++ b/devel/hs-unix-time/files/nopatch-unix-time.cabal
@@ -0,0 +1,11 @@
+--- ./unix-time.cabal.orig 2014-07-16 02:47:31.000000000 +0200
++++ ./unix-time.cabal 2014-07-20 22:50:57.000000000 +0200
+@@ -15,8 +15,6 @@
+ Library
+ Default-Language: Haskell2010
+ GHC-Options: -Wall
+- if impl(ghc >= 7.8)
+- CC-Options: -fPIC
+ Exposed-Modules: Data.UnixTime
+ Other-Modules: Data.UnixTime.Conv
+ Data.UnixTime.Diff
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index 8008ff2b936..d8da141fd3d 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.3.1
-PORTREVISION= 4
+PORTVERSION= 0.2.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient hashing-based container types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hashable>=1.0.1.1
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index eff58f04bf5..4965f5c2acf 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.3.1.tar.gz) = a8d3bc3fad487fb6ef9f0082333cac3d4acf15cb5817ba4ff562a52c882f9f83
-SIZE (cabal/unordered-containers-0.2.3.1.tar.gz) = 25537
+SHA256 (cabal/unordered-containers-0.2.4.0.tar.gz) = 34eaeb0c96d84169aca7085cf21f89bedb4bdb4de2ac78358a087faeea93cdf4
+SIZE (cabal/unordered-containers-0.2.4.0.tar.gz) = 25638
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index fbbaf48c062..8c2ac1be58f 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= utf8-light
-PORTVERSION= 0.4.0.1
-PORTREVISION= 8
+PORTVERSION= 0.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unicode
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-utf8-light/distinfo b/devel/hs-utf8-light/distinfo
index a2db5c6c322..c435ede9d23 100644
--- a/devel/hs-utf8-light/distinfo
+++ b/devel/hs-utf8-light/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utf8-light-0.4.0.1.tar.gz) = 0524213aa380d5b882814332221bbf74ee3390060ac2aeee022923fc64775bf8
-SIZE (cabal/utf8-light-0.4.0.1.tar.gz) = 5746
+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 5de67b25cdc..6a9b24881bd 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= utf8-string
-PORTVERSION= 0.3.7
-PORTREVISION= 9
+PORTVERSION= 0.3.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for reading/writing UTF-8 strings for Haskell programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index e5d1b6d52af..dba40c800e6 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utf8-string-0.3.7.tar.gz) = 785b4b31476adab9d4ea553a9a6b590acb0b906836abb3facd218c18b8eea9e8
-SIZE (cabal/utf8-string-0.3.7.tar.gz) = 8845
+SHA256 (cabal/utf8-string-0.3.8.tar.gz) = 80757cbc00197ff71311dc8c1ca00284537442c2dc93f06685d369a6816d49c0
+SIZE (cabal/utf8-string-0.3.8.tar.gz) = 9129
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index b5d53d03f06..6f1d2cbb4b7 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= utility-ht
-PORTVERSION= 0.0.9
-PORTREVISION= 4
+PORTVERSION= 0.0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Various small helper functions
+COMMENT= Various small helper functions for Lists, Maybes, Tuples, Functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-utility-ht/distinfo b/devel/hs-utility-ht/distinfo
index 8fccd32fb81..569d4554023 100644
--- a/devel/hs-utility-ht/distinfo
+++ b/devel/hs-utility-ht/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utility-ht-0.0.9.tar.gz) = 19696de8e1130783578b3af82390a12a2bac6a64c485cb35004d86e27897b5d4
-SIZE (cabal/utility-ht-0.0.9.tar.gz) = 19399
+SHA256 (cabal/utility-ht-0.0.10.tar.gz) = ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f
+SIZE (cabal/utility-ht-0.0.10.tar.gz) = 20103
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 65551b201ea..16974934b59 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -2,13 +2,13 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Attribute Grammar System of Universiteit Utrecht
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uulib>=0.9.14
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index c956c4812ca..2992d2a5134 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= uuagc-cabal
-PORTVERSION= 1.0.4.0
-PORTREVISION= 7
+PORTVERSION= 1.0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cabal plugin for the Universiteit Utrecht Attribute Grammar System
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=2.0.1.0 uulib>=0.9.14
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index c54907888f1..463c6513eec 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-cabal-1.0.4.0.tar.gz) = 8e92ccb48ece047cbf8d1681f9ce8ed6e6f0412f27e82152eb8dfdbc1c45d854
-SIZE (cabal/uuagc-cabal-1.0.4.0.tar.gz) = 14544
+SHA256 (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 45f6c6038bc3f0d35e35ae6591fab58dd7268dac107cfc3fe7c2b4af5f60795c
+SIZE (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 14689
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 273aff03ec0..0c7641a9c1c 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= uuagc
-PORTVERSION= 0.9.42.3
-PORTREVISION= 4
+PORTVERSION= 0.9.51
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Attribute Grammar System of Universiteit Utrecht
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
uulib>=0.9.14
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index b5399e75f4f..30552b8eed7 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-0.9.42.3.tar.gz) = 76143fc616d86dc1d6aefae67da56b4c3b607cd126483ee054648bc718e6c066
-SIZE (cabal/uuagc-0.9.42.3.tar.gz) = 614198
+SHA256 (cabal/uuagc-0.9.51.tar.gz) = 5c084940d3246dfc5ed4ca818dea2cdf070852b2a091442ff281f422caabde1e
+SIZE (cabal/uuagc-0.9.51.tar.gz) = 791376
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 4dd0ae33fad..8f6d3fd1d75 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.2.13
-PORTREVISION= 4
+PORTVERSION= 1.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Creating, comparing, parsing and printing Universally Unique Identifiers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cryptohash>=0.7 maccatcher>=1.0 random>=1.0.1
+USE_CABAL= cryptohash>=0.7 hashable network-info random>=1.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index 35d25c3feb5..16d261a4da5 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuid-1.2.13.tar.gz) = 1af05fce9c2e3b2c6074f38e3dedf43abea9cf788270fab2df75a98d63383979
-SIZE (cabal/uuid-1.2.13.tar.gz) = 13570
+SHA256 (cabal/uuid-1.3.3.tar.gz) = 15204a7399ce8d06743c9e20a554f0dbad36e70d848fcd34e70b5f9bebd54e8b
+SIZE (cabal/uuid-1.3.3.tar.gz) = 17303
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 8b56e25e0db..024007d0a86 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.15
-PORTREVISION= 5
+PORTVERSION= 0.9.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell Utrecht Tools Library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 6f9c58ee09a..0d295c366ca 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uulib-0.9.15.tar.gz) = f58b806ab7ec896f8d66b5f51742fc28057fbfaba969102b26808d4420d46310
-SIZE (cabal/uulib-0.9.15.tar.gz) = 44135
+SHA256 (cabal/uulib-0.9.16.tar.gz) = 834a75fb88ce508350ae974fd5b66bb0c60e56f2bbb77ca430b25327c289a919
+SIZE (cabal/uulib-0.9.16.tar.gz) = 44333
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index a6aac3f6941..de4d764f5dd 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.2.0.4
-PORTREVISION= 5
+PORTVERSION= 0.3.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Persistent store for values of arbitrary types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1 unordered-containers>=0.2.1.0
+USE_CABAL= hashable>=1.1.2.5 unordered-containers>=0.2.3.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 9464ba2d9bd..6bfd66f29e0 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vault-0.2.0.4.tar.gz) = c32a85ee84455c3a03ed7142d5adb60d2e7e0e467ba6458c549c5c3db3cac3a8
-SIZE (cabal/vault-0.2.0.4.tar.gz) = 4883
+SHA256 (cabal/vault-0.3.0.3.tar.gz) = 056ad8ffe6059d005b12159cdf781cccd14193bb0b30e960509b3dbee438f272
+SIZE (cabal/vault-0.3.0.3.tar.gz) = 4906
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 1713322bb2e..ae5b9185274 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= vector-algorithms
-PORTVERSION= 0.5.4.2
-PORTREVISION= 6
+PORTVERSION= 0.6.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient algorithms for vector arrays
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= primitive>=0.3 vector>=0.6
+USE_CABAL= mtl mwc-random primitive>=0.3 vector>=0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index 0c9a0eadba0..b7feb69cb68 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-algorithms-0.5.4.2.tar.gz) = c42c35dcf23cb60b874e50d6fec894463c835d6e2ef71d02283039f86635eb22
-SIZE (cabal/vector-algorithms-0.5.4.2.tar.gz) = 22938
+SHA256 (cabal/vector-algorithms-0.6.0.3.tar.gz) = c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf
+SIZE (cabal/vector-algorithms-0.6.0.3.tar.gz) = 20273
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
new file mode 100644
index 00000000000..3efdb0df496
--- /dev/null
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= vector-binary-instances
+PORTVERSION= 0.2.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Instances of Data.Binary and Data.Serialize for vector
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= cereal vector>=0.6
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo
new file mode 100644
index 00000000000..eaf71dc2946
--- /dev/null
+++ b/devel/hs-vector-binary-instances/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 9450018a61ee5a62b802c1b2cfe8d289b7c8f3debeb0f8828679a4c085d31909
+SIZE (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 3114
diff --git a/devel/hs-vector-binary-instances/pkg-descr b/devel/hs-vector-binary-instances/pkg-descr
new file mode 100644
index 00000000000..dd79d151789
--- /dev/null
+++ b/devel/hs-vector-binary-instances/pkg-descr
@@ -0,0 +1,6 @@
+Instances for Binary for the types defined in the vector package, making
+it easy to serialize vectors to and from disk. We use the generic
+interface to vectors, so all vector types are supported. Specific
+instances are provided for unboxed, boxed and storable vectors.
+
+WWW: https://github.com/bos/vector-binary-instances
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
new file mode 100644
index 00000000000..297dca1bdb3
--- /dev/null
+++ b/devel/hs-vector-instances/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= vector-instances
+PORTVERSION= 3.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Orphan Instances for 'Data.Vector'
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= comonad>=3 keys>=3 pointed>=3 semigroupoids>=3 \
+ semigroups>=0.8.3.1 vector>=0.9
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-vector-instances/distinfo b/devel/hs-vector-instances/distinfo
new file mode 100644
index 00000000000..8b3e7d141e5
--- /dev/null
+++ b/devel/hs-vector-instances/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/vector-instances-3.3.tar.gz) = bee0ea0636363ddd20324deb9929e3edc5058df5c4b71d10d4aeb11dc54d3c46
+SIZE (cabal/vector-instances-3.3.tar.gz) = 3596
diff --git a/devel/hs-vector-instances/pkg-descr b/devel/hs-vector-instances/pkg-descr
new file mode 100644
index 00000000000..a8c69b37ae5
--- /dev/null
+++ b/devel/hs-vector-instances/pkg-descr
@@ -0,0 +1,3 @@
+Orphan Instances for Data.Vector.
+
+WWW: http://github.com/ekmett/vector-instances
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
new file mode 100644
index 00000000000..249bfe19166
--- /dev/null
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= vector-th-unbox
+PORTVERSION= 0.2.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Deriver for Data.Vector.Unboxed using Template Haskell
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= vector>=0.7
+
+.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
new file mode 100644
index 00000000000..5398d739fb3
--- /dev/null
+++ b/devel/hs-vector-th-unbox/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/vector-th-unbox-0.2.1.0.tar.gz) = 30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65
+SIZE (cabal/vector-th-unbox-0.2.1.0.tar.gz) = 4362
diff --git a/devel/hs-vector-th-unbox/pkg-descr b/devel/hs-vector-th-unbox/pkg-descr
new file mode 100644
index 00000000000..f94930ec58e
--- /dev/null
+++ b/devel/hs-vector-th-unbox/pkg-descr
@@ -0,0 +1,5 @@
+A Template Haskell deriver for unboxed vectors, given a pair of coercion
+functions to and from some existing type with an Unbox instance. Refer
+to "Data.Vector.Unboxed.Deriving" for documentation and examples.
+
+WWW: http://hackage.haskell.org/package/vector-th-unbox
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index b3a5314f6d2..a40dd13b619 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= vector
-PORTVERSION= 0.10.0.1
-PORTREVISION= 6
+PORTVERSION= 0.10.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient Arrays
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= primitive>=0.5
+USE_CABAL= primitive>=0.5.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index d03cef6903b..e0092611c1d 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-0.10.0.1.tar.gz) = ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af
-SIZE (cabal/vector-0.10.0.1.tar.gz) = 102426
+SHA256 (cabal/vector-0.10.9.1.tar.gz) = 205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5
+SIZE (cabal/vector-0.10.9.1.tar.gz) = 101693
diff --git a/devel/hs-vector/pkg-descr b/devel/hs-vector/pkg-descr
index 1ecbf86a923..2dce1f34ba7 100644
--- a/devel/hs-vector/pkg-descr
+++ b/devel/hs-vector/pkg-descr
@@ -1,4 +1,5 @@
An efficient implementation of Int-indexed arrays (both mutable and
immutable), with a powerful loop fusion optimization framework.
-WWW: http://code.haskell.org/vector
+WWW: https://github.com/haskell/vector
+
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 45212f9aaba..275ce61df0f 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.6
-PORTREVISION= 4
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell 98 logically uninhabited data type
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hashable>=1.1 semigroups>=0.8.2
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index 12e929b98af..8026447e48e 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.6.tar.gz) = 3668a66ec838465c78b1fe4c6fff0080aeed5b232e4854894a4d5c868f922d3c
-SIZE (cabal/void-0.6.tar.gz) = 3795
+SHA256 (cabal/void-0.6.1.tar.gz) = 82ec2a7edf3fa52eba2ed4821306859a75186e6df2a564943e9f9d758205ea26
+SIZE (cabal/void-0.6.1.tar.gz) = 3807
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 46de1c65e7b..a4922193a72 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= word8
-PORTVERSION= 0.0.3
-PORTREVISION= 5
+PORTVERSION= 0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Word8 library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 4206b9457c5..85a7f7b52a9 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/word8-0.0.3.tar.gz) = 458473a9a6c20e755197d5a8cf6e31cbfa88e84b5318e6103ffcb57843c2bacc
-SIZE (cabal/word8-0.0.3.tar.gz) = 5848
+SHA256 (cabal/word8-0.1.1.tar.gz) = 398d201b9bfb839d55bbb72afc8b73e34dcbda2e76f4f13a5db946a61404eaf6
+SIZE (cabal/word8-0.1.1.tar.gz) = 5891
diff --git a/devel/pure-gen/Makefile b/devel/pure-gen/Makefile
index 5f1747cdede..76cedfce8b3 100644
--- a/devel/pure-gen/Makefile
+++ b/devel/pure-gen/Makefile
@@ -14,7 +14,7 @@ COMMENT= C interface generator for the Pure language
LICENSE= BSD
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- hs-language-c>=0.3.2:${PORTSDIR}/devel/hs-language-c
+ hs-language-c>=0.4:${PORTSDIR}/devel/hs-language-c
NO_STAGE= yes
diff --git a/devel/pure-gen/files/patch-dump-ast.hs b/devel/pure-gen/files/patch-dump-ast.hs
deleted file mode 100644
index 9770d722ea2..00000000000
--- a/devel/pure-gen/files/patch-dump-ast.hs
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./dump-ast.hs.orig 2011-09-09 11:13:26.000000000 +0200
-+++ ./dump-ast.hs 2012-05-15 20:30:49.000000000 +0200
-@@ -147,13 +147,10 @@
- dump (CFDefExt cFunDef) = parens $ "CFDefExt "++ dump cFunDef
- -- The version of CAsmExt in the repository has an additional second
- -- argument. Uncomment this if needed.
-- dump (CAsmExt cStrLit _) = parens $ "CAsmExt " ++ dump cStrLit
-+ dump (CAsmExt cStrLit) = parens $ "CAsmExt " ++ dump cStrLit
- --dump (CAsmExt cStrLit) = parens $ "CAsmExt " ++ dump cStrLit
-
--cDeclFile (CDecl _ _ nodeInfo) =
-- case fileOfNode nodeInfo of
-- Nothing -> ""
-- Just filePath -> "\"" ++ filePath ++ "\""
-+cDeclFile (CDecl _ _ nodeInfo) = "\"" ++ fileOfNode nodeInfo ++ "\""
-
- -- | C function definition (C99 6.9.1, K&R A10.1)
- --
diff --git a/dns/Makefile b/dns/Makefile
index b54ad89c0e1..aaa038c5527 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -58,6 +58,8 @@
SUBDIR += ghtool
SUBDIR += hesiod
SUBDIR += hostdb
+ SUBDIR += hs-dns
+ SUBDIR += hs-gnuidn
SUBDIR += idnkit
SUBDIR += idnkit2
SUBDIR += inadyn
diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile
new file mode 100644
index 00000000000..530cdff9cb4
--- /dev/null
+++ b/dns/hs-dns/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= dns
+PORTVERSION= 1.4.2
+CATEGORIES= dns haskell
+
+MAINTAINER= haskell@FreeBSD.org
+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
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/dns/hs-dns/distinfo b/dns/hs-dns/distinfo
new file mode 100644
index 00000000000..fb7959caa8f
--- /dev/null
+++ b/dns/hs-dns/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/dns-1.4.2.tar.gz) = 1992c34b8c7cba12efb5c84cb69f274e4404cb3cc4c933be584ee1585561dbf5
+SIZE (cabal/dns-1.4.2.tar.gz) = 19623
diff --git a/dns/hs-dns/pkg-descr b/dns/hs-dns/pkg-descr
new file mode 100644
index 00000000000..18f0d6e8343
--- /dev/null
+++ b/dns/hs-dns/pkg-descr
@@ -0,0 +1,4 @@
+A thread-safe DNS library for both clients and servers written in pure
+Haskell.
+
+WWW: http://hackage.haskell.org/package/dns
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
new file mode 100644
index 00000000000..881d2d8f957
--- /dev/null
+++ b/dns/hs-gnuidn/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= gnuidn
+PORTVERSION= 0.2.1
+CATEGORIES= dns haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings for GNU IDN
+
+LICENSE= GPLv3
+
+USE_CABAL= text
+USE_C2HS= yes
+
+USES= pkgconfig
+LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/dns/hs-gnuidn/distinfo b/dns/hs-gnuidn/distinfo
new file mode 100644
index 00000000000..cd52d8e83ea
--- /dev/null
+++ b/dns/hs-gnuidn/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/gnuidn-0.2.1.tar.gz) = 67744c8559ed5c722c53c7a4c2a37821b59ede4b9288ceb995410ec6cb3031ca
+SIZE (cabal/gnuidn-0.2.1.tar.gz) = 16392
diff --git a/dns/hs-gnuidn/pkg-descr b/dns/hs-gnuidn/pkg-descr
new file mode 100644
index 00000000000..d8912662cbe
--- /dev/null
+++ b/dns/hs-gnuidn/pkg-descr
@@ -0,0 +1,3 @@
+Bindings for GNU IDN.
+
+WWW: https://john-millikin.com/software/haskell-gnuidn/
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index a724591d0a7..6b14f9eebbd 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,13 +2,13 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell binding to libcurl
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
diff --git a/games/hedgewars/files/patch-gameServer__Actions.hs b/games/hedgewars/files/patch-gameServer__Actions.hs
new file mode 100644
index 00000000000..9c02e8860bc
--- /dev/null
+++ b/games/hedgewars/files/patch-gameServer__Actions.hs
@@ -0,0 +1,11 @@
+--- ./gameServer/Actions.hs.orig 2014-01-08 17:25:17.000000000 +0100
++++ ./gameServer/Actions.hs 2014-08-10 23:44:17.631500480 +0200
+@@ -562,7 +562,7 @@
+ si <- gets serverInfo
+ newClId <- io $ do
+ ci <- addClient rnc cl
+- _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci)
++ _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x)
+
+ infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl))
+
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index 927a26188d7..2d3fb13d130 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= HGL
-PORTVERSION= 3.2.0.2
-PORTREVISION= 14
+PORTVERSION= 3.2.0.5
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple Haskell graphics library based on X11 or Win32
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= X11
diff --git a/graphics/hs-HGL/distinfo b/graphics/hs-HGL/distinfo
index a01b658da4f..d1b37ef3581 100644
--- a/graphics/hs-HGL/distinfo
+++ b/graphics/hs-HGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HGL-3.2.0.2.tar.gz) = 7f0734d1a8a8ad1fdfff44b7838a2d8e6aef025a08549461bc2946b78cdb8c8f
-SIZE (cabal/HGL-3.2.0.2.tar.gz) = 38914
+SHA256 (cabal/HGL-3.2.0.5.tar.gz) = 8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d
+SIZE (cabal/HGL-3.2.0.5.tar.gz) = 39012
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
deleted file mode 100644
index d09a4cb1168..00000000000
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./Graphics/HGL/Internals/Utilities.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/Internals/Utilities.hs 2013-05-01 01:30:47.000000000 +0200
-@@ -20,7 +20,7 @@
- modMVar, modMVar_
- ) where
-
--import qualified Control.Exception as E (bracket, try, IOException, tryJust, ioErrors)
-+import qualified Control.Exception as E (bracket, try, IOException, tryJust)
- import Control.Concurrent( MVar, takeMVar, putMVar )
-
- bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c
-@@ -32,15 +32,7 @@
-
- type Exception = E.IOException
- safeTry :: IO a -> IO (Either Exception a)
--
--#if __GLASGOW_HASKELL >= 610
---- ghc-6.10
- safeTry = E.try
--#else
---- ghc 6.8 (and below?)
--safeTry = E.tryJust E.ioErrors
--#endif
--
-
- ----------------------------------------------------------------
- -- Utilities
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs
deleted file mode 100644
index 5e29c6df339..00000000000
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Graphics/HGL/Run.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/Run.hs 2013-05-01 01:51:50.000000000 +0200
-@@ -24,7 +24,7 @@
- import Graphics.HGL.Internals.Utilities (safeTry)
- import Control.Concurrent (forkIO, yield)
- import Data.IORef( newIORef, readIORef, writeIORef )
--import System.IO.Error (try)
-+import System.IO.Error (tryIOError)
- #endif
-
- ----------------------------------------------------------------
-@@ -60,7 +60,7 @@
- beginGraphics
- quit <- newIORef False
- safeTry $ do
-- forkIO (try m >> writeIORef quit True)
-+ forkIO (tryIOError m >> writeIORef quit True)
- yield
- handleEvents (readIORef quit)
- endGraphics
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs
deleted file mode 100644
index 0951e6ec3ee..00000000000
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./Graphics/HGL/X11/Display.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/X11/Display.hs 2013-05-01 02:01:44.000000000 +0200
-@@ -14,12 +14,12 @@
- import Control.Monad (when)
- import Data.Maybe (isJust)
- import System.Environment (getEnv)
--import System.IO.Error (try)
-+import System.IO.Error (tryIOError, catchIOError)
- import System.IO.Unsafe (unsafePerformIO)
-
- getDisplayName :: IO String
- getDisplayName = do
-- disp <- try (getEnv "DISPLAY")
-+ disp <- tryIOError (getEnv "DISPLAY")
- return (either (const ":0.0") id disp)
-
- displayRef :: MVar (Maybe X.Display)
-@@ -32,7 +32,7 @@
- openDisplay'
- where
- openDisplay' = do
-- display <- X.openDisplay host `catch` \ err ->
-+ display <- X.openDisplay host `catchIOError` \ err ->
- ioError (userError ("Unable to open X display " ++ host))
- modMVar displayRef (const $ Just display)
- return display
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs
deleted file mode 100644
index 892c5fe7535..00000000000
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Graphics/HGL/X11/Types.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/X11/Types.hs 2013-05-01 01:53:35.000000000 +0200
-@@ -30,6 +30,7 @@
- import Control.Concurrent.MVar (MVar)
- import Data.Bits
- import Data.Word (Word8)
-+import System.IO.Error
-
- ----------------------------------------------------------------
- -- Units
-@@ -84,8 +85,7 @@
- (X.Color p _ _ _ _) <-
- X.allocColor display color_map (X.Color 0 r g b xcolor_flags)
- return p)
-- `catch` \ err ->
-- print err >> return 0
-+ `catchIOError` \err -> print err >> return 0
- -- ioError (userError ("Error: " ++ show err
- -- ++ "\nUnable to allocate colo[u]r " ++ show (r,g,b)
- -- ++ " - I'll bet you're running Netscape."))
diff --git a/graphics/hs-HGL/files/patch-HGL.cabal b/graphics/hs-HGL/files/patch-HGL.cabal
deleted file mode 100644
index 3733424e49f..00000000000
--- a/graphics/hs-HGL/files/patch-HGL.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./HGL.cabal.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./HGL.cabal 2011-03-13 18:29:56.867337655 +0100
-@@ -22,7 +22,7 @@
-
- library
- if flag(split-base)
-- build-depends: base >= 3 && < 4, array
-+ build-depends: base >= 3, array
- else
- build-depends: base < 2
- exposed-modules:
diff --git a/graphics/hs-HGL/pkg-descr b/graphics/hs-HGL/pkg-descr
index 893d95650fd..b4b577c9b34 100644
--- a/graphics/hs-HGL/pkg-descr
+++ b/graphics/hs-HGL/pkg-descr
@@ -1,10 +1,8 @@
-A simple graphics library, designed to give the programmer access to most
-interesting parts of the Win32 Graphics Device Interface and X11 library
-without exposing the programmer to the pain and anguish usually associated with
-using these interfaces.
+A simple graphics library, designed to give the programmer access to
+most interesting parts of the Win32 Graphics Device Interface and X11
+library without exposing the programmer to the pain and anguish usually
+associated with using these interfaces. The library also includes a
+module Graphics.SOE providing the interface used in "The Haskell School
+of Expression", by Paul Hudak.
-The library also includes a module Graphics.SOE providing the interface used
-in "The Haskell School of Expression", by Paul Hudak,
-cf <http://www.haskell.org/soe/>.
-
-WWW: http://www.haskell.org/graphics/index.html
+WWW: http://hackage.haskell.org/package/HGL
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 939c8493878..75f31bd54cf 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= cairo
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Cairo library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools mtl
+USE_CABAL= gtk2hs-buildtools mtl utf8-string>=0.2
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:${PORTSDIR}/graphics/cairo
diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo
index 73b76d2f3d3..db93abd2286 100644
--- a/graphics/hs-cairo/distinfo
+++ b/graphics/hs-cairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cairo-0.12.4.tar.gz) = 783943379a6b02e8645dd29960e057bea8d05a7afa12a918d87e54d561b7c63f
-SIZE (cabal/cairo-0.12.4.tar.gz) = 50933
+SHA256 (cabal/cairo-0.12.5.3.tar.gz) = e7edb538745a6f0aa1c0c1574b6549a799240912f9c5047c3d8ca1ffdbb1bcbc
+SIZE (cabal/cairo-0.12.5.3.tar.gz) = 53447
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index a2cc225766b..d912715febb 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -2,13 +2,13 @@
PORTNAME= dia-base
PORTVERSION= 0.1.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= EDSL for teaching Haskell with diagrams - data types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/graphics/hs-dia-base/files/patch-dia-base.cabal b/graphics/hs-dia-base/files/patch-dia-base.cabal
new file mode 100644
index 00000000000..dc90e48c18b
--- /dev/null
+++ b/graphics/hs-dia-base/files/patch-dia-base.cabal
@@ -0,0 +1,11 @@
+--- ./dia-base.cabal.orig 2012-09-11 09:44:42.000000000 +0200
++++ ./dia-base.cabal 2014-07-12 22:27:19.000000000 +0200
+@@ -27,7 +27,7 @@
+ Graphics.Diagrams
+
+ Build-Depends:
+- base >= 4.0 && < 4.7,
++ base >= 4.0 && < 4.8,
+ deepseq >= 1.1 && < 1.4
+
+
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index 1ca80c3c98e..3136c0a0eb8 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -2,15 +2,15 @@
PORTNAME= dia-functions
PORTVERSION= 0.2.1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= EDSL for teaching Haskell with diagrams - functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0 xhtml>=3000.2
+USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0
.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 00000000000..6d134c18c85
--- /dev/null
+++ b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
@@ -0,0 +1,11 @@
+--- ./dia-functions.cabal.orig 2012-09-11 09:47:34.000000000 +0200
++++ ./dia-functions.cabal 2014-07-13 01:36:21.000000000 +0200
+@@ -30,7 +30,7 @@
+ Build-Depends:
+ data-pprint >= 0.2 && < 0.3,
+ dia-base >= 0.1 && < 0.2,
+- base >= 4.0 && < 4.7,
++ base >= 4.0 && < 4.8,
+ containers >= 0.4 && < 0.6,
+ xhtml >= 3000.2 && < 3000.3,
+ mtl >= 2.0 && < 2.2,
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index 5ce78a262bb..f30af8d8265 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= soegtk
PORTVERSION= 0.12.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 47a07b3fceb..755573486bc 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= svgcairo
-PORTVERSION= 0.12.1.1
-PORTREVISION= 8
+PORTVERSION= 0.12.5.2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the libsvg-cairo library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= cairo>=0.12 glib>=0.12 mtl
+USE_CABAL= cairo>=0.12.5.0 glib>=0.12.5.0 mtl
USE_GNOME= librsvg2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-svgcairo/distinfo b/graphics/hs-svgcairo/distinfo
index 91905b56bb2..6a0067675cf 100644
--- a/graphics/hs-svgcairo/distinfo
+++ b/graphics/hs-svgcairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/svgcairo-0.12.1.1.tar.gz) = 0bbe3b204ed4f4286abfdea2ae2f7111f0d191bf9decfe7de63b2fb23575893a
-SIZE (cabal/svgcairo-0.12.1.1.tar.gz) = 12896
+SHA256 (cabal/svgcairo-0.12.5.2.tar.gz) = 94a428cae854e8d99c16d76838c602298beafd36bd36d92b4ff396f6dd006950
+SIZE (cabal/svgcairo-0.12.5.2.tar.gz) = 13759
diff --git a/graphics/hs-svgcairo/pkg-descr b/graphics/hs-svgcairo/pkg-descr
index e5151924327..bd9cdf7ca3f 100644
--- a/graphics/hs-svgcairo/pkg-descr
+++ b/graphics/hs-svgcairo/pkg-descr
@@ -1,3 +1,3 @@
Svgcairo is used to render SVG with cairo.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index ca69ee618a9..766a7e41b58 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ghc
-PORTVERSION= 7.6.3
-PORTREVISION= 4
+PORTVERSION= 7.8.3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -23,17 +22,17 @@ HSCOLOUR_VERSION= 1.20.3
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.* ghc-7.4.*
+CONFLICTS= ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.*
LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
USE_AUTOTOOLS= autoconf autoheader
USE_PERL5= build
-USES= gmake iconv perl5 ncurses tar:bzip2
+USES= gmake iconv:translit perl5 ncurses tar:bzip2
USE_BINUTILS= yes
USE_GCC= yes
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
@@ -68,15 +67,23 @@ OPTIONS_DEFINE+= BOOTH
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDYNAMIC}
+# The version number is needed as lang/gcc installs a different version
LIB_DEPENDS+= libffi.so.6:${PORTSDIR}/devel/libffi
.endif
+# Earlier versions of FreeBSD 9 cannot do proper resolution for $ORIGIN (due
+# to a bug in rtld(1)), so disable it by default there. This shall go away
+# once 9.2 becomes the latest supported release in that branch.
+.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
+EXTRA_PATCHES+= ${PATCHDIR}/nopatch-rules__distdir-way-opts.mk
+
+BUILD_DEPENDS+= chrpath:${PORTSDIR}/devel/chrpath
+.endif
+
.if empty(PORT_OPTIONS:MBOOT)
BOOT_GHC_VERSION= 7.6.3
-EXTRA_PATCHES= ${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in
-
.if ${ARCH} == "i386"
.if ${OSVERSION} >= 1000043
@@ -118,10 +125,8 @@ CONFIGURE_ARGS= --with-gcc=${CC} \
--with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib
-.if ${OSVERSION} < 1000043
CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
-.endif
.if ${PORT_OPTIONS:MDYNAMIC}
CONFIGURE_ARGS+= --with-system-libffi \
@@ -130,11 +135,11 @@ CONFIGURE_ARGS+= --with-system-libffi \
.endif
.if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt32:${PORTSDIR}/devel/llvm32
-RUN_DEPENDS+= ${LOCALBASE}/bin/opt32:${PORTSDIR}/devel/llvm32
+BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+RUN_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
-CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt32 \
- --with-llc=${LOCALBASE}/bin/llc32
+CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt34 \
+ --with-llc=${LOCALBASE}/bin/llc34
.endif
.if empty(PORT_OPTIONS:MBOOT)
@@ -231,8 +236,7 @@ post-extract:
@${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 "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot"
-# @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar"
+ @${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0"
post-install-script:
@${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \
@@ -259,31 +263,18 @@ post-install-script:
@${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \
's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
-#post-build:
-# @(cd ${WRKSRC} && ${MAKE_CMD} binary-dist)
-#
-#do-install:
-# @${NONE}
-
post-patch:
-# Hack don't to install the internal haddock.
- @${REINPLACE_CMD} -e 's+\(DO_NOT_INSTALL =\)+\1 haddock+' \
- ${WRKSRC}/utils/Makefile
-
-.if ${PORT_OPTIONS:MBOOT}
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/rts/package.conf.in \
- ${WRKSRC}/libraries/Makefile
-.else
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/../ghc-${BOOT_GHC_VERSION}-boot/rts/package.conf.in \
- ${WRKSRC}/rts/package.conf.in \
- ${WRKSRC}/libraries/Makefile
+ @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+ s|%%AR%%|${AR}|; \
+ s|%%RANLIB%%|${RANLIB}|; \
+ s|%%LD%%|${LD}|' \
+ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+# FreeBSD 9.{0,1} oddity workaround, part 2 (see above)
+.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
+ @${REINPLACE_CMD} -e 's|%%GHC_LIBDIR%%|${GHC_LIBDIR}|g' \
+ ${WRKSRC}/rules/distdir-way-opts.mk
.endif
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/configure
-
pre-configure:
@${MKDIR} ${TMPDIR}
.if empty(PORT_OPTIONS:MBOOT)
@@ -317,7 +308,6 @@ pre-configure:
.endif
post-install:
- # cabalised hs-foo-ghc ports
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/cabal/ghc-${GHC_VERSION}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
@@ -326,5 +316,14 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
.endif
+# FreeBSD 9.{0,1} oddity workaround, part 3 (see above)
+.if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
+ @(for f in $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so' | ${GREP} -v libHSrts); do \
+ chrpath -r $$(chrpath $$f | ${CUT} -d '=' -f2 | ${SED} 's|${GHC_LIBDIR}|${PREFIX}/${GHC_LIBDIR_REL}|g') $$f; \
+ done)
+.endif
+ @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \
+ $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \
+ ${STRIP_CMD} $$f; done)
.include <bsd.port.mk>
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 5264581ccfa..8cfb213cbaf 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -86,10 +86,10 @@ 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/opt32 \
- --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc32
+ --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt34 \
+ --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc34
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt32:${PORTSDIR}/devel/llvm32
+BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
.endif
.if defined(USE_ALEX)
@@ -249,14 +249,14 @@ do-build:
.endif # target(do-build)
.endif # !METAPORT
-.if defined(MAN1)
-.for man in ${MAN1}
+.if defined(MAN1PAGES)
+.for man in ${MAN1PAGES}
PLIST_FILES+= man/man1/${man}.gz
.endfor
.endif
-.if defined(MAN5)
-.for man in ${MAN5}
+.if defined(MAN5PAGES)
+.for man in ${MAN5PAGES}
PLIST_FILES+= man/man5/${man}.gz
.endfor
.endif
@@ -281,8 +281,8 @@ do-install:
.endif
.if defined(MAN1SRC)
-.for man in ${MAN1}
- @${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${STAGEDIR}${PREFIX}/man/man1
+.for man in ${MAN1PAGES}
+ @${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1
.endfor
.endif # MAN1SRC
@@ -306,6 +306,13 @@ post-install-script:
.for exe in ${EXECUTABLE}
@${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
.endfor
+.if defined(STANDALONE) && !${PORT_OPTIONS:MDYNAMIC}
+ @for dir in lib share share/doc share/examples; do \
+ if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal/ghc-${GHC_VERSION} ]; then \
+ echo "@dirrmtry $${dir}/cabal/ghc-${GHC_VERSION}" >> ${TMPPLIST}; fi ; \
+ if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal ]; then \
+ echo "@dirrmtry $${dir}/cabal" >> ${TMPPLIST}; fi ; done
+.endif
.endif
.endif # target(post-install-script)
@@ -325,7 +332,7 @@ add-plist-cabal:
.endif
.if !defined(STANDALONE)
- @${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh' >> ${TMPPLIST}
+ @${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
.endif
.if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 087ae340b47..ca06b7974bc 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -17,7 +17,8 @@ LOCALBASE?= /usr/local
GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION= 7.6.3
+
+GHC_VERSION?= 7.8.3
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
DYNAMIC_DESC?= Add support for dynamic linking
@@ -37,7 +38,7 @@ OPTIONS_DEFINE+= PROFILE
OPTIONS_DEFINE+= LLVM
.endif
-.if (!exists(${GHC_CMD}) || (exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html))) && !defined(NOPORTDOCS)
+.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(IGNORE_DOCS)
OPTIONS_DEFINE+= DOCS
OPTIONS_DEFAULT+= DOCS
HADDOCK_AVAILABLE= yes
@@ -51,4 +52,76 @@ OPTIONS_DEFINE+= HSCOLOUR
IGNORE?= options fail: bsd.cabal.mk already includes bsd.options.mk
.endif
+OPTIONS_DEFINE+= ${FLAGS_DEFINE}
+OPTIONS_SINGLE+= ${FLAGS_SINGLE}
+OPTIONS_MULTI+= ${FLAGS_MULTI}
+OPTIONS_DEFAULT+= ${FLAGS_DEFAULT}
+
+_ALL_FLAGS:= ${FLAGS_DEFINE} ${FLAGS_SINGLE} ${FLAGS_MULTI}
+_COMPLETE_FLAGS= ${_ALL_FLAGS}
+
+.for f in ${_ALL_FLAGS}
+. if defined(FLAGS_SINGLE_${f})
+_COMPLETE_FLAGS+= ${FLAGS_SINGLE_${f}}
+OPTIONS_SINGLE_${f}= ${FLAGS_SINGLE_${f}}
+. endif
+. if defined(FLAGS_MULTI_${f})
+_COMPLETE_FLAGS+= ${FLAGS_MULTI_${f}}
+OPTIONS_MULTI_${f}= ${FLAGS_MULTI_${f}}
+. endif
+.endfor
+
.include <bsd.port.options.mk>
+
+.for f in ${_COMPLETE_FLAGS}
+. if defined(${f}_FLAG_DEPENDS)
+. for r in ${${f}_FLAG_DEPENDS}
+. if !${PORT_OPTIONS:M${r}}
+_${f}_DEPENDS_FAIL= yes
+. endif
+. endfor
+. endif
+. if ${PORT_OPTIONS:M${f}} && !defined(_${f}_DEPENDS_FAIL)
+. if defined(${f}_FLAG_ENABLE)
+CONFIGURE_ARGS+= --flags="${${f}_FLAG_ENABLE}"
+. endif
+. if defined(${f}_FLAG_CONFIGURE_ON)
+CONFIGURE_ARGS+= ${${f}_FLAG_CONFIGURE_ON}
+. endif
+. if defined(${f}_FLAG_CABAL)
+USE_CABAL+= ${${f}_FLAG_CABAL}
+. endif
+. if defined(${f}_FLAG_EXECUTABLE)
+EXECUTABLE+= ${${f}_FLAG_EXECUTABLE}
+. endif
+. if defined(${f}_FLAG_LIB)
+LIB_DEPENDS+= ${${f}_FLAG_LIB}
+. endif
+. if defined(${f}_FLAG_XORG)
+USE_XORG+= ${${f}_FLAG_XORG}
+. endif
+. if defined(${f}_BROKEN)
+BROKEN= ${${f}_BROKEN} with the ${f} flag enabled
+. endif
+. if defined(${f}_DYNAMIC_BROKEN) && ${PORT_OPTIONS:MDYNAMIC}
+BROKEN= ${${f}_DYNAMIC_BROKEN}
+. endif
+. else
+. if defined(${f}_FLAG_ENABLE)
+CONFIGURE_ARGS+= --flags="-${${f}_FLAG_ENABLE}"
+. endif
+. if defined(${f}_FLAG_CONFIGURE_OFF)
+CONFIGURE_ARGS+= ${${f}_FLAG_CONFIGURE_OFF}
+. endif
+. endif
+.endfor
+
+.if defined(FLAGS_ENABLE)
+CONFIGURE_ARGS+= --flags="${FLAGS_ENABLE}"
+.endif
+
+.if defined(FLAGS_DISABLE)
+. for f in ${FLAGS_DISABLE}
+CONFIGURE_ARGS+= --flags="-${f}"
+. endfor
+.endif
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 88f3e1f99f8..eefc2b1309b 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -11,406 +11,447 @@
# KEEP THE LIST ALPHABETICALLY SORTED!
-abstract-deque_port= devel/hs-abstract-deque
-abstract-par_port= devel/hs-abstract-par
-activehs_port= www/hs-activehs
-activehs-base_port= devel/hs-activehs-base
-aeson_port= converters/hs-aeson
-Agda_port= math/hs-Agda # executable
-alex_port= devel/hs-alex # executable
-ALUT_port= audio/hs-ALUT
-angel_port= sysutils/hs-angel
-ansi-terminal_port= devel/hs-ansi-terminal
-ansi-wl-pprint_port= devel/hs-ansi-wl-pprint
-arrows_port= devel/hs-arrows
-asn1-data_port= devel/hs-asn1-data
-asn1-types_port= devel/hs-asn1-types
-async_port= devel/hs-async
-attempt_port= devel/hs-attempt
-attoparsec_port= textproc/hs-attoparsec
-attoparsec-conduit_port= textproc/hs-attoparsec-conduit
-attoparsec-enumerator_port= textproc/hs-attoparsec-enumerator
-authenticate_port= www/hs-authenticate
-base-unicode-symbols_port= devel/hs-base-unicode-symbols
-base16-bytestring_port= devel/hs-base16-bytestring
-base64-bytestring_port= devel/hs-base64-bytestring
-base64-conduit_port= devel/hs-base64-conduit
-basic-prelude_port= devel/hs-basic-prelude
-bifunctors_port= devel/hs-bifunctors
-bio_port= science/hs-bio
-bits-atomic_port= devel/hs-bits-atomic
-blaze-builder_port= devel/hs-blaze-builder
-blaze-builder-conduit_port= devel/hs-blaze-builder-conduit
-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
-brainfuck_port= lang/hs-brainfuck # executable
-bsd-sysctl_port= devel/hs-bsd-sysctl
-byteorder_port= devel/hs-byteorder
-bytestring-csv_port= textproc/hs-bytestring-csv
-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
-cereal_port= devel/hs-cereal
-cairo_port= graphics/hs-cairo
-case-insensitive_port= textproc/hs-case-insensitive
-categories_port= math/hs-categories
-certificate_port= security/hs-certificate
-cgi_port= www/hs-cgi
-checkers_port= devel/hs-checkers
-cipher-aes_port= security/hs-cipher-aes
-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
-cmdargs_port= devel/hs-cmdargs
-comonad_port= math/hs-comonad
-comonad-transformers_port= math/hs-comonad-transformers
-comonads-fd_port= math/hs-comonads-fd
-conduit_port= devel/hs-conduit
-ConfigFile_port= devel/hs-ConfigFile
-configurator_port= devel/hs-configurator
-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-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-api_port= security/hs-crypto-random-api
-cryptocipher_port= security/hs-cryptocipher
-cryptohash_port= security/hs-cryptohash
-css-text_port= www/hs-css-text
-csv_port= textproc/hs-csv
-curl_port= ftp/hs-curl
-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-lens_port= math/hs-data-lens
-data-lens-template_port= math/hs-data-lens-template
-data-pprint_port= devel/hs-data-pprint
-dataenc_port= converters/hs-dataenc
-date-cache_port= devel/hs-date-cache
-datetime_port= devel/hs-datetime
-DeepArrow_port= devel/hs-DeepArrow
-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
-distributive_port= math/hs-distributive
-dlist_port= devel/hs-dlist
-double-conversion_port= textproc/hs-double-conversion
-edit-distance_port= devel/hs-edit-distance
-either_port= devel/hs-either
-email-validate_port= mail/hs-email-validate
-entropy_port= security/hs-entropy
-enumerator_port= devel/hs-enumerator
-epic_port= lang/hs-epic # executable
-erf_port= math/hs-erf
-errors_port= devel/hs-errors
-extensible-exceptions_port= devel/hs-extensible-exceptions
-failure_port= devel/hs-failure
-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
-filesystem-conduit_port= devel/hs-filesystem-conduit
-fsnotify_port= devel/hs-fsnotify
-gconf_port= devel/hs-gconf
-generic-deriving_port= devel/hs-generic-deriving
-geniplate_port= devel/hs-geniplate
-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
-glade_port= devel/hs-glade
-glib_port= devel/hs-glib
-GLURaw_port= x11-toolkits/hs-GLURaw
-GLUT_port= x11-toolkits/hs-GLUT
-groupoids_port= math/hs-groupoids
-gstreamer_port= multimedia/hs-gstreamer
-gtk_port= x11-toolkits/hs-gtk
-gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable
-gtkglext_port= x11-toolkits/hs-gtkglext
-gtksourceview2_port= x11-toolkits/hs-gtksourceview2
-haddock_port= devel/hs-haddock # executable
-hamlet_port= www/hs-hamlet
-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
-haskeline_port= devel/hs-haskeline
-haskell-src_port= devel/hs-haskell-src
-haskell-src-exts_port= devel/hs-haskell-src-exts
-hasktags_port= devel/hs-hasktags # executable
-hastache_port= devel/hs-hastache
-HaXml_port= textproc/hs-HaXml # executable
-heist_port= www/hs-heist
-hexpat_port= textproc/hs-hexpat
-HGL_port= graphics/hs-HGL
-highlighting-kate_port= textproc/hs-highlighting-kate
-hinotify_port= devel/hs-hinotify
-hint_port= devel/hs-hint
-hlint_port= devel/hs-hlint # executable
-hjsmin_port= www/hs-hjsmin
-hlibev_port= devel/hs-hlibev # lib_depends
-hoogle_port= devel/hs-hoogle # executable
-hostname_port= net/hs-hostname
-hs-bibutils_port= textproc/hs-hs-bibutils
-hS3_port= www/hs-hS3 # executable
-hscolour_port= print/hs-hscolour # executable
-hslogger_port= devel/hs-hslogger
-HsOpenSSL_port= security/hs-HsOpenSSL
-hspec_port= devel/hs-hspec
-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-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
-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
-IORefCAS_port= devel/hs-IORefCAS
-json_port= converters/hs-json
-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
-libmpd_port= audio/hs-libmpd
-libxml_port= textproc/hs-libxml
-lifted-base_port= devel/hs-lifted-base
-List_port= devel/hs-List
-logict_port= devel/hs-logict
-maccatcher_port= net/hs-maccatcher
-math-functions_port= math/hs-math-functions
-MaybeT_port= devel/hs-MaybeT
-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-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
-mtl_port= devel/hs-mtl
-mueval_port= devel/hs-mueval # executable
-murmur-hash_port= devel/hs-murmur-hash
-mwc-random_port= math/hs-mwc-random
-mysql_port= databases/hs-mysql
-nats_port= math/hs-nats
-network_port= net/hs-network
-network-conduit_port= net/hs-network-conduit
-network-info_port= net/hs-network-info
-network-multicast_port= net/hs-network-multicast
-NumInstances_port= math/hs-NumInstances
-ObjectName_port= devel/hs-ObjectName
-oeis_port= www/hs-oeis
-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-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
-polyparse_port= textproc/hs-polyparse
-pointed_port= math/hs-pointed
-pool-conduit_port= devel/hs-pool-conduit
-porte_port= ports-mgmt/hs-porte # executable
-primitive_port= devel/hs-primitive
-probability_port= math/hs-probability
-profunctor-extras_port= devel/hs-profunctor-extras
-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
-ranges_port= devel/hs-ranges
-reactive_port= devel/hs-reactive
-ReadArgs_port= devel/hs-ReadArgs
-readline_port= devel/hs-readline
-recaptcha_port= www/hs-recaptcha
-reflection_port= devel/hs-reflection
-regex-base_port= textproc/hs-regex-base
-regex-compat_port= textproc/hs-regex-compat
-regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin
-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
-RSA_port= security/hs-RSA
-safe_port= devel/hs-safe
-SafeSemaphore_port= devel/hs-SafeSemaphore
-scgi_port= www/hs-scgi
-sendfile_port= net/hs-sendfile
-semigroupoid-extras_port= math/hs-semigroupoid-extras
-semigroupoids_port= math/hs-semigroupoids
-semigroups_port= math/hs-semigroups
-setenv_port= devel/hs-setenv
-SHA_port= security/hs-SHA
-shakespeare_port= www/hs-shakespeare
-shakespeare-css_port= www/hs-shakespeare-css
-shakespeare-i18n_port= www/hs-shakespeare-i18n
-shakespeare-js_port= www/hs-shakespeare-js
-shakespeare-text_port= www/hs-shakespeare-text
-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
-snap-core_port= www/hs-snap-core
-snap-server_port= www/hs-snap-server # lib_depends
-socks_port= net/hs-socks
-soegtk_port= graphics/hs-soegtk
-split_port= devel/hs-split
-StateVar_port= devel/hs-StateVar
-statistics_port= math/hs-statistics
-stm_port= devel/hs-stm
-Stream_port= devel/hs-Stream
-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
-Tensor_port= devel/hs-Tensor
-terminfo_port= devel/hs-terminfo
-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
-testpack_port= devel/hs-testpack
-texmath_port= textproc/hs-texmath # executable
-text_port= devel/hs-text
-threads_port= devel/hs-threads
-threadscope_port= devel/hs-threadscope # executable
-time-compat_port= devel/hs-time-compat
-timezone-olson_port= devel/hs-timezone-olson
-timezone-series_port= devel/hs-timezone-series
-tls_port= security/hs-tls
-tls-extra_port= security/hs-tls-extra
-transformers_port= devel/hs-transformers
-transformers-base_port= devel/hs-transformers-base
-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
-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
-uulib_port= devel/hs-uulib
-vault_port= devel/hs-vault
-vector_port= devel/hs-vector
-vector-algorithms_port= devel/hs-vector-algorithms
-vector-space_port= math/hs-vector-space
-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
-wai-extra_port= www/hs-wai-extra
-wai-logger_port= www/hs-wai-logger
-wai-test_port= www/hs-wai-test
-warp_port= www/hs-warp
-webkit_port= www/hs-webkit
-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
-xhtml_port= textproc/hs-xhtml
-xml_port= textproc/hs-xml
-xml-conduit_port= textproc/hs-xml-conduit
-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
-yesod_port= www/hs-yesod
-yesod-auth_port= www/hs-yesod-auth
-yesod-core_port= www/hs-yesod-core
-yesod-form_port= www/hs-yesod-form
-yesod-persistent_port= www/hs-yesod-persistent
-yesod-platform_port= www/hs-yesod-platform
-yesod-routes_port= www/hs-yesod-routes
-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-conduit_port= archivers/hs-zlib-conduit
-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
+aeson_port= converters/hs-aeson
+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
+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
+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
+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-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
+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
+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
+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
+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-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-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
+edit-distance_port= devel/hs-edit-distance
+either_port= devel/hs-either
+ekg_port= sysutils/hs-ekg
+ekg-core_port= sysutils/hs-ekg-core
+email-validate_port= mail/hs-email-validate
+enclosed-exceptions_port= devel/hs-enclosed-exceptions
+entropy_port= security/hs-entropy
+enumerator_port= devel/hs-enumerator
+epic_port= lang/hs-epic # executable
+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
+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_port= devel/hs-geniplate
+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
+glade_port= devel/hs-glade
+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
+gstreamer_port= multimedia/hs-gstreamer # lib_depends
+gtk_port= x11-toolkits/hs-gtk
+gtk2hs_port= x11-toolkits/hs-gtk2hs # metaport
+gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable
+gtkglext_port= x11-toolkits/hs-gtkglext # lib_depends
+gtksourceview2_port= x11-toolkits/hs-gtksourceview2
+haddock_port= devel/hs-haddock # executable
+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-platform_port= devel/hs-haskell-platform # metaport
+haskell-src_port= devel/hs-haskell-src
+haskell-src-exts_port= devel/hs-haskell-src-exts
+hasktags_port= devel/hs-hasktags # executable
+hastache_port= devel/hs-hastache
+HaXml_port= textproc/hs-HaXml # executable
+heist_port= www/hs-heist
+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
+hoogle_port= devel/hs-hoogle # executable
+hostname_port= net/hs-hostname
+hs-bibutils_port= textproc/hs-hs-bibutils
+hS3_port= www/hs-hS3 # executable
+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-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
+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
+json_port= converters/hs-json
+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-base_port= devel/hs-lifted-base
+List_port= devel/hs-List
+logict_port= devel/hs-logict
+maccatcher_port= net/hs-maccatcher
+math-functions_port= math/hs-math-functions
+MaybeT_port= devel/hs-MaybeT
+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
+murmur-hash_port= devel/hs-murmur-hash
+mwc-random_port= math/hs-mwc-random
+mysql_port= databases/hs-mysql
+nats_port= math/hs-nats
+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
+NumInstances_port= math/hs-NumInstances
+ObjectName_port= devel/hs-ObjectName
+oeis_port= www/hs-oeis
+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-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
+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
+ranges_port= devel/hs-ranges
+ReadArgs_port= devel/hs-ReadArgs # executable
+readline_port= devel/hs-readline
+recaptcha_port= www/hs-recaptcha
+reflection_port= devel/hs-reflection
+regex-base_port= textproc/hs-regex-base
+regex-compat_port= textproc/hs-regex-compat
+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
+RSA_port= security/hs-RSA
+safe_port= devel/hs-safe
+SafeSemaphore_port= devel/hs-SafeSemaphore
+scgi_port= www/hs-scgi
+scientific_port= devel/hs-scientific
+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
+SHA_port= security/hs-SHA # executable
+shake_port= devel/hs-shake # executable
+shakespeare_port= www/hs-shakespeare
+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
+soegtk_port= graphics/hs-soegtk
+split_port= devel/hs-split
+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
+testpack_port= devel/hs-testpack
+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
+timezone-olson_port= devel/hs-timezone-olson
+timezone-series_port= devel/hs-timezone-series
+tls_port= security/hs-tls
+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
+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-platform_port= www/hs-yesod-platform
+yesod-routes_port= www/hs-yesod-routes
+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 7eff75e841c..430202064f0 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,5 +1,5 @@
-SHA256 (ghc-7.6.3-src.tar.bz2) = bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998
-SIZE (ghc-7.6.3-src.tar.bz2) = 110763823
+SHA256 (ghc-7.8.3-src.tar.bz2) = 2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37
+SIZE (ghc-7.8.3-src.tar.bz2) = 10696541
SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
SIZE (hscolour-1.20.3.tar.gz) = 25810
SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148
diff --git a/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in b/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
deleted file mode 100644
index 7976302419f..00000000000
--- a/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ghc-7.4.1-boot/rts/package.conf.in.orig 2009-07-14 19:10:52.000000000 +0200
-+++ ../ghc-7.4.1-boot/rts/package.conf.in 2009-08-13 22:09:35.000000000 +0200
-@@ -156,6 +156,8 @@
- , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
- #endif
-
-+ , "-L%%LOCALBASE%%/lib"
-+
- /* Pick up static libraries in preference over dynamic if in earlier search
- * path. This is important to use the static gmp in preference on Mac OS.
- * The used option is specific to the Darwin linker.
diff --git a/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in b/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in
deleted file mode 100644
index 95e2d022a16..00000000000
--- a/lang/ghc/files/nopatch-.._ghc-7.6.3-boot_rts_package.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ghc-7.6.3-boot/rts/package.conf.in.orig 2013-04-18 22:22:47.000000000 +0100
-+++ ../ghc-7.6.3-boot/rts/package.conf.in 2013-09-06 23:01:22.000000000 +0100
-@@ -141,6 +141,8 @@
- , "-u", "base_GHCziConcziSignal_runHandlers_closure"
- #endif
-
-+ , "-L%%LOCALBASE%%/lib"
-+
- /* Pick up static libraries in preference over dynamic if in earlier search
- * path. This is important to use the static gmp in preference on Mac OS.
- * The used option is specific to the Darwin linker.
diff --git a/lang/ghc/files/nopatch-rules__distdir-way-opts.mk b/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
new file mode 100644
index 00000000000..3631fdaceda
--- /dev/null
+++ b/lang/ghc/files/nopatch-rules__distdir-way-opts.mk
@@ -0,0 +1,19 @@
+--- ./rules/distdir-way-opts.mk.orig 2014-07-10 06:27:16.000000000 +0200
++++ ./rules/distdir-way-opts.mk 2014-07-27 23:38:27.738949283 +0200
+@@ -167,15 +167,9 @@
+
+ ifeq "$3" "dyn"
+ ifneq "$4" "0"
+-ifeq "$$(TargetElf)" "YES"
+-$1_$2_$3_GHC_LD_OPTS += \
+- -fno-use-rpaths \
+- $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -optl-Wl,-zorigin
+-else ifeq "$$(TargetOS_CPP)" "darwin"
+ $1_$2_$3_GHC_LD_OPTS += \
+ -fno-use-rpaths \
+- $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'@loader_path/../$$d')
+-endif
++ $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'%%GHC_LIBDIR%%/$$d')
+ endif
+ endif
+
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
index 48c040f7450..a731bc9751c 100644
--- a/lang/ghc/files/patch-aclocal.m4
+++ b/lang/ghc/files/patch-aclocal.m4
@@ -1,6 +1,6 @@
---- aclocal.m4.orig 2013-04-18 23:22:46.000000000 +0200
-+++ aclocal.m4 2013-04-29 20:32:30.000000000 +0200
-@@ -19,6 +19,8 @@
+--- ./aclocal.m4.orig 2014-07-10 06:27:16.000000000 +0200
++++ ./aclocal.m4 2014-07-11 11:23:41.000000000 +0200
+@@ -47,6 +47,8 @@
# In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
# so this justs uses $bootstrap_target.
@@ -9,30 +9,12 @@
if test "$build_alias" = ""
then
if test "$bootstrap_target" != ""
-@@ -157,7 +159,7 @@
- i386)
- test -z "[$]2" || eval "[$]2=ArchX86"
- ;;
-- x86_64)
-+ x86_64|amd64)
- test -z "[$]2" || eval "[$]2=ArchX86_64"
- ;;
- powerpc)
-@@ -185,7 +187,7 @@
-
- checkVendor() {
- case [$]1 in
-- dec|unknown|hp|apple|next|sun|sgi|ibm)
-+ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld)
- ;;
- *)
- echo "Unknown vendor [$]1"
-@@ -1889,7 +1891,7 @@
- vax)
- $2="vax"
- ;;
-- x86_64)
-+ x86_64|amd64)
- $2="x86_64"
- ;;
- *)
+@@ -1817,7 +1819,7 @@
+ dnl If special linker flags are needed to build things, then allow
+ dnl the user to pass them in via LDFLAGS.
+ changequote(, )dnl
+- GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
++ GHC_LDFLAGS=`echo $LDFLAGS | sed 's/-Wl,-/-optl -/g'`
+ changequote([, ])dnl
+ if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
+ then
diff --git a/lang/ghc/files/patch-compiler-main-Dynflags.hs b/lang/ghc/files/patch-compiler-main-Dynflags.hs
deleted file mode 100644
index ee76c6da298..00000000000
--- a/lang/ghc/files/patch-compiler-main-Dynflags.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler/main/DynFlags.hs.orig 2012-06-06 19:10:25.000000000 +0200
-+++ compiler/main/DynFlags.hs 2013-02-08 15:23:36.000000000 +0100
-@@ -2390,7 +2390,7 @@
- flag)
- return dflags
- HscLlvm
-- | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) &&
-+ | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin || os == OSFreeBSD)) &&
- (not opt_Static || opt_PIC)
- ->
- do addWarn ("Ignoring " ++ flag ++ " as it is incompatible with -fPIC and -dynamic on this platform")
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index e7504949abc..7f1323c78d5 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,80 +1,20 @@
---- ./configure.ac.orig 2013-04-19 00:31:00.000000000 +0200
-+++ ./configure.ac 2013-04-30 19:30:40.381161098 +0200
-@@ -89,6 +89,59 @@
- fi
- WithGhc="$GHC"])
-
-+# system libffi
-+
-+AC_ARG_WITH([system-libffi],
-+[AC_HELP_STRING([--with-system-libffi],
-+ [Use system provided libffi for RTS [default=no]])
-+])
-+
-+AS_IF([test "x$with_system_libffi" = "xyes"],
-+ [UseSystemLibFFI="YES"], [UseSystemLibFFI="NO"]
-+)
-+
-+AC_SUBST(UseSystemLibFFI)
-+
-+AC_ARG_WITH([ffi-includes],
-+[AC_HELP_STRING([--with-ffi-includes=ARG]
-+ [Find includes for libffi in ARG [default=system default]])
-+],
-+[
-+ if test "x$UseSystemLibFFI" != "xYES"; then
-+ AC_MSG_WARN([--with-ffi-includes will be ignored, --with-system-libffi not set])
-+ else
-+ FFIIncludeDir="$withval" LIBFFI_CFLAGS="-I $withval"
-+ fi
-+])
-+
-+AC_SUBST(FFIIncludeDir)
-+
-+AC_ARG_WITH([ffi-libraries],
-+[AC_HELP_STRING([--with-ffi-libraries=ARG]
-+ [Find libffi in ARG [default=system default]])
-+],
-+[
-+ if test "x$UseSystemLibFFI" != "xYES"; then
-+ AC_MSG_WARN([--with-ffi-libraries will be ignored, --with-system-libffi not set])
-+ else
-+ FFILibDir="$withval" LIBFFI_LDFLAGS="-L$withval"
-+ fi
-+])
-+
-+AC_SUBST(FFILibDir)
-+
-+AS_IF([test "$UseSystemLibFFI" = "YES"], [
-+ CFLAGS2="$CFLAGS"
-+ CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
-+ LDFLAGS2="$LDFLAGS"
-+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
-+ AC_CHECK_LIB(ffi, ffi_call,
-+ [AC_CHECK_HEADERS([ffi.h], [break], [])
-+ AC_DEFINE([HAVE_LIBFFI], [1], [Define to 1 if you have libffi.])],
-+ [UseSystemLibFFI="NO"])
-+ CFLAGS="$CFLAGS2"
-+ LDFLAGS="$LDFLAGS2"
-+])
-
- dnl ** Tell the make system which OS we are using
- dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something
-@@ -379,6 +432,9 @@
- BuildingCrossCompiler=NO
- PortingCompiler=NO
+--- ./configure.ac.orig 2014-07-10 07:04:42.000000000 +0200
++++ ./configure.ac 2014-07-11 10:27:40.000000000 +0200
+@@ -435,6 +435,9 @@
+ dnl ** Building a cross compiler?
+ dnl --------------------------------------------------------------
CrossCompiling=NO
+
+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 "$host" != "$target" ; then
- BuildingCrossCompiler=YES
-@@ -839,7 +895,6 @@
+ if test "$target" != "$host" ; then
+ CrossCompiling=YES
+@@ -914,7 +917,6 @@
FP_VISIBILITY_HIDDEN
dnl ** check for librt
-AC_CHECK_LIB(rt, clock_gettime)
- AC_CHECK_FUNCS(clock_gettime timer_create timer_settime)
+ AC_CHECK_FUNCS(clock_gettime timer_settime)
FP_CHECK_TIMER_CREATE
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index a8e806b6e47..5467a7ae909 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,38 +1,10 @@
---- ghc.mk.orig 2013-04-18 23:22:46.000000000 +0200
-+++ ghc.mk 2013-04-29 20:42:16.000000000 +0200
-@@ -80,6 +80,7 @@
+--- ./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 @@
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
else ifeq "$(MAKE_RESTARTS)" "1"
+else ifeq "$(MAKE_RESTARTS)" "2"
else
- $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
+ $(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
-@@ -595,12 +596,18 @@
- MAYBE_GHCI=driver/ghci
- endif
-
-+ifeq "$(UseSystemLibFFI)" "YES"
-+MAYBE_LIBFFI=
-+else
-+MAYBE_LIBFFI=libffi
-+endif
-+
- BUILD_DIRS += \
- driver \
- $(MAYBE_GHCI) \
- driver/ghc \
- driver/haddock \
-- libffi \
-+ $(MAYBE_LIBFFI) \
- includes \
- rts
-
-@@ -1005,6 +1012,7 @@
- echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
- echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK)
- echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK)
-+ echo "UseSystemLibFFI = $(UseSystemLibFFI)" >> $(BIN_DIST_MK)
- cd $(BIN_DIST_PREP_DIR) && autoreconf
- $(call removeFiles,$(BIN_DIST_PREP_TAR))
- # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
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 96945336bbc..029e5876018 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,46 +1,34 @@
---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2012-11-23 17:07:58.000000000 +0100
-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs 2012-11-23 19:17:52.000000000 +0100
-@@ -46,7 +46,7 @@
- ) where
-
- import Distribution.Simple.Program.Types
-- ( Program(..), simpleProgram )
-+ ( Program(..), simpleProgram, simpleProgramFromEnvironment )
- import Distribution.Simple.Utils
- ( findProgramLocation, findProgramVersion )
-
-@@ -194,15 +194,15 @@
- }
-
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2014-07-10 06:34:21.000000000 +0200
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs 2014-07-26 23:57:20.869626927 +0200
+@@ -198,13 +198,18 @@
gccProgram :: Program
--gccProgram = (simpleProgram "gcc") {
-+gccProgram = (simpleProgramFromEnvironment "gcc" "CC") {
+ gccProgram = (simpleProgram "gcc") {
programFindVersion = findProgramVersion "-dumpversion" id
++ , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
}
ranlibProgram :: Program
-ranlibProgram = simpleProgram "ranlib"
-+ranlibProgram = simpleProgramFromEnvironment "ranlib" "RANLIB"
++ranlibProgram = (simpleProgram "ranlib") {
++ programFindLocation = \_v _p -> return (Just "%%RANLIB%%")
++ }
arProgram :: Program
-arProgram = simpleProgram "ar"
-+arProgram = simpleProgramFromEnvironment "ar" "AR"
++arProgram = (simpleProgram "ar") {
++ programFindLocation = \_v _p -> return (Just "%%AR%%")
++ }
stripProgram :: Program
stripProgram = simpleProgram "strip"
-@@ -255,13 +255,13 @@
+@@ -257,7 +262,9 @@
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
-ldProgram = simpleProgram "ld"
-+ldProgram = simpleProgramFromEnvironment "ld" "LD"
++ldProgram = (simpleProgram "ld") {
++ programFindLocation = \_v _p -> return (Just "%%LD%%")
++ }
tarProgram :: Program
tarProgram = simpleProgram "tar"
-
- cppProgram :: Program
--cppProgram = simpleProgram "cpp"
-+cppProgram = simpleProgramFromEnvironment "cpp" "CPP"
-
- pkgConfigProgram :: Program
- pkgConfigProgram = (simpleProgram "pkg-config") {
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
deleted file mode 100644
index 98b11338b45..00000000000
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs.orig 2012-11-23 17:07:58.000000000 +0100
-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs 2012-11-23 19:19:04.000000000 +0100
-@@ -18,6 +18,7 @@
- -- * Program and functions for constructing them
- Program(..),
- simpleProgram,
-+ simpleProgramFromEnvironment,
-
- -- * Configured program and related functions
- ConfiguredProgram(..),
-@@ -28,7 +29,7 @@
- ) where
-
- import Distribution.Simple.Utils
-- ( findProgramLocation )
-+ ( findProgramLocation, getProgramFromEnvironment )
- import Distribution.Version
- ( Version )
- import Distribution.Verbosity
-@@ -116,6 +117,18 @@
- programPostConf = \_ _ -> return []
- }
-
-+-- | Make a simple named program from an environment variable.
-+--
-+-- > simpleProgramFromEnvironment "foo" "FOO"
-+--
-+simpleProgramFromEnvironment :: String -> String -> Program
-+simpleProgramFromEnvironment name var = Program {
-+ programName = name,
-+ programFindLocation = \v -> getProgramFromEnvironment v name var,
-+ programFindVersion = \_ _ -> return Nothing,
-+ programPostConf = \_ _ -> return []
-+ }
-+
- -- | Make a simple 'ConfiguredProgram'.
- --
- -- > simpleConfiguredProgram "foo" (FoundOnSystem path)
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
deleted file mode 100644
index d9be9167a45..00000000000
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs.orig 2012-11-23 17:07:58.000000000 +0100
-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs 2012-11-23 19:38:03.000000000 +0100
-@@ -95,6 +95,7 @@
- findModuleFile,
- findModuleFiles,
- getDirectoryContentsRecursive,
-+ getProgramFromEnvironment,
-
- -- * simple file globbing
- matchFileGlob,
-@@ -152,7 +153,7 @@
- ( getDirectoryContents, doesDirectoryExist, doesFileExist, removeFile
- , findExecutable )
- import System.Environment
-- ( getProgName )
-+ ( getProgName, getEnvironment )
- import System.Cmd
- ( rawSystem )
- import System.Exit
-@@ -670,6 +671,19 @@
- ignore ['.', '.'] = True
- ignore _ = False
-
-+getProgramFromEnvironment :: Verbosity -> String -> String -> IO (Maybe FilePath)
-+getProgramFromEnvironment verbosity prog name = do
-+ debug verbosity $
-+ "searching for " ++ prog ++ " in the environment (as " ++ name ++ ")."
-+ res <- lookup name `fmap` getEnvironment
-+ case res of
-+ Nothing -> do
-+ debug verbosity $ "falling back to searching in the path."
-+ findExecutable prog
-+ v@(Just val) -> do
-+ debug verbosity $ "found as " ++ val ++ "."
-+ return v
-+
- ----------------
- -- File globbing
-
diff --git a/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc b/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
deleted file mode 100644
index ffc1d3df082..00000000000
--- a/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./libraries/base/GHC/Event/KQueue.hsc.orig 2013-04-18 23:30:14.000000000 +0200
-+++ ./libraries/base/GHC/Event/KQueue.hsc 2013-04-30 13:34:11.549185351 +0200
-@@ -235,10 +235,11 @@
- #endif
- deriving (Bits, Eq, Num, Show, Storable)
-
--#{enum Filter, Filter
-- , filterRead = EVFILT_READ
-- , filterWrite = EVFILT_WRITE
-- }
-+filterRead :: Filter
-+filterRead = Filter (#const EVFILT_READ)
-+
-+filterWrite :: Filter
-+filterWrite = Filter (#const EVFILT_WRITE)
-
- data TimeSpec = TimeSpec {
- tv_sec :: {-# UNPACK #-} !CTime
diff --git a/lang/ghc/files/patch-libraries__base__cbits__iconv.c b/lang/ghc/files/patch-libraries__base__cbits__iconv.c
deleted file mode 100644
index daee90381f0..00000000000
--- a/lang/ghc/files/patch-libraries__base__cbits__iconv.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- libraries/base/cbits/iconv.c.orig 2013-04-18 23:30:14.000000000 +0200
-+++ libraries/base/cbits/iconv.c 2013-12-15 22:08:45.995398103 +0100
-@@ -1,12 +1,28 @@
- #ifndef __MINGW32__
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
-+
- #include <stdlib.h>
- #include <iconv.h>
-
-+#if __FreeBSD_version >= 1000502
-+iconv_t __bsd_iconv_open(const char *, const char *);
-+size_t __bsd_iconv(iconv_t, const char ** __restrict,
-+ size_t * __restrict, char ** __restrict,
-+ size_t * __restrict);
-+int __bsd_iconv_close(iconv_t);
-+#endif
-+
- iconv_t hs_iconv_open(const char* tocode,
- const char* fromcode)
- {
-+#if __FreeBSD_version >= 1000502
-+ return __bsd_iconv_open(tocode, fromcode);
-+#else
- return iconv_open(tocode, fromcode);
-+#endif
- }
-
- size_t hs_iconv(iconv_t cd,
-@@ -15,11 +31,19 @@
- {
- // (void*) cast avoids a warning. Some iconvs use (const
- // char**inbuf), other use (char **inbuf).
-+#if __FreeBSD_version >= 1000502
-+ return __bsd_iconv(cd, (void*)inbuf, inbytesleft, outbuf, outbytesleft);
-+#else
- return iconv(cd, (void*)inbuf, inbytesleft, outbuf, outbytesleft);
-+#endif
- }
-
- int hs_iconv_close(iconv_t cd) {
-+#if __FreeBSD_version >= 1000502
-+ return __bsd_iconv_close(cd);
-+#else
- return iconv_close(cd);
-+#endif
- }
-
- #endif
diff --git a/lang/ghc/files/patch-mk-config.mk.in b/lang/ghc/files/patch-mk-config.mk.in
deleted file mode 100644
index ff8f0071f82..00000000000
--- a/lang/ghc/files/patch-mk-config.mk.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./mk/config.mk.in.orig 2012-06-06 19:10:25.000000000 +0200
-+++ ./mk/config.mk.in 2013-01-30 16:24:53.000000000 +0100
-@@ -363,6 +363,12 @@
- PapiLibDir=
- PapiIncludeDir=
-
-+# Configuration for libffi
-+UseSystemLibFFI=@UseSystemLibFFI@
-+# Flags to go into package.conf for rts
-+FFILibDir=@FFILibDir@
-+FFIIncludeDir=@FFIIncludeDir@
-+
- ################################################################################
- #
- # Paths (see paths.mk)
diff --git a/lang/ghc/files/patch-rts-ghc.mk b/lang/ghc/files/patch-rts-ghc.mk
deleted file mode 100644
index c03e03dea09..00000000000
--- a/lang/ghc/files/patch-rts-ghc.mk
+++ /dev/null
@@ -1,104 +0,0 @@
---- ./rts/ghc.mk.orig 2012-06-06 19:10:25.000000000 +0200
-+++ ./rts/ghc.mk 2013-01-30 16:40:21.000000000 +0100
-@@ -105,8 +105,10 @@
- endif
-
- ifneq "$(BINDIST)" "YES"
-+ifneq "$(UseSystemLibFFI)" "YES"
- rts_ffi_objs_stamp = rts/dist/ffi/stamp
- rts_ffi_objs = rts/dist/ffi/*.o
-+
- $(rts_ffi_objs_stamp): $(libffi_STATIC_LIB) $(TOUCH_DEP) | $$(dir $$@)/.
- cd rts/dist/ffi && $(AR) x ../../../$(libffi_STATIC_LIB)
- "$(TOUCH_CMD)" $@
-@@ -119,6 +121,7 @@
- rts/dist/build/libffi-5.dll: libffi/build/inst/bin/libffi-5.dll
- cp $< $@
- endif
-+endif
-
- #-----------------------------------------------------------------------------
- # Building one way
-@@ -169,6 +172,12 @@
-
- rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
-
-+ifneq "$(UseSystemLibFFI)" "YES"
-+rts_dist_FFI_SO = rts/dist/build/libffi$(soext)
-+else
-+rts_dist_FFI_SO =
-+endif
-+
- # Making a shared library for the RTS.
- ifneq "$$(findstring dyn, $1)" ""
- ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
-@@ -177,10 +186,15 @@
- "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
- -no-auto-link-packages -Lrts/dist/build -lffi-5 `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
- else
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
-+ifneq "$(UseSystemLibFFI)" "YES"
-+ LIBFFI_LIBS= -Lrts/dist/build -lffi
-+else
-+ LIBFFI_LIBS= -L$(FFILibDir)
-+endif
-+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend $$(rts_dist_FFI_SO)
- "$$(RM)" $$(RM_OPTS) $$@
- "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
-- -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
-+ -no-auto-link-packages $$(LIBFFI_LIBS) `cat rts/libs.depend` $$(rts_$1_OBJS) \
- $$(rts_$1_DTRACE_OBJS) -o $$@
- ifeq "$$(darwin_HOST_OS)" "1"
- # Ensure library's install name is correct before anyone links with it.
-@@ -370,9 +384,14 @@
- endif
-
- # ffi.h triggers prototype warnings, so disable them here:
--rts/Interpreter_CC_OPTS += -Wno-strict-prototypes
--rts/Adjustor_CC_OPTS += -Wno-strict-prototypes
--rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes
-+ifeq "$(UseSystemLibFFI)" "YES"
-+LIBFFI_CFLAGS = $(addprefix -I,$(FFIIncludeDir))
-+else
-+LIBFFI_CFLAGS =
-+endif
-+rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
-+rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
-+rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
-
- # inlining warnings happen in Compact
- rts/sm/Compact_CC_OPTS += -Wno-inline
-@@ -430,6 +449,21 @@
-
- endif
-
-+#-----------------------------------------------------------------------------
-+# Use system provided libffi
-+
-+ifeq "$(UseSystemLibFFI)" "YES"
-+
-+rts_PACKAGE_CPP_OPTS += -DFFI_INCLUDE_DIR=$(FFIIncludeDir)
-+rts_PACKAGE_CPP_OPTS += -DFFI_LIB_DIR=$(FFILibDir)
-+
-+else # UseSystemLibFFI==YES
-+
-+rts_PACKAGE_CPP_OPTS += -DFFI_INCLUDE_DIR=""
-+rts_PACKAGE_CPP_OPTS += -DFFI_LIB_DIR=""
-+
-+endif
-+
- # -----------------------------------------------------------------------------
- # dependencies
-
-@@ -507,7 +541,11 @@
- INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
- INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.dll)
-
-+ifneq "$(UseSystemLibFFI)" "YES"
- install: install_libffi_headers
-+else
-+install:
-+endif
-
- .PHONY: install_libffi_headers
- install_libffi_headers :
diff --git a/lang/ghc/files/patch-rts_package.conf.in b/lang/ghc/files/patch-rts_package.conf.in
deleted file mode 100644
index de5040db75e..00000000000
--- a/lang/ghc/files/patch-rts_package.conf.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./rts/package.conf.in.orig 2012-06-06 19:10:25.000000000 +0200
-+++ ./rts/package.conf.in 2013-01-30 19:04:28.000000000 +0100
-@@ -33,6 +33,9 @@
- #ifdef HAVE_LIBDL
- , "dl"
- #endif
-+#ifdef HAVE_LIBFFI
-+ , "ffi"
-+#endif
- #ifdef mingw32_HOST_OS
- ,"wsock32" /* for the linker */
- #endif
-@@ -138,6 +141,7 @@
- , "-u", "base_GHCziConcziSync_runSparks_closure"
- , "-u", "base_GHCziConcziSignal_runHandlers_closure"
- #endif
-+ , "-L%%LOCALBASE%%/lib"
-
- /* Pick up static libraries in preference over dynamic if in earlier search
- * path. This is important to use the static gmp in preference on Mac OS.
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index c2ed7126eab..6f0cb2bf492 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
index d675a76e7f6..f31207b2287 100644
--- a/lang/hs-epic/Makefile
+++ b/lang/hs-epic/Makefile
@@ -2,13 +2,13 @@
PORTNAME= epic
PORTVERSION= 0.9.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Compiler for a simple functional language
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
USE_HAPPY= yes
@@ -20,7 +20,9 @@ RUN_DEPENDS+= boehm-gc>=7.1:${PORTSDIR}/devel/boehm-gc \
EXECUTABLE= epic
+# Force regeneration of the parser.
post-patch::
+ @${RM} -rf ${WRKSRC}/dist
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/evm/Makefile
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 9344aa5fbe9..c6eca69a543 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 6bec3435815..31be87453fa 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 1.0.0
-PORTREVISION= 5
+PORTVERSION= 2.0.1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Validating an email address string against RFC 5322
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10.0
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index 8eccda5d0c3..88715bb489e 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/email-validate-1.0.0.tar.gz) = 4fafd67509e804675e52d97b6ad0dde4b459f7569891c74843155c95ec66416a
-SIZE (cabal/email-validate-1.0.0.tar.gz) = 7205
+SHA256 (cabal/email-validate-2.0.1.tar.gz) = f2d363c06c09d9e1d348d10314831998eb6e516588c56fd503e5fbd85165bbe3
+SIZE (cabal/email-validate-2.0.1.tar.gz) = 7462
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 7b8ec77f97b..3e4c8b06ebd 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= mime-mail
-PORTVERSION= 0.4.1.2
-PORTREVISION= 7
+PORTVERSION= 0.4.5.2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Compose MIME email messages
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \
text>=0.7
diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo
index a0beb43ffe7..cfa215ccc61 100644
--- a/mail/hs-mime-mail/distinfo
+++ b/mail/hs-mime-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-mail-0.4.1.2.tar.gz) = 9efbb13ae7cd452388e080f08514e55bfa9ae54c8a044eb5048fd7fef64fbc05
-SIZE (cabal/mime-mail-0.4.1.2.tar.gz) = 5943
+SHA256 (cabal/mime-mail-0.4.5.2.tar.gz) = ee13c0120787f2867fd3d7888de13e34bf3b4c545b5f5c838582d1618190ae68
+SIZE (cabal/mime-mail-0.4.5.2.tar.gz) = 7072
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 52674d4b6b2..462efadd2f7 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mime-types
-PORTVERSION= 0.1.0.3
-PORTREVISION= 5
+PORTVERSION= 0.1.0.4
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
index 77841e91150..0c89bd4d670 100644
--- a/mail/hs-mime-types/distinfo
+++ b/mail/hs-mime-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-types-0.1.0.3.tar.gz) = c19b2acd46c1843f15d273e8a09f7fd7b82a6ac83a3361794d3a5b2a199ef057
-SIZE (cabal/mime-types-0.1.0.3.tar.gz) = 10953
+SHA256 (cabal/mime-types-0.1.0.4.tar.gz) = 5dc87de5461d217f003259fe5b3260179449ea2fecaeab6779b09e8b3e9fb02f
+SIZE (cabal/mime-types-0.1.0.4.tar.gz) = 10945
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index 42afc65b5e2..3848bdb781b 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -2,14 +2,15 @@
# $FreeBSD$
PORTNAME= mime
-PORTVERSION= 0.3.4
-PORTREVISION= 6
+PORTVERSION= 0.4.0.1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Working with MIME types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text>=0.9
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/mail/hs-mime/distinfo b/mail/hs-mime/distinfo
index 1d7413bf549..3538d0f4178 100644
--- a/mail/hs-mime/distinfo
+++ b/mail/hs-mime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-0.3.4.tar.gz) = 9e4b77e95df4eeb7d247acf46c996785a974f248cfa8729300dbf816c5f09bce
-SIZE (cabal/mime-0.3.4.tar.gz) = 8884
+SHA256 (cabal/mime-0.4.0.1.tar.gz) = e0e65ac0f0c06dc5a750950da4cd0f074e996d156320f3f4c2a4686bb13e28d5
+SIZE (cabal/mime-0.4.0.1.tar.gz) = 9420
diff --git a/mail/hs-mime/pkg-descr b/mail/hs-mime/pkg-descr
index 82c488f42d9..6becc84be36 100644
--- a/mail/hs-mime/pkg-descr
+++ b/mail/hs-mime/pkg-descr
@@ -1,3 +1,3 @@
Working with MIME types.
-WWW: http://github.com/GaloisInc/mime
+WWW: https://github.com/GaloisInc/mime
diff --git a/math/Makefile b/math/Makefile
index 19e30fc6942..d7472396b0e 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -168,21 +168,17 @@
SUBDIR += hs-NumInstances
SUBDIR += hs-categories
SUBDIR += hs-comonad
- SUBDIR += hs-comonad-transformers
- SUBDIR += hs-comonads-fd
SUBDIR += hs-contravariant
SUBDIR += hs-data-lens
SUBDIR += hs-data-lens-template
SUBDIR += hs-distributive
SUBDIR += hs-erf
- SUBDIR += hs-groupoids
SUBDIR += hs-ieee754
SUBDIR += hs-math-functions
SUBDIR += hs-mwc-random
SUBDIR += hs-nats
SUBDIR += hs-pointed
SUBDIR += hs-probability
- SUBDIR += hs-semigroupoid-extras
SUBDIR += hs-semigroupoids
SUBDIR += hs-semigroups
SUBDIR += hs-statistics
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 9d9fb6e6dd3..9cc19a14868 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,38 +2,30 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.3.2
-PORTREVISION= 6
+PORTVERSION= 2.4.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
-USE_CABAL= geniplate>=0.6.0.3 hashable>=1.1 hashtables \
- haskeline>=0.6.3.2 haskell-src-exts>=1.9.6 mtl \
- QuickCheck>=2.3 parallel syb>=0.1 unordered-containers>=0.2 \
- xhtml zlib>=0.4.0.1
+USE_CABAL= boxes>=0.1.3 data-hash>=0.2.0.0 equivalence>=0.2.4 \
+ geniplate>=0.6.0.3 hashable hashtables>=1.0 \
+ haskell-src-exts>=1.9.6 mtl>=2.1.1 parallel QuickCheck>=2.6 \
+ STMonadTrans>=0.3.2 strict>=0.3.2 text>=0.11 \
+ unordered-containers>=0.2 zlib>=0.4.0.1
USE_ALEX= yes
USE_HAPPY= yes
-USES= iconv
+USES= iconv:translit
EXECUTABLE= agda-mode agda
-INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}; \
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
+INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}
-OPTIONS_DEFINE= EPIC
+FLAGS_DEFINE= EPIC
EPIC_DESC= Install the Epic compiler
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEPIC}
-CONFIGURE_ARGS+= --flags="epic"
-USE_CABAL+= epic>=0.1.13
-.else
-CONFIGURE_ARGS+= --flags="-epic"
-.endif
+EPIC_FLAG_ENABLE= epic
+EPIC_FLAG_CABAL= epic>=0.1.13
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index 485c853062a..be99d677aef 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Agda-2.3.2.tar.gz) = d47a0b2a0806ea5c109b59280211a47b980b47a8f6ac0ab9fca673f3d4c6e0f6
-SIZE (cabal/Agda-2.3.2.tar.gz) = 726462
+SHA256 (cabal/Agda-2.4.0.2.tar.gz) = 0b41cf9f841fd78b60490c66a4f08c9f57316e96ca8f3449dacb52cbf48d848d
+SIZE (cabal/Agda-2.4.0.2.tar.gz) = 910389
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index 42b95170d46..ae803d339dd 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,20 +1,11 @@
---- ./Agda.cabal.orig 2012-11-12 01:25:25.000000000 +0100
-+++ ./Agda.cabal 2013-05-03 23:08:18.000000000 +0200
-@@ -69,7 +69,7 @@
-
- build-depends: base >= 4.2 && < 4.7,
- mtl >= 2.0 && < 2.2,
-- QuickCheck >= 2.3 && < 2.6,
-+ QuickCheck >= 2.3 && < 2.7,
- haskell-src-exts >= 1.9.6 && < 1.14,
+--- ./Agda.cabal.orig 2014-06-16 12:42:15.000000000 +0200
++++ ./Agda.cabal 2014-07-13 13:20:32.000000000 +0200
+@@ -76,7 +76,7 @@
+ transformers == 0.3.*,
+ -- mtl-2.1 contains a severe bug
+ mtl >= 2.1.1 && < 2.2,
+- QuickCheck >= 2.7.5 && < 2.8,
++ QuickCheck >= 2.6 && < 2.7,
+ haskell-src-exts >= 1.9.6 && < 1.16,
containers >= 0.1 && < 0.6,
unordered-containers == 0.2.*,
-@@ -83,7 +83,7 @@
- haskeline >= 0.6.3.2 && < 0.8,
- xhtml == 3000.2.*,
- hashable >= 1.1.2.3 && < 1.2,
-- hashtables == 1.0.*,
-+ hashtables == 1.1.*,
- geniplate >= 0.6.0.3 && < 0.7,
- parallel < 3.3,
- deepseq == 1.3.*,
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
new file mode 100644
index 00000000000..ef4b91782fc
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
@@ -0,0 +1,11 @@
+--- ./src/full/Agda/Interaction/Highlighting/Precise.hs.orig 2014-07-29 19:41:41.000000000 +0100
++++ ./src/full/Agda/Interaction/Highlighting/Precise.hs 2014-08-10 11:30:01.000000000 +0100
+@@ -40,7 +40,7 @@
+ import Data.Monoid
+ import Control.Applicative ((<$>), (<*>))
+ import Control.Monad
+-import Agda.Utils.QuickCheck
++import Agda.Utils.QuickCheck hiding (ranges)
+ import Data.Map (Map)
+ import qualified Data.Map as Map
+ import Data.Typeable (Typeable)
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
deleted file mode 100644
index 5108666a583..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/full/Agda/Syntax/Abstract/Name.hs.orig 2012-11-12 01:25:21.000000000 +0100
-+++ ./src/full/Agda/Syntax/Abstract/Name.hs 2013-02-10 15:14:44.000000000 +0100
-@@ -239,8 +239,8 @@
- show x = show (nameConcrete x) -- ++ "|" ++ show (nameId x)
-
- instance Hashable Name where
-- {-# INLINE hash #-}
-- hash = hash . nameId
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt = hashWithSalt salt . nameId
-
- instance Show QName where
- show q = concat $ intersperse "." $ map show $ qnameToList q
-@@ -255,8 +255,8 @@
- compare = compare `on` qnameName
-
- instance Hashable QName where
-- {-# INLINE hash #-}
-- hash = hash . qnameName
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt = hashWithSalt salt . qnameName
-
- instance HasRange Name where
- getRange = getRange . nameConcrete
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
deleted file mode 100644
index b071c8448e1..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/full/Agda/Syntax/Common.hs.orig 2012-11-12 01:25:21.000000000 +0100
-+++ ./src/full/Agda/Syntax/Common.hs 2013-02-10 15:12:42.000000000 +0100
-@@ -272,8 +272,8 @@
- fromEnum (NameId n _) = fromIntegral n
-
- instance Hashable NameId where
-- {-# INLINE hash #-}
-- hash (NameId n m) = hash (n, m)
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt (NameId n m) = hashWithSalt salt (n, m)
-
- newtype Constr a = Constr a
-
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs b/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
deleted file mode 100644
index 1d480e01d10..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/full/Agda/Utils/Pointer.hs.orig 2012-11-12 01:25:22.000000000 +0100
-+++ ./src/full/Agda/Utils/Pointer.hs 2013-02-10 15:11:53.000000000 +0100
-@@ -71,7 +71,7 @@
- compare = compare `on` ptrTag
-
- instance Hashable (Ptr a) where
-- hash = hash . ptrTag
-+ hashWithSalt salt = hashWithSalt salt . ptrTag
-
- instance NFData (Ptr a) where
-
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 4257749c09f..e5deec99454 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,13 +2,13 @@
PORTNAME= NumInstances
PORTVERSION= 1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Instances of numeric classes for functions and tuples
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 4b10ea89443..7bd9260d38d 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= categories
-PORTVERSION= 1.0.5
-PORTREVISION= 5
+PORTVERSION= 1.0.6
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Categories
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= void>=0.5.4.2
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 5204cd51b15..30e3635a5f4 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/categories-1.0.5.tar.gz) = 7fce017b35ae7e273250a93070e053396c763995d148c16cdcc0110a16ed739b
-SIZE (cabal/categories-1.0.5.tar.gz) = 8992
+SHA256 (cabal/categories-1.0.6.tar.gz) = 9e159abff9a4e0652a46c4206c94e46ecb7c0fa8822fbea921af480c57cfb544
+SIZE (cabal/categories-1.0.6.tar.gz) = 9061
diff --git a/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs b/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
new file mode 100644
index 00000000000..5f73258d234
--- /dev/null
+++ b/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
@@ -0,0 +1,101 @@
+--- ./src/Control/Categorical/Functor.hs.orig 2013-06-20 22:09:11.000000000 +0200
++++ ./src/Control/Categorical/Functor.hs 2014-07-13 17:57:00.000000000 +0200
+@@ -2,7 +2,7 @@
+ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
+ {-# LANGUAGE Trustworthy #-}
+ #endif
+-{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances #-}
++{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances, DeriveDataTypeable #-}
+ -------------------------------------------------------------------------------------------
+ -- |
+ -- Module : Control.Categorical.Functor
+@@ -29,86 +29,12 @@
+ import Control.Category
+ import Prelude hiding (id, (.), Functor(..))
+ import qualified Prelude
+-#ifdef __GLASGOW_HASKELL__
+-import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
+-#if MIN_VERSION_base(4,4,0)
+-import Data.Typeable (Typeable1(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
+-#else
+-import Data.Typeable (Typeable1(..), TyCon, mkTyCon, mkTyConApp, gcast1)
+-#endif
+-#endif
++import Data.Typeable
+
+ -- TODO Data, Typeable
+-newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read)
+-
+-#ifdef __GLASGOW_HASKELL__
+-
+-liftedTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-liftedTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LiftedFunctor"
+-#else
+-liftedTyCon = mkTyCon "Control.Categorical.Functor.LiftedFunctor"
+-#endif
+-{-# NOINLINE liftedTyCon #-}
+-
+-liftedConstr :: Constr
+-liftedConstr = mkConstr liftedDataType "LiftedFunctor" [] Prefix
+-{-# NOINLINE liftedConstr #-}
+-
+-liftedDataType :: DataType
+-liftedDataType = mkDataType "Control.Categorical.Fucntor.LiftedFunctor" [liftedConstr]
+-{-# NOINLINE liftedDataType #-}
+-
+-instance Typeable1 f => Typeable1 (LiftedFunctor f) where
+- typeOf1 tfa = mkTyConApp liftedTyCon [typeOf1 (undefined `asArgsType` tfa)]
+- where asArgsType :: f a -> t f a -> f a
+- asArgsType = const
+-
+-instance (Typeable1 f, Data (f a), Data a) => Data (LiftedFunctor f a) where
+- gfoldl f z (LiftedFunctor a) = z LiftedFunctor `f` a
+- toConstr _ = liftedConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z LiftedFunctor)
+- _ -> error "gunfold"
+- dataTypeOf _ = liftedDataType
+- dataCast1 f = gcast1 f
+-#endif
+-
+-newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read)
+-
+-#ifdef __GLASGOW_HASKELL__
+-
+-loweredTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-loweredTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LoweredFunctor"
+-#else
+-loweredTyCon = mkTyCon "Control.Categorical.Functor.LoweredFunctor"
+-#endif
+-{-# NOINLINE loweredTyCon #-}
+-
+-loweredConstr :: Constr
+-loweredConstr = mkConstr loweredDataType "LoweredFunctor" [] Prefix
+-{-# NOINLINE loweredConstr #-}
+-
+-loweredDataType :: DataType
+-loweredDataType = mkDataType "Control.Categorical.Fucntor.LoweredFunctor" [loweredConstr]
+-{-# NOINLINE loweredDataType #-}
+-
+-instance Typeable1 f => Typeable1 (LoweredFunctor f) where
+- typeOf1 tfa = mkTyConApp loweredTyCon [typeOf1 (undefined `asArgsType` tfa)]
+- where asArgsType :: f a -> t f a -> f a
+- asArgsType = const
+-
+-instance (Typeable1 f, Data (f a), Data a) => Data (LoweredFunctor f a) where
+- gfoldl f z (LoweredFunctor a) = z LoweredFunctor `f` a
+- toConstr _ = loweredConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z LoweredFunctor)
+- _ -> error "gunfold"
+- dataTypeOf _ = loweredDataType
+- dataCast1 f = gcast1 f
++newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read, Typeable)
+
+-#endif
++newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read, Typeable)
+
+ class (Category r, Category t) => Functor f r t | f r -> t, f t -> r where
+ fmap :: r a b -> t (f a) (f b)
diff --git a/math/hs-categories/files/patch-src__Control__Category__Dual.hs b/math/hs-categories/files/patch-src__Control__Category__Dual.hs
new file mode 100644
index 00000000000..58f59950b87
--- /dev/null
+++ b/math/hs-categories/files/patch-src__Control__Category__Dual.hs
@@ -0,0 +1,61 @@
+--- ./src/Control/Category/Dual.hs.orig 2013-06-20 22:09:11.000000000 +0200
++++ ./src/Control/Category/Dual.hs 2014-07-13 17:56:00.000000000 +0200
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeOperators, FlexibleContexts #-}
++{-# LANGUAGE TypeOperators, FlexibleContexts, DeriveDataTypeable #-}
+ {-# LANGUAGE CPP #-}
+ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
+ {-# LANGUAGE Trustworthy #-}
+@@ -24,50 +24,11 @@
+
+ import Prelude (undefined,const,error)
+ import Control.Category
+-
+-#ifdef __GLASGOW_HASKELL__
+-import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
+-#if MIN_VERSION_base(4,4,0)
+-import Data.Typeable (Typeable2(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
+-#else
+-import Data.Typeable (Typeable2(..), TyCon, mkTyCon, mkTyConApp, gcast1)
+-#endif
+-#endif
++import Data.Typeable
+
+ data Dual k a b = Dual { runDual :: k b a }
++ deriving Typeable
+
+ instance Category k => Category (Dual k) where
+ id = Dual id
+ Dual f . Dual g = Dual (g . f)
+-
+-#ifdef __GLASGOW_HASKELL__
+-instance Typeable2 k => Typeable2 (Dual k) where
+- typeOf2 tfab = mkTyConApp dataTyCon [typeOf2 (undefined `asDualArgsType` tfab)]
+- where asDualArgsType :: f b a -> t f a b -> f b a
+- asDualArgsType = const
+-
+-dataTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-dataTyCon = mkTyCon3 "categories" "Control.Category.Dual" "Dual"
+-#else
+-dataTyCon = mkTyCon "Control.Category.Dual.Dual"
+-#endif
+-{-# NOINLINE dataTyCon #-}
+-
+-dualConstr :: Constr
+-dualConstr = mkConstr dataDataType "Dual" [] Prefix
+-{-# NOINLINE dualConstr #-}
+-
+-dataDataType :: DataType
+-dataDataType = mkDataType "Control.Category.Dual.Dual" [dualConstr]
+-{-# NOINLINE dataDataType #-}
+-
+-instance (Typeable2 k, Data a, Data b, Data (k b a)) => Data (Dual k a b) where
+- gfoldl f z (Dual a) = z Dual `f` a
+- toConstr _ = dualConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z Dual)
+- _ -> error "gunfold"
+- dataTypeOf _ = dataDataType
+- dataCast1 f = gcast1 f
+-#endif
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
deleted file mode 100644
index 540c4cad7ef..00000000000
--- a/math/hs-comonad-transformers/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= comonad-transformers
-PORTVERSION= 3.0.2
-PORTREVISION= 4
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Comonad transformers
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 distributive>=0.2.2 \
- semigroupoids>=3.0 semigroups>=0.8.3.1 transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-comonad-transformers/distinfo b/math/hs-comonad-transformers/distinfo
deleted file mode 100644
index 4b70cdbaefc..00000000000
--- a/math/hs-comonad-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/comonad-transformers-3.0.2.tar.gz) = 2d9d31329b02e005b32fa85608cc026e464e22aa8dd44e15217700772e8620a4
-SIZE (cabal/comonad-transformers-3.0.2.tar.gz) = 8381
diff --git a/math/hs-comonad-transformers/pkg-descr b/math/hs-comonad-transformers/pkg-descr
deleted file mode 100644
index d2ac6c6de82..00000000000
--- a/math/hs-comonad-transformers/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Comonad transformers.
-
-WWW: http://github.com/ekmett/comonad-transformers/
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 508cca5fe5d..e31e61b7b99 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 3.0.2
-PORTREVISION= 5
+PORTVERSION= 4.2.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 compatible comonads
+COMMENT= Comonads
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.8.3 transformers>=0.2
+USE_CABAL= contravariant>=0.2.0.1 distributive>=0.2.2 semigroups>=0.8.3.1 \
+ tagged>=0.1 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 2a8f812b7bf..f93c8be2c7e 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-3.0.2.tar.gz) = 5e3999df99acb4a956b6593718a0aa099c5386fc7f88915c963517d6998bde67
-SIZE (cabal/comonad-3.0.2.tar.gz) = 7660
+SHA256 (cabal/comonad-4.2.2.tar.gz) = 4822281f025267480e03da26f9dcfeebffeb85e759861596b44d731981674e08
+SIZE (cabal/comonad-4.2.2.tar.gz) = 15726
diff --git a/math/hs-comonad/pkg-descr b/math/hs-comonad/pkg-descr
index dbfe091539f..a00dc05b21e 100644
--- a/math/hs-comonad/pkg-descr
+++ b/math/hs-comonad/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 compatible comonads.
+Comonads.
WWW: http://github.com/ekmett/comonad/
diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile
deleted file mode 100644
index 0ff058d79cb..00000000000
--- a/math/hs-comonads-fd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= comonads-fd
-PORTVERSION= 3.0.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Comonad transformers using functional dependencies
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 mtl>=2.0 \
- semigroups>=0.8.3.1 transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-comonads-fd/distinfo b/math/hs-comonads-fd/distinfo
deleted file mode 100644
index 87725c14fc4..00000000000
--- a/math/hs-comonads-fd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/comonads-fd-3.0.1.tar.gz) = deb75179224f69d6987f5c7d4186b151afa2125d35243088fa0b8c000fd7e92a
-SIZE (cabal/comonads-fd-3.0.1.tar.gz) = 3494
diff --git a/math/hs-comonads-fd/pkg-descr b/math/hs-comonads-fd/pkg-descr
deleted file mode 100644
index 2854ac4d1d2..00000000000
--- a/math/hs-comonads-fd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Comonad transformers using functional dependencies.
-
-WWW: http://github.com/ekmett/comonads-fd/
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 52c5209bb3a..316a789090a 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= contravariant
-PORTVERSION= 0.4
-PORTREVISION= 5
+PORTVERSION= 1.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 contravariant functors
+COMMENT= Contravariant functors
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= tagged>=0.4.4 transformers>=0.3
+USE_CABAL= semigroups>=0.15.2 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index 16145605d7e..689f10098b9 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/contravariant-0.4.tar.gz) = 8361967a6ee1a3fe113a57242507f56364d8c3daf558370633db74b613a31adb
-SIZE (cabal/contravariant-0.4.tar.gz) = 3277
+SHA256 (cabal/contravariant-1.1.tar.gz) = 10da1f37d9342b61d5b75bc95f6caa873ab266ff1f8b8ca59d4f2297e8335848
+SIZE (cabal/contravariant-1.1.tar.gz) = 4845
diff --git a/math/hs-contravariant/files/patch-contravariant.cabal b/math/hs-contravariant/files/patch-contravariant.cabal
deleted file mode 100644
index 8dccf0102fe..00000000000
--- a/math/hs-contravariant/files/patch-contravariant.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./contravariant.cabal.orig 2013-02-05 23:24:34.000000000 +0100
-+++ ./contravariant.cabal 2013-02-10 10:56:13.000000000 +0100
-@@ -25,8 +25,7 @@
- build-depends:
- base < 5,
- tagged >= 0.4.4 && < 1,
-- transformers >= 0.2 && < 0.4,
-- transformers-compat >= 0.1 && < 1
-+ transformers >= 0.3 && < 0.4
- exposed-modules:
- Data.Functor.Contravariant
- Data.Functor.Contravariant.Compose
diff --git a/math/hs-contravariant/pkg-descr b/math/hs-contravariant/pkg-descr
index 1bf600d0adf..f4c854e6238 100644
--- a/math/hs-contravariant/pkg-descr
+++ b/math/hs-contravariant/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 contravariant functors.
+Contravariant functors.
WWW: http://github.com/ekmett/contravariant/
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index fa4cf8bd1e3..b356be59f55 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= data-lens-template
-PORTVERSION= 2.1.7
-PORTREVISION= 7
+PORTVERSION= 2.1.8
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities for Data.Lens
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-lens>=2.0
diff --git a/math/hs-data-lens-template/distinfo b/math/hs-data-lens-template/distinfo
index 3338afcfd07..421fae8bbe0 100644
--- a/math/hs-data-lens-template/distinfo
+++ b/math/hs-data-lens-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-template-2.1.7.tar.gz) = 897046267245481834d4aa972de77af9c09fd4b861c9ddb609806bfacadc1d81
-SIZE (cabal/data-lens-template-2.1.7.tar.gz) = 3332
+SHA256 (cabal/data-lens-template-2.1.8.tar.gz) = 18281e49e5e7e8540e956f14d643834931a0d39acfe1450e061fa536ec2f1d71
+SIZE (cabal/data-lens-template-2.1.8.tar.gz) = 3405
diff --git a/math/hs-data-lens-template/pkg-descr b/math/hs-data-lens-template/pkg-descr
index b65b50f489c..9b04025aed3 100644
--- a/math/hs-data-lens-template/pkg-descr
+++ b/math/hs-data-lens-template/pkg-descr
@@ -1,3 +1,3 @@
Automatically derive Lenses for your data type for use with Data.Lens.
-WWW: http://github.com/ekmett/data-lens-template/
+WWW: http://github.com/roconnor/data-lens-template/
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 003cf6a6f69..af26754fc25 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= data-lens
-PORTVERSION= 2.10.2
-PORTREVISION= 7
+PORTVERSION= 2.10.5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 lenses
+COMMENT= Used to be Haskell 98 Lenses
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=1.1.1.3 comonad-transformers>=2.0 \
- semigroupoids>=1.2.4 transformers>=0.2.0
+USE_CABAL= comonad>=4.0 semigroupoids>=4.0
.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 1899c71726c..656f99f0b0a 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-2.10.2.tar.gz) = 6591e2f4712d262c49eea32788699eec6cab929c074496504b0057980ba464d7
-SIZE (cabal/data-lens-2.10.2.tar.gz) = 6012
+SHA256 (cabal/data-lens-2.10.5.tar.gz) = 20456098f36cfb436cd84dcdd98a58160cc25ce6d202d00e9a3002073a27ca86
+SIZE (cabal/data-lens-2.10.5.tar.gz) = 6063
diff --git a/math/hs-data-lens/pkg-descr b/math/hs-data-lens/pkg-descr
index fea8146d8fe..1429af39cd0 100644
--- a/math/hs-data-lens/pkg-descr
+++ b/math/hs-data-lens/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 lenses.
+Used to be Haskell 98 Lenses.
WWW: http://github.com/roconnor/data-lens/
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index f4a6e8f1ada..d2347a8d686 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTVERSION= 0.4.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 distributive functors -- Dual to Traversable
+COMMENT= Distributive functors -- Dual to Traversable
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= transformers>=0.3
+USE_CABAL= 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 3cbeeb3c357..78fbbd2194b 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/distributive-0.3.1.tar.gz) = 6c49c36c7c098b3640ff03c3379d766ef23c9914053d671e584ba7df03e6c37d
-SIZE (cabal/distributive-0.3.1.tar.gz) = 5900
+SHA256 (cabal/distributive-0.4.4.tar.gz) = 82d1f53495fe9c25e4e974825666b4a6232af7452784e145cc04aeb365b25468
+SIZE (cabal/distributive-0.4.4.tar.gz) = 6686
diff --git a/math/hs-distributive/files/patch-distributive.cabal b/math/hs-distributive/files/patch-distributive.cabal
deleted file mode 100644
index 6e956aa320c..00000000000
--- a/math/hs-distributive/files/patch-distributive.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./distributive.cabal.orig 2013-01-06 18:34:35.000000000 +0100
-+++ ./distributive.cabal 2013-01-14 20:36:11.000000000 +0100
-@@ -33,8 +33,7 @@
- library
- build-depends:
- base >= 4 && < 5,
-- transformers >= 0.2 && < 0.4,
-- transformers-compat >= 0.1 && < 0.2
-+ transformers >= 0.3 && < 0.4
-
- hs-source-dirs: src
- exposed-modules: Data.Distributive
diff --git a/math/hs-distributive/pkg-descr b/math/hs-distributive/pkg-descr
index af14ab605ad..1d5151f6f3f 100644
--- a/math/hs-distributive/pkg-descr
+++ b/math/hs-distributive/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 distributive functors -- dual to Traversable.
+Distributive functors -- Dual to Traversable.
WWW: http://github.com/ekmett/distributive/
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 9f4a8c4d259..627d6b3532a 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,13 +3,13 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The error function, erf, and friends for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile
deleted file mode 100644
index 4e9f39a51a8..00000000000
--- a/math/hs-groupoids/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= groupoids
-PORTVERSION= 3.0.1.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 Groupoids
-
-LICENSE= BSD
-
-USE_CABAL= semigroupoids>=3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-groupoids/distinfo b/math/hs-groupoids/distinfo
deleted file mode 100644
index 6ed86ea9df9..00000000000
--- a/math/hs-groupoids/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/groupoids-3.0.1.1.tar.gz) = c35c27bdee4f43f86e649356a41635911e8c66c9701da19515a5b178b0979d64
-SIZE (cabal/groupoids-3.0.1.1.tar.gz) = 2935
diff --git a/math/hs-groupoids/pkg-descr b/math/hs-groupoids/pkg-descr
deleted file mode 100644
index 20697c4e078..00000000000
--- a/math/hs-groupoids/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Haskell 98 Groupoids.
-
-WWW: http://github.com/ekmett/groupoids/
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index c2b553ff12f..46a759a87a3 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,13 +2,13 @@
PORTNAME= ieee754
PORTVERSION= 0.7.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities for dealing with IEEE floating point numbers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index b3753d4e667..3028d6754cd 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= math-functions
-PORTVERSION= 0.1.3.0
-PORTREVISION= 5
+PORTVERSION= 0.1.5.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Special mathematical functions and Chebyshev polynomials
+COMMENT= Special functions and Chebyshev polynomials
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= erf>=2 vector>=0.7
+USE_CABAL= erf>=2 vector>=0.7 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 32964fffb4d..53429c2bf28 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/math-functions-0.1.3.0.tar.gz) = c5abf1f44ef52c30e5dab9675e8fb8605e6568ea356ed1fd9d4f57b81cca9d1b
-SIZE (cabal/math-functions-0.1.3.0.tar.gz) = 23729
+SHA256 (cabal/math-functions-0.1.5.2.tar.gz) = 9ec9b809d33c3b4deebc07d8e776cb3f81866e99906ed84f9c4145fe8eb39f89
+SIZE (cabal/math-functions-0.1.5.2.tar.gz) = 28490
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index e4963a3b14c..aab0d227b48 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= mwc-random
-PORTVERSION= 0.12.0.1
-PORTREVISION= 6
+PORTVERSION= 0.13.1.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast, high quality pseudo random number generation
+COMMENT= Fast, high-quality pseudo random number generation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= primitive vector>=0.7
diff --git a/math/hs-mwc-random/distinfo b/math/hs-mwc-random/distinfo
index 3cbf5a63cc0..fab61f5eec3 100644
--- a/math/hs-mwc-random/distinfo
+++ b/math/hs-mwc-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mwc-random-0.12.0.1.tar.gz) = ec78bdcdf87ed4ea390a20337f04dd551dbd62fc1846cd7f466a862162f704eb
-SIZE (cabal/mwc-random-0.12.0.1.tar.gz) = 19471
+SHA256 (cabal/mwc-random-0.13.1.2.tar.gz) = 113f1ff03412e49f1f87815c99c007f063d5aef3be3039de57a09c6dd3ad0a2c
+SIZE (cabal/mwc-random-0.13.1.2.tar.gz) = 20831
diff --git a/math/hs-nats/Makefile b/math/hs-nats/Makefile
index 4d20beb3120..3b62446d045 100644
--- a/math/hs-nats/Makefile
+++ b/math/hs-nats/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= nats
-PORTVERSION= 0.1
-PORTREVISION= 5
+PORTVERSION= 0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 natural numbers
+COMMENT= Natural numbers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-nats/distinfo b/math/hs-nats/distinfo
index 858b141455d..2b3a2fa2cb1 100644
--- a/math/hs-nats/distinfo
+++ b/math/hs-nats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/nats-0.1.tar.gz) = 7e87fa4ac81bc35a3f1dafca011c19b95f869ddd15e30a5348e0685ea53cf021
-SIZE (cabal/nats-0.1.tar.gz) = 3734
+SHA256 (cabal/nats-0.2.tar.gz) = e364218c0cad3602b14d3bc3866b9a8958c075dd1346d935e5362fa88ac65317
+SIZE (cabal/nats-0.2.tar.gz) = 4740
diff --git a/math/hs-nats/pkg-descr b/math/hs-nats/pkg-descr
index 0fb820219cf..ae9b740b07e 100644
--- a/math/hs-nats/pkg-descr
+++ b/math/hs-nats/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 natural numbers.
+Natural numbers.
WWW: http://github.com/ekmett/nats/
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 14bd5b91873..c7bc75c9517 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 3.0.2
-PORTREVISION= 6
+PORTVERSION= 4.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 pointed and copointed data
+COMMENT= Pointed and copointed data
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=3 comonad-transformers>=3 data-default>=0.4 \
- semigroupoids>=3.0 semigroups>=0.8.3.1 stm>=2.1.2.1 \
- transformers>=0.2
+USE_CABAL= comonad>=4 data-default-class>=0.0.1 semigroupoids>=4 \
+ semigroups>=0.8.3.1 stm>=2.1.2.1 tagged>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 25262b978d4..8ca86b11564 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pointed-3.0.2.tar.gz) = 10c6aae5d0d18ae10c7901a07b6dc53eb340eaa84eca2265f04aea3a4a27e8d8
-SIZE (cabal/pointed-3.0.2.tar.gz) = 3084
+SHA256 (cabal/pointed-4.1.tar.gz) = cf4cb662ea5d3ebdcc42ab953b92dcfb4571a579e0ec193e5ed084ae03b580d0
+SIZE (cabal/pointed-4.1.tar.gz) = 3232
diff --git a/math/hs-pointed/pkg-descr b/math/hs-pointed/pkg-descr
index 1a41b00150b..3b3775c01d1 100644
--- a/math/hs-pointed/pkg-descr
+++ b/math/hs-pointed/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 pointed and copointed data.
+Pointed and copointed data.
WWW: http://github.com/ekmett/pointed/
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 59b6fd984f5..658af5df94c 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= probability
-PORTVERSION= 0.2.4
-PORTREVISION= 8
+PORTVERSION= 0.2.4.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Probabilistic Functional Programming
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= random>=1.0 transformers>=0.0.1 utility-ht>=0.0.6
+USE_CABAL= random>=1.0 utility-ht>=0.0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-probability/distinfo b/math/hs-probability/distinfo
index 7eca7d23ec3..7f8ddae0d82 100644
--- a/math/hs-probability/distinfo
+++ b/math/hs-probability/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/probability-0.2.4.tar.gz) = eaf8f2b9c673d15f5a492d56b6895b04c490cee2d240a300046d12cc6a13cce1
-SIZE (cabal/probability-0.2.4.tar.gz) = 27208
+SHA256 (cabal/probability-0.2.4.1.tar.gz) = 6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a
+SIZE (cabal/probability-0.2.4.1.tar.gz) = 27023
diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile
deleted file mode 100644
index 5b82e3285f1..00000000000
--- a/math/hs-semigroupoid-extras/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= semigroupoid-extras
-PORTVERSION= 3.0.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Semigroupoids requiring Haskell extensions
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3 distributive>=0.2.2 groupoids>=3 semigroupoids>=3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-semigroupoid-extras/distinfo b/math/hs-semigroupoid-extras/distinfo
deleted file mode 100644
index f9854557492..00000000000
--- a/math/hs-semigroupoid-extras/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/semigroupoid-extras-3.0.1.tar.gz) = ed762d6c59ca75abc6fe0a7ed0119757588daca25d0ebc1681612be96bead1ac
-SIZE (cabal/semigroupoid-extras-3.0.1.tar.gz) = 5284
diff --git a/math/hs-semigroupoid-extras/pkg-descr b/math/hs-semigroupoid-extras/pkg-descr
deleted file mode 100644
index 87c1c79973b..00000000000
--- a/math/hs-semigroupoid-extras/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Semigroupoids and semigroupoid operations requiring Haskell extensions.
-
-WWW: http://github.com/ekmett/semigroupoid-extras
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index bfa9a133cd0..03a85438a8d 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 3.0.2
-PORTREVISION= 6
+PORTVERSION= 4.0.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 semigroupoids: Category sans id
+COMMENT= Semigroupoids: Category sans id
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 semigroups>=0.8.3.1 \
- transformers>=0.2
+USE_CABAL= comonad>=4 contravariant>=0.2.0.1 distributive>=0.2.2 \
+ semigroups>=0.8.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 40be9cf6c41..b649ac80e22 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroupoids-3.0.2.tar.gz) = 95bb528ddbf75fd357fbbada902060291400fa62a3734c7c7d5903ee543c234c
-SIZE (cabal/semigroupoids-3.0.2.tar.gz) = 12007
+SHA256 (cabal/semigroupoids-4.0.4.tar.gz) = 198dec1ba80a37c00691f9c1f10f076beb7e2f4de3501be565962eb9ae19657a
+SIZE (cabal/semigroupoids-4.0.4.tar.gz) = 16194
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 8e8cc8cb68e..1dccdc6b5b4 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.9.1
-PORTREVISION= 4
+PORTVERSION= 0.15.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 semigroups
+COMMENT= Anything that associates
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= nats>=0.1
+USE_CABAL= hashable>=1.1 nats>=0.1 text>=0.10 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 f79856f2898..dd868cade6d 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.9.1.tar.gz) = b8fbf8c6279dea64a0e332f82b845213ca790ea2b2305cbfb67d25ee000a89c4
-SIZE (cabal/semigroups-0.9.1.tar.gz) = 9556
+SHA256 (cabal/semigroups-0.15.2.tar.gz) = 7716062afb636193fed5f544cbed96fe329c461db90cf3a45b7f475e413300d2
+SIZE (cabal/semigroups-0.15.2.tar.gz) = 11723
diff --git a/math/hs-semigroups/pkg-descr b/math/hs-semigroups/pkg-descr
index 9d25811291c..ab2cb213a4a 100644
--- a/math/hs-semigroups/pkg-descr
+++ b/math/hs-semigroups/pkg-descr
@@ -1,8 +1,8 @@
-Haskell 98 semigroups. In mathematics, a semigroup is an algebraic structure
-consisting of a set together with an associative binary operation. A
-semigroup generalizes a monoid in that there might not exist an identity
-element. It also (originally) generalized a group (a monoid with all
-inverses) to a type where every element did not have to have an inverse,
-thus the name semigroup.
+In mathematics, a semigroup is an algebraic structure consisting of a
+set together with an associative binary operation. A semigroup
+generalizes a monoid in that there might not exist an identity element.
+It also (originally) generalized a group (a monoid with all inverses) to
+a type where every element did not have to have an inverse, thus the
+name semigroup.
WWW: http://github.com/ekmett/semigroups/
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index a0346366246..4527962f465 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,17 +2,17 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.10.3.1
-PORTREVISION= 4
+PORTVERSION= 0.13.2.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library of statistical types, data, and functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= erf math-functions>=0.1.2 monad-par>=0.3.4 mwc-random>=0.11.0.0 \
- primitive>=0.3 vector>=0.7.1 vector-algorithms>=0.4
+USE_CABAL= aeson>=0.6.0.0 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
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 25c293f98ad..3c77fbaf4ec 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/statistics-0.10.3.1.tar.gz) = 1a98a923c37850b16d85e1a6bb0dc315068241d58c736032b314c7ac3b764b89
-SIZE (cabal/statistics-0.10.3.1.tar.gz) = 63082
+SHA256 (cabal/statistics-0.13.2.1.tar.gz) = 6aef1be73b9f3b2df0f4938d5981e6e343d73b9b11658dfb86b659692f5e313e
+SIZE (cabal/statistics-0.13.2.1.tar.gz) = 79625
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 7ad97e2deb9..45af75d6f90 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.8.6
-PORTREVISION= 7
+PORTVERSION= 0.8.7
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Vector & affine spaces, linear maps, and derivatives
+COMMENT= Vector and affine spaces, linear maps, and derivatives
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= Boolean>=0.1.0 MemoTrie>=0.5 NumInstances>=1.0
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index 5177144420d..ad975ed5c39 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-space-0.8.6.tar.gz) = 94b0e355e82cc8af180554ab05fbe6ff4f35a7fc888c3337d16f596f21167f0e
-SIZE (cabal/vector-space-0.8.6.tar.gz) = 13630
+SHA256 (cabal/vector-space-0.8.7.tar.gz) = 75076924a56c58cd44ca1e07286a6b32f0e8d0558d42ba08af7a3e3b16196cc4
+SIZE (cabal/vector-space-0.8.7.tar.gz) = 13882
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
index ff7f6f98c3c..f1bb6f2d639 100644
--- a/multimedia/hs-gstreamer/Makefile
+++ b/multimedia/hs-gstreamer/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gstreamer
-PORTVERSION= 0.12.1.2
-PORTREVISION= 6
+PORTVERSION= 0.12.5.0
CATEGORIES= multimedia haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LIB_DEPENDS= libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 mtl
+USE_CABAL= glib>=0.12.5.0 mtl
BUILD_DEPENDS+= gstreamer-plugins>=0.10:${PORTSDIR}/multimedia/gstreamer-plugins
diff --git a/multimedia/hs-gstreamer/distinfo b/multimedia/hs-gstreamer/distinfo
index 22767b1207e..4f9967f09c9 100644
--- a/multimedia/hs-gstreamer/distinfo
+++ b/multimedia/hs-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gstreamer-0.12.1.2.tar.gz) = ad17476841141c40b23c6173cbea6581226aa81a225a973893aef9fd9ca163cd
-SIZE (cabal/gstreamer-0.12.1.2.tar.gz) = 92872
+SHA256 (cabal/gstreamer-0.12.5.0.tar.gz) = c633b67d1a687ce781775cea8bf4a250e823473b7cfae145bdceb7ad39102f3f
+SIZE (cabal/gstreamer-0.12.5.0.tar.gz) = 94654
diff --git a/multimedia/hs-gstreamer/pkg-descr b/multimedia/hs-gstreamer/pkg-descr
index 3d4098ac5a9..44535f83030 100644
--- a/multimedia/hs-gstreamer/pkg-descr
+++ b/multimedia/hs-gstreamer/pkg-descr
@@ -3,4 +3,4 @@ library for constructing graphs of media-handling components. The applications
it supports range from simple Ogg/Vorbis playback, audio/video streaming to
complex audio (mixing) and video (non-linear editing) processing.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/net/Makefile b/net/Makefile
index b9a7aeef389..b490e6fc693 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -203,12 +203,15 @@
SUBDIR += howl
SUBDIR += hping
SUBDIR += hping-devel
+ SUBDIR += hs-connection
+ SUBDIR += hs-gsasl
SUBDIR += hs-hostname
+ SUBDIR += hs-iproute
SUBDIR += hs-maccatcher
SUBDIR += hs-network
- SUBDIR += hs-network-conduit
SUBDIR += hs-network-info
SUBDIR += hs-network-multicast
+ SUBDIR += hs-network-protocol-xmpp
SUBDIR += hs-pcap
SUBDIR += hs-publicsuffixlist
SUBDIR += hs-sendfile
diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile
new file mode 100644
index 00000000000..54f5adf2975
--- /dev/null
+++ b/net/hs-connection/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= connection
+PORTVERSION= 0.2.3
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple and easy network connections API
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= cprng-aes data-default-class network>=2.3 socks>=0.4 \
+ tls>=1.2 x509>=1.4 x509-store>=1.4 x509-system>=1.4 \
+ x509-validation>=1.5
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-connection/distinfo b/net/hs-connection/distinfo
new file mode 100644
index 00000000000..b8a65f4ee76
--- /dev/null
+++ b/net/hs-connection/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/connection-0.2.3.tar.gz) = 4b6f62d66bebc38052e98f2b6798acdb79c9171b170d2e059aaa697d53b0b80a
+SIZE (cabal/connection-0.2.3.tar.gz) = 7621
diff --git a/net/hs-connection/pkg-descr b/net/hs-connection/pkg-descr
new file mode 100644
index 00000000000..aad4e8aab15
--- /dev/null
+++ b/net/hs-connection/pkg-descr
@@ -0,0 +1,6 @@
+Simple network library for all your connection need. Features: Really
+simple to use, SSL/TLS, SOCKS. This library provides a very simple api
+to create sockets to a destination with the choice of SSL/TLS, and
+SOCKS.
+
+WWW: http://github.com/vincenthz/hs-connection
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
new file mode 100644
index 00000000000..727db8de247
--- /dev/null
+++ b/net/hs-gsasl/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= gsasl
+PORTVERSION= 0.3.5
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings for GNU libgsasl
+
+LICENSE= GPLv3
+
+USES= pkgconfig
+LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-gsasl/distinfo b/net/hs-gsasl/distinfo
new file mode 100644
index 00000000000..a131f7646ff
--- /dev/null
+++ b/net/hs-gsasl/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/gsasl-0.3.5.tar.gz) = a3aecd149b580e2afc0f3473e806e2245a0b649df6c8359540fa65af8dce279d
+SIZE (cabal/gsasl-0.3.5.tar.gz) = 20117
diff --git a/net/hs-gsasl/pkg-descr b/net/hs-gsasl/pkg-descr
new file mode 100644
index 00000000000..245ab400f88
--- /dev/null
+++ b/net/hs-gsasl/pkg-descr
@@ -0,0 +1,3 @@
+Bindings for GNU libgsasl.
+
+WWW: https://john-millikin.com/software/haskell-gsasl/
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index fa135bdc519..cbd54e1ad6d 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,13 +2,13 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cross-platform means of determining the hostname
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile
new file mode 100644
index 00000000000..00cf3e35817
--- /dev/null
+++ b/net/hs-iproute/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= iproute
+PORTVERSION= 1.3.1
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= IP Routing Table
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= appar byteorder network
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-iproute/distinfo b/net/hs-iproute/distinfo
new file mode 100644
index 00000000000..0d63cbcabc6
--- /dev/null
+++ b/net/hs-iproute/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/iproute-1.3.1.tar.gz) = b73104d337f14e63e1ca84dd37405df28e7a7f7e714e83efd63cca80d1d66ad0
+SIZE (cabal/iproute-1.3.1.tar.gz) = 9897
diff --git a/net/hs-iproute/pkg-descr b/net/hs-iproute/pkg-descr
new file mode 100644
index 00000000000..533e3608fef
--- /dev/null
+++ b/net/hs-iproute/pkg-descr
@@ -0,0 +1,5 @@
+IP Routing Table is a tree of IP ranges to search one of them on the
+longest match base. It is a kind of TRIE with one way branching removed.
+Both IPv4 and IPv6 are supported.
+
+WWW: http://www.mew.org/~kazu/proj/iproute/
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index b9210467d4d..8fac1dff8ef 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,13 +2,13 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Obtain the host MAC address on *NIX and Windows
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= parsec
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
deleted file mode 100644
index e08c17f393f..00000000000
--- a/net/hs-network-conduit/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= network-conduit
-PORTVERSION= 1.0.0
-PORTREVISION= 5
-CATEGORIES= net haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Stream socket data using conduits
-
-LICENSE= BSD
-
-USE_CABAL= conduit>=1.0 lifted-base>=0.1 monad-control>=0.3 \
- network>=2.3 transformers>=0.2.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/net/hs-network-conduit/distinfo b/net/hs-network-conduit/distinfo
deleted file mode 100644
index 94d0fadad12..00000000000
--- a/net/hs-network-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/network-conduit-1.0.0.tar.gz) = 63de6be7775d99a56485be57af965aea957c228ea9cae8389b20d03bb9796f9a
-SIZE (cabal/network-conduit-1.0.0.tar.gz) = 5853
diff --git a/net/hs-network-conduit/pkg-descr b/net/hs-network-conduit/pkg-descr
deleted file mode 100644
index 601a30445ae..00000000000
--- a/net/hs-network-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Stream socket data using conduits.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index 0cc71cfc361..b5378d70902 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= network-info
-PORTVERSION= 0.2.0.3
-PORTREVISION= 6
+PORTVERSION= 0.2.0.5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Access the local computer's basic network configuration
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network-info/distinfo b/net/hs-network-info/distinfo
index b80aeea6f6e..f0291a2020a 100644
--- a/net/hs-network-info/distinfo
+++ b/net/hs-network-info/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-info-0.2.0.3.tar.gz) = 42e79146828b3e7dfeca884a4be4fe79f7a84bc4471d8cf1ecf7ea3c55a1dc12
-SIZE (cabal/network-info-0.2.0.3.tar.gz) = 5644
+SHA256 (cabal/network-info-0.2.0.5.tar.gz) = 8ee37b7e3219d18395a3c9020a9be8cfa7c5390f2c4b0e54b5feea35e5b4fd3d
+SIZE (cabal/network-info-0.2.0.5.tar.gz) = 5988
diff --git a/net/hs-network-info/pkg-descr b/net/hs-network-info/pkg-descr
index 17d9f8557cd..f1952a45c1a 100644
--- a/net/hs-network-info/pkg-descr
+++ b/net/hs-network-info/pkg-descr
@@ -1,7 +1,8 @@
This library provides simple read-only access to the local computer's
-networking configuration. It is currently capable of getting a list of
-all the network interfaces and their respective IPv4, IPv6 and MAC addresses.
-network-info has been tested and is known to work on Ubuntu 10.10, Mac OS
-X 10.6.4 and Windows XP.
+networking configuration. It is currently capable of getting a list of
+all the network interfaces and their respective IPv4, IPv6 and MAC
+addresses. network-info has been tested and is known to work on Ubuntu
+10.10, FreeBSD 9.0, Mac OS X 10.6.4 and Windows XP/7. It probably works
+on other flavours of Linux, OS X, FreeBSD and Windows as well.
WWW: http://github.com/jystic/network-info
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index 221b4bc248c..7ebf266cdc2 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network-multicast
-PORTVERSION= 0.0.7
-PORTREVISION= 6
+PORTVERSION= 0.0.11
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/distinfo b/net/hs-network-multicast/distinfo
index dfa48152f1b..1c8fabe7822 100644
--- a/net/hs-network-multicast/distinfo
+++ b/net/hs-network-multicast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-multicast-0.0.7.tar.gz) = 8360edb6d575493331a92f03950e0039cad9ab09bf40bceaf821b2f3187914a3
-SIZE (cabal/network-multicast-0.0.7.tar.gz) = 2886
+SHA256 (cabal/network-multicast-0.0.11.tar.gz) = 65842175e53bb72164b7b1a448a3cc4bdf42df8d64089853ea54ccccd266fa39
+SIZE (cabal/network-multicast-0.0.11.tar.gz) = 2970
diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile
new file mode 100644
index 00000000000..059e0bc81a7
--- /dev/null
+++ b/net/hs-network-protocol-xmpp/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= network-protocol-xmpp
+PORTVERSION= 0.4.6
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Client library for the XMPP protocol
+
+LICENSE= GPLv3
+
+USE_CABAL= gnuidn>=0.2 gnutls>=0.1.4 gsasl>=0.3 libxml-sax>=0.7 \
+ monads-tf>=0.1 network>=2.2 text>=0.10 xml-types>=0.3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-network-protocol-xmpp/distinfo b/net/hs-network-protocol-xmpp/distinfo
new file mode 100644
index 00000000000..60fb116b3f2
--- /dev/null
+++ b/net/hs-network-protocol-xmpp/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/network-protocol-xmpp-0.4.6.tar.gz) = d6ec010deff24503e8f8fdb67cfd10ba84f19907c95bf1fca24dec10be74aa76
+SIZE (cabal/network-protocol-xmpp-0.4.6.tar.gz) = 24100
diff --git a/net/hs-network-protocol-xmpp/pkg-descr b/net/hs-network-protocol-xmpp/pkg-descr
new file mode 100644
index 00000000000..cb14430f34c
--- /dev/null
+++ b/net/hs-network-protocol-xmpp/pkg-descr
@@ -0,0 +1,3 @@
+Client library for the XMPP protocol.
+
+WWW: https://john-millikin.com/software/haskell-xmpp/
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 432b828bfdb..048a4a8d570 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= network
-PORTVERSION= 2.4.1.2
-PORTREVISION= 4
+PORTVERSION= 2.4.2.3
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Low-level networking interface
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= parsec>=3.0
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index 7649f3a2ef8..f5340112bb5 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-2.4.1.2.tar.gz) = b04dc56542428bc92f11263f500b3ad82e6a0787805601472d59af7e769bfe38
-SIZE (cabal/network-2.4.1.2.tar.gz) = 140424
+SHA256 (cabal/network-2.4.2.3.tar.gz) = 801b9c652dae626bf4a96175162b1290e7fe7ff20d802d62434d5ae1d363c16d
+SIZE (cabal/network-2.4.2.3.tar.gz) = 141749
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index adf13f75eba..1078f3ae34d 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,13 +3,13 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= System-independent interface for user-level packet capture
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= network
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index 98841a08d38..4ca7eaf9221 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -2,13 +2,13 @@
PORTNAME= publicsuffixlist
PORTVERSION= 0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Is a given string a domain suffix?
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cereal data-default text>=0.11 utf8-string
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 7b46d1943c1..986b140e4ae 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,13 +2,13 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Portable sendfile library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= network>=2
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 4ba52b069d7..87234ff7773 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.11
-PORTREVISION= 5
+PORTVERSION= 0.2.15
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cross-platform library for the sendfile() system call
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= network
+USE_CABAL= network resourcet
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index 74441c13ab9..cc996f48dca 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-sendfile-0.2.11.tar.gz) = d26162f7025660e9a6cb38b866522a76444a289307381a94b1d3c9b43b4d35e1
-SIZE (cabal/simple-sendfile-0.2.11.tar.gz) = 7166
+SHA256 (cabal/simple-sendfile-0.2.15.tar.gz) = 49fa29f71239f59ee9a141f9c9ca0d3e2f3428b416a822cb6abc6ff6050442b9
+SIZE (cabal/simple-sendfile-0.2.15.tar.gz) = 7321
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index bec490bd838..92a74d95d9b 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= socks
-PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTVERSION= 0.5.4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Socks proxy (version 5) implementation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cereal>=0.3.1 network>=2.3
diff --git a/net/hs-socks/distinfo b/net/hs-socks/distinfo
index 04a0707d166..f084eb06116 100644
--- a/net/hs-socks/distinfo
+++ b/net/hs-socks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/socks-0.5.1.tar.gz) = 5e012550f7aa732a2b9a68bd69606a8c92ebcb04f45461715312aa49df5cfc23
-SIZE (cabal/socks-0.5.1.tar.gz) = 7917
+SHA256 (cabal/socks-0.5.4.tar.gz) = e9b5e1ea78592632bb086e5f4d6da523be01921a4a8998ca78552bdc396db4da
+SIZE (cabal/socks-0.5.4.tar.gz) = 8021
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index bdb12ef71d6..c87957c86a9 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,13 +3,13 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
COMMENT= FreeBSD ports index search and statistical analysis tool
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions stringsearch
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 230b59a8acf..b4132b91d2a 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hscolour
PORTVERSION= 1.20.3
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= print haskell
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index ea05d11bf4e..63364b31311 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= bio
-PORTVERSION= 0.5.2
-PORTREVISION= 8
+PORTVERSION= 0.5.3
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Bioinformatics library
LICENSE= LGPL21
-USE_CABAL= mtl parallel parsec QuickCheck>=2 tagsoup>=0.8
+USE_CABAL= mtl parallel parsec QuickCheck>=2 random tagsoup>=0.8
EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe
diff --git a/science/hs-bio/distinfo b/science/hs-bio/distinfo
index 5baf5e85610..f4b6aab534a 100644
--- a/science/hs-bio/distinfo
+++ b/science/hs-bio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bio-0.5.2.tar.gz) = a3e10bef6bfa5187e34bdc1eac7616e7d4ef926173e95b73170f7580bda74070
-SIZE (cabal/bio-0.5.2.tar.gz) = 102316
+SHA256 (cabal/bio-0.5.3.tar.gz) = 42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed
+SIZE (cabal/bio-0.5.3.tar.gz) = 103707
diff --git a/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs b/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs
deleted file mode 100644
index 6f83130df05..00000000000
--- a/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Bio/GFF3/FeatureHierSequences.hs.orig 2012-02-23 14:45:38.000000000 +0100
-+++ ./Bio/GFF3/FeatureHierSequences.hs 2013-05-01 00:28:58.000000000 +0200
-@@ -15,6 +15,7 @@
- import qualified Data.Map as M
- import Data.Maybe
- import qualified Data.Set as S
-+import System.IO.Error (catchIOError)
-
- import Bio.Sequence.SeqData
- import Bio.Sequence.Fasta
-@@ -72,7 +73,7 @@
- return $ Seq seqname sequ Nothing
-
- catchIOErrors :: IO a -> ErrorT String IO a
--catchIOErrors m = ErrorT { runErrorT = liftM Right m `catch` (return . Left . show) }
-+catchIOErrors m = ErrorT { runErrorT = liftM Right m `catchIOError` (return . Left . show) }
-
- runGFF :: FilePath -> (ErrorT String (Reader FeatureHierSequences) a) -> ErrorT String IO a
- runGFF gffname m = do gff <- catchIOErrors $ LBS.readFile gffname
diff --git a/security/Makefile b/security/Makefile
index f577827ba1f..2fd3dbc5408 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -176,31 +176,44 @@
SUBDIR += horde3-jeta
SUBDIR += hotssh
SUBDIR += hs-Crypto
+ SUBDIR += hs-DRBG
SUBDIR += hs-HsOpenSSL
SUBDIR += hs-RSA
SUBDIR += hs-SHA
SUBDIR += hs-certificate
SUBDIR += hs-cipher-aes
+ SUBDIR += hs-cipher-aes128
+ SUBDIR += hs-cipher-blowfish
+ SUBDIR += hs-cipher-camellia
+ SUBDIR += hs-cipher-des
SUBDIR += hs-cipher-rc4
SUBDIR += hs-clientsession
SUBDIR += hs-cprng-aes
SUBDIR += hs-crypto-api
+ SUBDIR += hs-crypto-cipher-types
SUBDIR += hs-crypto-conduit
SUBDIR += hs-crypto-numbers
SUBDIR += hs-crypto-pubkey
SUBDIR += hs-crypto-pubkey-types
+ SUBDIR += hs-crypto-random
SUBDIR += hs-crypto-random-api
SUBDIR += hs-cryptocipher
SUBDIR += hs-cryptohash
+ SUBDIR += hs-cryptohash-conduit
+ SUBDIR += hs-cryptohash-cryptoapi
SUBDIR += hs-digest
SUBDIR += hs-entropy
+ SUBDIR += hs-gnutls
SUBDIR += hs-monadcryptorandom
SUBDIR += hs-pem
SUBDIR += hs-pureMD5
SUBDIR += hs-pwstore-fast
SUBDIR += hs-skein
SUBDIR += hs-tls
- SUBDIR += hs-tls-extra
+ SUBDIR += hs-x509
+ SUBDIR += hs-x509-store
+ SUBDIR += hs-x509-system
+ SUBDIR += hs-x509-validation
SUBDIR += httprint
SUBDIR += hunch
SUBDIR += hydra
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 4054fdbf3f2..8ca12b653a7 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Collects together existing Haskell cryptographic functions
USE_CABAL= HUnit QuickCheck>=2.4.0.1 random
-EXECUTABLE= HMACTest QuickTest RSATest SHA1Test SymmetricTest WordListTest
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-Crypto/files/patch-Crypto.cabal b/security/hs-Crypto/files/patch-Crypto.cabal
new file mode 100644
index 00000000000..e0d9f8ca75c
--- /dev/null
+++ b/security/hs-Crypto/files/patch-Crypto.cabal
@@ -0,0 +1,52 @@
+--- ./Crypto.cabal.orig 2012-12-12 14:39:28.000000000 +0100
++++ ./Crypto.cabal 2014-07-20 21:15:26.000000000 +0200
+@@ -58,49 +58,3 @@
+ Codec.Encryption.DESAux,
+ Codec.Encryption.AESAux,
+ Data.Digest.MD5Aux
+-
+-Executable SymmetricTest
+- Main-Is: SymmetricTest.hs
+- Ghc-options: -fregs-graph
+- Other-modules: Codec.Utils
+- Codec.Encryption.Blowfish
+- Codec.Encryption.Modes
+- Codec.Encryption.Padding
+- Codec.Encryption.DES
+- Codec.Encryption.AES
+- Data.LargeWord
+-
+-Executable SHA1Test
+- Main-Is: SHA1Test.hs
+- Ghc-options: -fregs-graph
+- Other-modules: Codec.Text.Raw
+- Data.Digest.SHA1
+-
+-Executable RSATest
+- Main-Is: RSATest.hs
+- Ghc-options: -fregs-graph
+- Other-modules: Codec.Utils
+- Data.Digest.SHA1
+- Codec.Encryption.RSA.MGF
+- Codec.Encryption.RSA.EMEOAEP
+- Codec.Encryption.RSA
+-
+-Executable QuickTest
+- Main-Is: QuickTest.hs
+- Ghc-options: -fregs-graph
+- Extensions: TypeSynonymInstances
+- Other-modules: Codec.Utils
+- Codec.Encryption.Blowfish
+- Codec.Encryption.AES
+- Codec.Encryption.Modes
+- Codec.Encryption.Padding
+- Data.LargeWord
+-
+-Executable HMACTest
+- Main-Is: HMACTest.hs
+- Other-modules: Codec.Utils
+- Data.HMAC
+-
+-Executable WordListTest
+- Main-Is: WordListTest.hs
+- Other-modules: Data.LargeWord
diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile
new file mode 100644
index 00000000000..512dc764d1a
--- /dev/null
+++ b/security/hs-DRBG/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= DRBG
+PORTVERSION= 0.5.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Deterministic random bit generator based HMACs, Hashes, and Ciphers
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= cereal>=0.2 cipher-aes128>=0.6 crypto-api>=0.13 \
+ cryptohash-cryptoapi>=0.1 entropy mtl>=2.0 parallel \
+ prettyclass tagged>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-DRBG/distinfo b/security/hs-DRBG/distinfo
new file mode 100644
index 00000000000..b8f4737a018
--- /dev/null
+++ b/security/hs-DRBG/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/DRBG-0.5.2.tar.gz) = 516396e0b1b421bb5192ea20eb1938e9feaa834a388861e45662de5e05441c31
+SIZE (cabal/DRBG-0.5.2.tar.gz) = 1547807
diff --git a/security/hs-DRBG/pkg-descr b/security/hs-DRBG/pkg-descr
new file mode 100644
index 00000000000..42fd21ca5c7
--- /dev/null
+++ b/security/hs-DRBG/pkg-descr
@@ -0,0 +1,3 @@
+Cryptographically secure RNGs.
+
+WWW: http://hackage.haskell.org/package/DRBG
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index ce68621ce87..2a208a60936 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= HsOpenSSL
-PORTVERSION= 0.10.3.3
-PORTREVISION= 6
+PORTVERSION= 0.11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= (Incomplete) OpenSSL binding for Haskell
+COMMENT= Partial OpenSSL binding for Haskell
USE_CABAL= network>=2.1.0.0
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 5c62f550dc8..230220cbf10 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 4519afea3bf551ea314247149df4b6bd7db5c56823424e17e2f42d0645b3a211
-SIZE (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 62767
+SHA256 (cabal/HsOpenSSL-0.11.tar.gz) = d9fba90fee57d13c78f5b940ebb79846b5809992024231f8fe34389f50090c00
+SIZE (cabal/HsOpenSSL-0.11.tar.gz) = 68086
diff --git a/security/hs-HsOpenSSL/pkg-descr b/security/hs-HsOpenSSL/pkg-descr
index 91b18e5ea9c..918c5b8f923 100644
--- a/security/hs-HsOpenSSL/pkg-descr
+++ b/security/hs-HsOpenSSL/pkg-descr
@@ -1,11 +1,7 @@
-HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA and DSA
-keys, read and write PEM files, generate message digests, sign and
-verify messages, encrypt and decrypt messages. It has also some
-capabilities of creating SSL clients and servers. Please note that this
-project has started at the time when there were no pure-Haskell
-implementations of TLS. Now there is tls package, which looks pretty
-saner than HsOpenSSL especially for initialisation and error handlings.
-So PHO (the initial author of HsOpenSSL) highly encourages you to use
-and improve the tls package instead as long as possible.
+HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA and
+DSA keys, read and write PEM files, generate message digests, sign and
+verify messages, encrypt and decrypt messages. It has also some
+capabilities of creating SSL clients and servers. This package is in
+production use by a number of Haskell based systems and stable.
WWW: https://github.com/phonohawk/HsOpenSSL
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 7af911e2f16..05884fb9189 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -1,37 +1,20 @@
# $FreeBSD$
PORTNAME= RSA
-PORTVERSION= 1.2.2.0
-PORTREVISION= 7
+PORTVERSION= 2.0.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Implementation of RSA, using the padding schemes of PKCS#1 v2.1
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 monadcryptorandom SHA
+USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 DRBG>=0.5.2 \
+ monadcryptorandom>0 pureMD5>0 QuickCheck>=2.5 SHA>0 \
+ tagged>=0.2 test-framework>=0.8.0.3 \
+ test-framework-quickcheck2>=0.3.0.2
-OPTIONS_DEFINE= MD5 BINARY
-OPTIONS_DEFAULT= MD5 BINARY
-
-MD5_DESC= Include support for using MD5
-BINARY_DESC= Use the binary package for serialization
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MMD5}
-CONFIGURE_ARGS+= --flags="IncludeMD5"
-USE_CABAL+= pureMD5
-.else
-CONFIGURE_ARGS+= --flags="-IncludeMD5"
-.endif
-
-.if ${PORT_OPTIONS:MBINARY}
-CONFIGURE_ARGS+= --flags="UseBinary"
-.else
-CONFIGURE_ARGS+= --flags="-UseBinary"
-.endif
+FLAGS_DISABLE= BuildTestExecutable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-RSA/distinfo b/security/hs-RSA/distinfo
index 7d51cf257bb..5f747b7d649 100644
--- a/security/hs-RSA/distinfo
+++ b/security/hs-RSA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/RSA-1.2.2.0.tar.gz) = 55845a812a48bc8e0764f8ff3e06a58814da32d61105c798bf976a6040b08a74
-SIZE (cabal/RSA-1.2.2.0.tar.gz) = 12208
+SHA256 (cabal/RSA-2.0.0.tar.gz) = 985f235d34d330a569db692423fd293edc713f2ed58fdc70ac14647cbb364dec
+SIZE (cabal/RSA-2.0.0.tar.gz) = 14498
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index 17f430f031a..b658734df5e 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -1,29 +1,19 @@
# $FreeBSD$
PORTNAME= SHA
-PORTVERSION= 1.6.1
-PORTREVISION= 6
+PORTVERSION= 1.6.4.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Implementations of the SHA suite of message digest functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-OPTIONS_DEFINE= EXE
+FLAGS_DEFINE= EXE
EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-CONFIGURE_ARGS+= --flags="-Test"
-
-.if ${PORT_OPTIONS:MEXE}
-CONFIGURE_ARGS+= --flags="exe"
-EXECUTABLE+= sha1 sha384
-.else
-CONFIGURE_ARGS+= --flags="-exe"
-.endif
+EXE_FLAG_ENABLE= Test
+EXE_FLAG_EXECUTABLE= sha1 sha384
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-SHA/distinfo b/security/hs-SHA/distinfo
index d849fae1b8a..dec23a97586 100644
--- a/security/hs-SHA/distinfo
+++ b/security/hs-SHA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/SHA-1.6.1.tar.gz) = fdb9924aa31493ad198e3b3498a8204cc7013e0ef86215faf1c4e435a7166aec
-SIZE (cabal/SHA-1.6.1.tar.gz) = 2714264
+SHA256 (cabal/SHA-1.6.4.1.tar.gz) = 743bc6d7dd3e74a44bfca8920f0f0ba5855722a62f6cc44f0a38d10c11bddc0d
+SIZE (cabal/SHA-1.6.4.1.tar.gz) = 2715446
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index 962ecb9c1cc..9b0bef5c52d 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -1,31 +1,23 @@
# $FreeBSD$
PORTNAME= certificate
-PORTVERSION= 1.3.7
-PORTREVISION= 4
+PORTVERSION= 1.3.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Certificates and Key Reader/Writer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.3 cryptohash \
+USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.4 cryptohash \
mtl pem>=0.1
-OPTIONS_DEFINE= EXECUTABLE
+FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the executable
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-USE_CABAL+= cmdargs text>=0.11 cryptocipher>=0.3.0
-EXECUTABLE+= certificate
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+EXECUTABLE_DESC= Build the executable
+EXECUTABLE_FLAG_ENABLE= executable
+EXECUTABLE_FLAG_CABAL= cmdargs text>=0.11 cryptohash crypto-pubkey
+EXECUTABLE_FLAG_EXECUTABLE= certificate
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index 1f3f5e59b81..2ae65684d02 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/certificate-1.3.7.tar.gz) = cae38c57ebd2a10fe6d03e37ec24690823da4ef67b1f2cba572fa0718b9a4e1b
-SIZE (cabal/certificate-1.3.7.tar.gz) = 15009
+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 8aa234dac47..1567877c579 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= cipher-aes
-PORTVERSION= 0.1.8
-PORTREVISION= 4
+PORTVERSION= 0.2.8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast AES cipher implementation with advanced mode of operations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable crypto-cipher-types>=0.0.6 securemem>=0.1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
index 19f343704fe..487400d77ae 100644
--- a/security/hs-cipher-aes/distinfo
+++ b/security/hs-cipher-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-aes-0.1.8.tar.gz) = ae87a9f7cd198745a931a8285a3681fdc42216ac450857cd5ba983ba5492359c
-SIZE (cabal/cipher-aes-0.1.8.tar.gz) = 27629
+SHA256 (cabal/cipher-aes-0.2.8.tar.gz) = 3f983ffa2e01abf1973871206add91336cb7618524dc294eb4151e0dfb430f8e
+SIZE (cabal/cipher-aes-0.2.8.tar.gz) = 32542
diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile
new file mode 100644
index 00000000000..e2dfeef5749
--- /dev/null
+++ b/security/hs-cipher-aes128/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cipher-aes128
+PORTVERSION= 0.6.4
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= AES and common modes using AES-NI when available
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= cereal crypto-api>=0.13 tagged
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes128/distinfo b/security/hs-cipher-aes128/distinfo
new file mode 100644
index 00000000000..5f4d8f9b12d
--- /dev/null
+++ b/security/hs-cipher-aes128/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cipher-aes128-0.6.4.tar.gz) = 4a95c3f572aacbe3b0d68c593f45c16014ef96b5e38dd32a8fb6466e10bf7f24
+SIZE (cabal/cipher-aes128-0.6.4.tar.gz) = 23445
diff --git a/security/hs-cipher-aes128/pkg-descr b/security/hs-cipher-aes128/pkg-descr
new file mode 100644
index 00000000000..1f8ede6267d
--- /dev/null
+++ b/security/hs-cipher-aes128/pkg-descr
@@ -0,0 +1,3 @@
+Cipher-aes128 is an implementation of AES and common modes of operation.
+
+WWW: https://github.com/TomMD/cipher-aes128
diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile
new file mode 100644
index 00000000000..768c5decd91
--- /dev/null
+++ b/security/hs-cipher-blowfish/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= cipher-blowfish
+PORTVERSION= 0.0.3
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Blowfish cipher
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable crypto-cipher-types>=0.0.3 securemem>=0.1.2 \
+ vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-blowfish/distinfo b/security/hs-cipher-blowfish/distinfo
new file mode 100644
index 00000000000..8595bc9d23b
--- /dev/null
+++ b/security/hs-cipher-blowfish/distinfo
@@ -0,0 +1,2 @@
+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-blowfish/pkg-descr b/security/hs-cipher-blowfish/pkg-descr
new file mode 100644
index 00000000000..441a4e5c9c9
--- /dev/null
+++ b/security/hs-cipher-blowfish/pkg-descr
@@ -0,0 +1,3 @@
+Blowfish cipher primitives.
+
+WWW: http://github.com/vincenthz/hs-crypto-cipher
diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile
new file mode 100644
index 00000000000..1653443b1fa
--- /dev/null
+++ b/security/hs-cipher-camellia/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= cipher-camellia
+PORTVERSION= 0.0.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Camellia block cipher primitives
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable crypto-cipher-types>=0.0.3 securemem>=0.1.2 \
+ vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-camellia/distinfo b/security/hs-cipher-camellia/distinfo
new file mode 100644
index 00000000000..5b49f8f1663
--- /dev/null
+++ b/security/hs-cipher-camellia/distinfo
@@ -0,0 +1,2 @@
+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-camellia/pkg-descr b/security/hs-cipher-camellia/pkg-descr
new file mode 100644
index 00000000000..4c6d9836f2c
--- /dev/null
+++ b/security/hs-cipher-camellia/pkg-descr
@@ -0,0 +1,3 @@
+Camellia block cipher primitives.
+
+WWW: http://github.com/vincenthz/hs-crypto-cipher
diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile
new file mode 100644
index 00000000000..b4843197761
--- /dev/null
+++ b/security/hs-cipher-des/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cipher-des
+PORTVERSION= 0.0.6
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= DES and 3DES primitives
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable crypto-cipher-types>=0.0.3 securemem>=0.1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-des/distinfo b/security/hs-cipher-des/distinfo
new file mode 100644
index 00000000000..a077760fe3f
--- /dev/null
+++ b/security/hs-cipher-des/distinfo
@@ -0,0 +1,2 @@
+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-des/pkg-descr b/security/hs-cipher-des/pkg-descr
new file mode 100644
index 00000000000..29c707ed87b
--- /dev/null
+++ b/security/hs-cipher-des/pkg-descr
@@ -0,0 +1,3 @@
+DES and 3DES primitives.
+
+WWW: http://github.com/vincenthz/hs-crypto-cipher
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index 2c6e662b102..06d32f6e5fa 100644
--- a/security/hs-cipher-rc4/Makefile
+++ b/security/hs-cipher-rc4/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= cipher-rc4
-PORTVERSION= 0.1.2
-PORTREVISION= 5
+PORTVERSION= 0.1.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast RC4 cipher implementation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable crypto-cipher-types>=0.0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cipher-rc4/distinfo b/security/hs-cipher-rc4/distinfo
index 99b21c10d34..415da27b54f 100644
--- a/security/hs-cipher-rc4/distinfo
+++ b/security/hs-cipher-rc4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-rc4-0.1.2.tar.gz) = 61b908f643cb123788c42e92e7c68fc376d6b094520f00cd10180e7874c5d95b
-SIZE (cabal/cipher-rc4-0.1.2.tar.gz) = 4576
+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 5056e90a455..90e3d3a1e1b 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= clientsession
-PORTVERSION= 0.9
-PORTREVISION= 4
+PORTVERSION= 0.9.0.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Securely store session data in a client-side cookie
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cipher-aes>=0.1.7 \
- cprng-aes>=0.2 crypto-api>=0.8 entropy>=0.2.1 skein \
- tagged>=0.1
+ cprng-aes>=0.2 crypto-api>=0.8 crypto-random entropy>=0.2.1 \
+ skein tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index 2917c8b58e3..782da646373 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.9.tar.gz) = 080ccd716ac69be49466480bd4133d712ef44e724c3292003f32ecfd3719dc33
-SIZE (cabal/clientsession-0.9.tar.gz) = 7082
+SHA256 (cabal/clientsession-0.9.0.3.tar.gz) = 6125864915adb324af897eb92245dd249002283d365fccaa69a53fd4b29ff570
+SIZE (cabal/clientsession-0.9.0.3.tar.gz) = 7056
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index 6e807b60f70..78ca19f1162 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= cprng-aes
-PORTVERSION= 0.3.4
-PORTREVISION= 6
+PORTVERSION= 0.5.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Crypto Pseudo Random Number Generator using AES
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cipher-aes>=0.1 crypto-api>=0.8 crypto-random-api>=0.2 \
- entropy>=0.2 random
+USE_CABAL= byteable cipher-aes>=0.2 crypto-random>=0.0.7 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index 5de83538f5e..7bda1cd1efe 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cprng-aes-0.3.4.tar.gz) = 3c0b578124c42d879bc6fe6775597249847b97fba61bfb666e0f83c12d813f4c
-SIZE (cabal/cprng-aes-0.3.4.tar.gz) = 4812
+SHA256 (cabal/cprng-aes-0.5.2.tar.gz) = ee0a5c27396c0257af5ebb4882b31e3ab14d8b160e916dbdc031733f506bc8d9
+SIZE (cabal/cprng-aes-0.5.2.tar.gz) = 4903
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index be950048281..ed1ab5df1e9 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= crypto-api
-PORTVERSION= 0.12.1
-PORTREVISION= 4
+PORTVERSION= 0.13
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generic interface for cryptographic operations
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.2 entropy tagged>=0.1 transformers
+USE_CABAL= cereal>=0.2 entropy tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-api/distinfo b/security/hs-crypto-api/distinfo
index 30dc3570197..abd0818054b 100644
--- a/security/hs-crypto-api/distinfo
+++ b/security/hs-crypto-api/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-api-0.12.1.tar.gz) = 03a0b5160bbd8b227d21dacbcb5338dab558799d08b6294a30ad298378f63974
-SIZE (cabal/crypto-api-0.12.1.tar.gz) = 45241
+SHA256 (cabal/crypto-api-0.13.tar.gz) = 62f9eda6a2dc4a086eeefbb6f7b008d3f6e36bdd325f72858f4d43593d4bfc03
+SIZE (cabal/crypto-api-0.13.tar.gz) = 47884
diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile
new file mode 100644
index 00000000000..64d72080c2e
--- /dev/null
+++ b/security/hs-crypto-cipher-types/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= crypto-cipher-types
+PORTVERSION= 0.0.9
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Generic cryptography cipher types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= byteable>=0.1.1 securemem>=0.1.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-crypto-cipher-types/distinfo b/security/hs-crypto-cipher-types/distinfo
new file mode 100644
index 00000000000..883fc4e7429
--- /dev/null
+++ b/security/hs-crypto-cipher-types/distinfo
@@ -0,0 +1,2 @@
+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-cipher-types/pkg-descr b/security/hs-crypto-cipher-types/pkg-descr
new file mode 100644
index 00000000000..f64e4114ba5
--- /dev/null
+++ b/security/hs-crypto-cipher-types/pkg-descr
@@ -0,0 +1,3 @@
+Generic cryptography cipher types.
+
+WWW: http://github.com/vincenthz/hs-crypto-cipher
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index abb314c5700..bbfb96c84de 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= crypto-conduit
-PORTVERSION= 0.5.2
-PORTREVISION= 4
+PORTVERSION= 0.5.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Conduit interface for cryptographic operations (from crypto-api)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.3 conduit>=1.0 crypto-api>=0.9 transformers>=0.2
+USE_CABAL= cereal>=0.3 conduit>=1.0 conduit-extra>=1.1 crypto-api>=0.9 \
+ 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 667d42340d9..a7ebcbb7a4e 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.5.2.tar.gz) = 7f4d22462f0444eb2eec61b5f284309d0ab35a592f698f0f36b4dba444e69859
-SIZE (cabal/crypto-conduit-0.5.2.tar.gz) = 6809
+SHA256 (cabal/crypto-conduit-0.5.4.tar.gz) = 36d0511efb4cc191e86ec28e6b167228fd0c8e61815cd3eed1a0384de443c2fc
+SIZE (cabal/crypto-conduit-0.5.4.tar.gz) = 6884
diff --git a/security/hs-crypto-conduit/pkg-descr b/security/hs-crypto-conduit/pkg-descr
index 3d70763093e..c936a68988b 100644
--- a/security/hs-crypto-conduit/pkg-descr
+++ b/security/hs-crypto-conduit/pkg-descr
@@ -2,4 +2,4 @@ This package contains everything that you need to use a cryptographic
package that supports the crypto-api package using conduits from the
conduit package.
-WWW: https://github.com/meteficha/crypto-conduit
+WWW: https://github.com/prowdsponsor/crypto-conduit
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index c2f7df0e59e..ca7419c7814 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= crypto-numbers
-PORTVERSION= 0.1.3
-PORTREVISION= 5
+PORTVERSION= 0.2.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cryptographic numbers: functions and algorithms
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-random-api>=0.2 vector
+USE_CABAL= crypto-random>=0.0 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-numbers/distinfo b/security/hs-crypto-numbers/distinfo
index 980061c6b68..2adc7159e4a 100644
--- a/security/hs-crypto-numbers/distinfo
+++ b/security/hs-crypto-numbers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-numbers-0.1.3.tar.gz) = a1176578b575dae470deab6214c3cb404ffcbc2c7b40ea46c9c5d3e1957db484
-SIZE (cabal/crypto-numbers-0.1.3.tar.gz) = 12074
+SHA256 (cabal/crypto-numbers-0.2.3.tar.gz) = f77dabd4dd6aa6343ba351b2ae1c55e4b9ef85c7911eadf6914704401cada25b
+SIZE (cabal/crypto-numbers-0.2.3.tar.gz) = 15714
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 835f52f963e..23af4d1fd17 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= crypto-pubkey-types
-PORTVERSION= 0.3.2
-PORTREVISION= 4
+PORTVERSION= 0.4.2.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generic cryptography Public keys algorithm types
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= asn1-types>=0.1
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index 30a0b45c22f..a1f08b45f14 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-types-0.3.2.tar.gz) = 50f4b808577a175f4787ea396fd01ffd38216dcffb4fb9f7208265242be9ff89
-SIZE (cabal/crypto-pubkey-types-0.3.2.tar.gz) = 9620
+SHA256 (cabal/crypto-pubkey-types-0.4.2.2.tar.gz) = 0522962afd68cce3e53f048bcc345f26734b4c2d2754a43c0006cb2ea075e1a3
+SIZE (cabal/crypto-pubkey-types-0.4.2.2.tar.gz) = 11235
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index 346b00646ad..3fe6f17e6e3 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= crypto-pubkey
-PORTVERSION= 0.1.3
-PORTREVISION= 4
+PORTVERSION= 0.2.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Public Key cryptography
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-numbers crypto-pubkey-types>=0.3 crypto-random-api>=0.2 \
- cryptohash>=0.8
+USE_CABAL= byteable crypto-numbers>=0.2.2 crypto-pubkey-types>=0.4.1 \
+ crypto-random>=0.0 cryptohash>=0.9.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey/distinfo b/security/hs-crypto-pubkey/distinfo
index 444e4efb0d7..6675aa10f17 100644
--- a/security/hs-crypto-pubkey/distinfo
+++ b/security/hs-crypto-pubkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-0.1.3.tar.gz) = 0ff0a9134bb42869dc370eb1aaed1105890538f5c01b2f0e3e5bbc7a3e658b94
-SIZE (cabal/crypto-pubkey-0.1.3.tar.gz) = 38692
+SHA256 (cabal/crypto-pubkey-0.2.4.tar.gz) = 04c2b49a9d82fc4ba2305a9f9dbfd1718de3f81277459cbec8070b55bfc9b255
+SIZE (cabal/crypto-pubkey-0.2.4.tar.gz) = 42386
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index 654438da6a4..6affa44692e 100644
--- a/security/hs-crypto-random-api/Makefile
+++ b/security/hs-crypto-random-api/Makefile
@@ -2,13 +2,13 @@
PORTNAME= crypto-random-api
PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple random generators API for cryptography related code
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= entropy
diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile
new file mode 100644
index 00000000000..0860a970d4f
--- /dev/null
+++ b/security/hs-crypto-random/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= crypto-random
+PORTVERSION= 0.0.7
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple cryptographic random related types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= securemem vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-crypto-random/distinfo b/security/hs-crypto-random/distinfo
new file mode 100644
index 00000000000..f91f3697baf
--- /dev/null
+++ b/security/hs-crypto-random/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/crypto-random-0.0.7.tar.gz) = bccb1fda2d29a3af9e476ed019231a4d2a53fef4f048c4dde9c10d5a901f46b6
+SIZE (cabal/crypto-random-0.0.7.tar.gz) = 8999
diff --git a/security/hs-crypto-random/pkg-descr b/security/hs-crypto-random/pkg-descr
new file mode 100644
index 00000000000..d226ced2658
--- /dev/null
+++ b/security/hs-crypto-random/pkg-descr
@@ -0,0 +1,3 @@
+Simple cryptographic random related types.
+
+WWW: http://github.com/vincenthz/hs-crypto-random
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 3f4c66223cd..a21e1fc6d73 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= cryptocipher
-PORTVERSION= 0.5.0
-PORTREVISION= 4
+PORTVERSION= 0.6.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Symmetrical Block, Stream, and PubKey Ciphers
+COMMENT= Symmetrical block and stream ciphers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cereal cipher-aes cipher-rc4 cpu>=0.1 crypto-api>=0.5 \
- primitive vector>=0.7
+USE_CABAL= cipher-aes>=0.2.3 cipher-blowfish>=0.0 cipher-camellia>=0.0 \
+ cipher-des>=0.0 cipher-rc4>=0.1.3 crypto-cipher-types>=0.0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 118c8ec0c2b..835939716d8 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptocipher-0.5.0.tar.gz) = cd0a034c92c82574623c240b68376884ed5b1e1181a4671302e90d3f84d7f899
-SIZE (cabal/cryptocipher-0.5.0.tar.gz) = 20249
+SHA256 (cabal/cryptocipher-0.6.2.tar.gz) = 34b9e62dee36c4019dd0c0e86576295d0bd1bb573eeb24686ec635a09550e346
+SIZE (cabal/cryptocipher-0.6.2.tar.gz) = 2027
diff --git a/security/hs-cryptocipher/pkg-descr b/security/hs-cryptocipher/pkg-descr
index f825dbfb4f0..8cb30551579 100644
--- a/security/hs-cryptocipher/pkg-descr
+++ b/security/hs-cryptocipher/pkg-descr
@@ -1,3 +1,3 @@
-Symmetrical Block, Stream, and PubKey Ciphers.
+Symmetrical block and stream ciphers.
WWW: http://github.com/vincenthz/hs-cryptocipher
diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile
new file mode 100644
index 00000000000..302ba4215ed
--- /dev/null
+++ b/security/hs-cryptohash-conduit/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cryptohash-conduit
+PORTVERSION= 0.1.1
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cryptohash conduit
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit conduit-extra cryptohash resourcet
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-conduit/distinfo b/security/hs-cryptohash-conduit/distinfo
new file mode 100644
index 00000000000..9e32fd38241
--- /dev/null
+++ b/security/hs-cryptohash-conduit/distinfo
@@ -0,0 +1,2 @@
+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-conduit/pkg-descr b/security/hs-cryptohash-conduit/pkg-descr
new file mode 100644
index 00000000000..809fa2d15aa
--- /dev/null
+++ b/security/hs-cryptohash-conduit/pkg-descr
@@ -0,0 +1,4 @@
+Support all the cryptohash package using conduits from the conduit
+package.
+
+WWW: http://github.com/vincenthz/hs-cryptohash-conduit
diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile
new file mode 100644
index 00000000000..d607b95e105
--- /dev/null
+++ b/security/hs-cryptohash-cryptoapi/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cryptohash-cryptoapi
+PORTVERSION= 0.1.3
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Crypto-api interfaces for cryptohash
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= cereal>=0.2 crypto-api>=0.11 cryptohash>=0.8.0 tagged>=0.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptohash-cryptoapi/distinfo b/security/hs-cryptohash-cryptoapi/distinfo
new file mode 100644
index 00000000000..3223aa016fc
--- /dev/null
+++ b/security/hs-cryptohash-cryptoapi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cryptohash-cryptoapi-0.1.3.tar.gz) = 56f080ba13b891b664bd986db17d6c1240adaea4792a14c173146929c61d4572
+SIZE (cabal/cryptohash-cryptoapi-0.1.3.tar.gz) = 2922
diff --git a/security/hs-cryptohash-cryptoapi/pkg-descr b/security/hs-cryptohash-cryptoapi/pkg-descr
new file mode 100644
index 00000000000..4eb63879e50
--- /dev/null
+++ b/security/hs-cryptohash-cryptoapi/pkg-descr
@@ -0,0 +1,3 @@
+Crypto-api interfaces for cryptohash.
+
+WWW: http://github.com/vincenthz/hs-cryptohash-cryptoapi
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 786964994c2..37858a9588b 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= cryptohash
-PORTVERSION= 0.9.0
-PORTREVISION= 4
+PORTVERSION= 0.11.6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Collection of crypto hashes, fast, pure, and practical
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.2 crypto-api>=0.5 tagged>=0.1
+USE_CABAL= byteable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index 1150ec1ff0b..de86d793039 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptohash-0.9.0.tar.gz) = f4e8e41f35303f58ed2ad9f9a7b683c0055617ac2bd9fa0ec363fc3bd0cdff46
-SIZE (cabal/cryptohash-0.9.0.tar.gz) = 65000
+SHA256 (cabal/cryptohash-0.11.6.tar.gz) = da382334857a88f3e94ce0fb83f425f0a0787b0644100913c61f6e94bb62df37
+SIZE (cabal/cryptohash-0.11.6.tar.gz) = 65798
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 9ee49aa6ad7..a7e5531dbd4 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,13 +2,13 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Various cryptographic hashes for Bytestrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= zlib
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 8ecbfbd22ce..900cf45f203 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= entropy
-PORTVERSION= 0.2.1
-PORTREVISION= 9
+PORTVERSION= 0.3.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Platform-independent entropy source
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-entropy/distinfo b/security/hs-entropy/distinfo
index e00187ba7d9..03299dc4295 100644
--- a/security/hs-entropy/distinfo
+++ b/security/hs-entropy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/entropy-0.2.1.tar.gz) = 3a332d4b5330c81ae16a8705462ffdf70bbb38f3380cd2cee4e23df7db86e8e2
-SIZE (cabal/entropy-0.2.1.tar.gz) = 3109
+SHA256 (cabal/entropy-0.3.2.tar.gz) = 3db9529ff96374810d97e61a7b71df703b31fece29c6f52fe09a61575ddd60ce
+SIZE (cabal/entropy-0.3.2.tar.gz) = 5767
diff --git a/security/hs-entropy/pkg-descr b/security/hs-entropy/pkg-descr
index 628e96257a2..f9a041151a5 100644
--- a/security/hs-entropy/pkg-descr
+++ b/security/hs-entropy/pkg-descr
@@ -1,6 +1,3 @@
-A platform independent method to obtain cryptographically strong entropy
-(urandom on Linux, CryptAPI on Windows, patches welcome). Users looking
-for cryptographically strong (number-theoretically sound) PRNGs should
-see the DRBG package too!
+A platform-independent method to obtain cryptographically strong entropy.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: https://github.com/TomMD/entropy
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
new file mode 100644
index 00000000000..4d78b8ce7d5
--- /dev/null
+++ b/security/hs-gnutls/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= gnutls
+PORTVERSION= 0.1.5
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings for GNU libgnutls
+
+LICENSE= GPLv3
+
+USE_CABAL= monads-tf>=0.1
+
+USES= pkgconfig
+LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-gnutls/distinfo b/security/hs-gnutls/distinfo
new file mode 100644
index 00000000000..6eea143082e
--- /dev/null
+++ b/security/hs-gnutls/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/gnutls-0.1.5.tar.gz) = 9723fd4c65b1e071d2d5febd41d80ff5d353a6e27c132c7f966172091e59c6e9
+SIZE (cabal/gnutls-0.1.5.tar.gz) = 17358
diff --git a/security/hs-gnutls/pkg-descr b/security/hs-gnutls/pkg-descr
new file mode 100644
index 00000000000..b50b23e86a4
--- /dev/null
+++ b/security/hs-gnutls/pkg-descr
@@ -0,0 +1,6 @@
+You almost certainly don't want to depend on this release. This is a
+pre-alpha, almost useless release; its only purpose is to enable TLS
+support in some of my other libraries. More complete bindings for GNU TLS
+will be released at a later date.
+
+WWW: https://john-millikin.com/software/haskell-gnutls/
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index aac07145578..bf5218bf14d 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= monadcryptorandom
-PORTVERSION= 0.5.1
-PORTREVISION= 5
+PORTVERSION= 0.6.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad for using CryptoRandomGen
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2 transformers>=0.2
+USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 36459022780..60b6ac89e57 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monadcryptorandom-0.5.1.tar.gz) = a6a1712f83ff6345bb3104f3b7158ca4fa893bf88df198d6a398c11301eb8a83
-SIZE (cabal/monadcryptorandom-0.5.1.tar.gz) = 4603
+SHA256 (cabal/monadcryptorandom-0.6.1.tar.gz) = 42be5bde4f4d5b2eadbbc9c4a1556b1ac60e366d9aeae76aa41a722c1c902949
+SIZE (cabal/monadcryptorandom-0.6.1.tar.gz) = 4659
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index b7516ac9b83..3c7ec5f6170 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= pem
-PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTVERSION= 0.2.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Privacy Enhanced Mail (PEM) format reader and writer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec base64-bytestring cereal mtl
+USE_CABAL= base64-bytestring>=1.0.0 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-pem/distinfo b/security/hs-pem/distinfo
index 5135db667af..f70c2d2028c 100644
--- a/security/hs-pem/distinfo
+++ b/security/hs-pem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pem-0.1.2.tar.gz) = 159d8dfa67b4b05d511fbd1a749a7488a8e4fd8a06c92f4771d4f0b4cce05adc
-SIZE (cabal/pem-0.1.2.tar.gz) = 3577
+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 63b3f04f010..407d5e50ef0 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,13 +2,13 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell-only implementation of MD5 digest (hash) yalgorithm
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cereal>=0.2 crypto-api tagged
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index bfefa2f55da..066b1ffd9b0 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= pwstore-fast
-PORTVERSION= 2.3
-PORTREVISION= 7
+PORTVERSION= 2.4.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Secure password storage
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1
+USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1 SHA>=1.6.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-pwstore-fast/distinfo b/security/hs-pwstore-fast/distinfo
index 357088dd3a9..b73ed1ab9c3 100644
--- a/security/hs-pwstore-fast/distinfo
+++ b/security/hs-pwstore-fast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pwstore-fast-2.3.tar.gz) = 7cc5f483e3d2e2e5e0c9f0b6f0e91eccc97eb6ed96b7e9ce00e55d0a80259404
-SIZE (cabal/pwstore-fast-2.3.tar.gz) = 6739
+SHA256 (cabal/pwstore-fast-2.4.1.tar.gz) = 84dbb989ec889ba88ca4628502e905d65ca62f6a688ee21dea12342a745828cd
+SIZE (cabal/pwstore-fast-2.4.1.tar.gz) = 8756
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 9b956635d20..eb9ceb85841 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 1.0.3
-PORTREVISION= 4
+PORTVERSION= 1.0.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Skein, a family of cryptographic hash functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cereal>=0.3 crypto-api>=0.6 tagged>=0.2
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index ccdca711229..bc9ee46fe27 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-1.0.3.tar.gz) = 55cd57e5c102ca263bbf4acca1375d47cb1da6a366efa5967f4d72c87df37f97
-SIZE (cabal/skein-1.0.3.tar.gz) = 118432
+SHA256 (cabal/skein-1.0.9.tar.gz) = 6bb1706b5f5bf3ff0f5c525675638b84a850766070b3576fa68afe0718201e22
+SIZE (cabal/skein-1.0.9.tar.gz) = 117873
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
deleted file mode 100644
index 5b18962cfd0..00000000000
--- a/security/hs-tls-extra/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= tls-extra
-PORTVERSION= 0.6.1
-PORTREVISION= 6
-CATEGORIES= security haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= TLS extra default values and helpers
-
-LICENSE= BSD
-
-USE_CABAL= certificate>=1.3.5 cipher-aes>=0.1 cipher-rc4 crypto-pubkey \
- crypto-random-api cryptohash>=0.6 mtl network>=2.3 \
- pem>=0.1.0 text>=0.5 tls>=1.1.0 vector
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/security/hs-tls-extra/distinfo b/security/hs-tls-extra/distinfo
deleted file mode 100644
index 6a09495bcec..00000000000
--- a/security/hs-tls-extra/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/tls-extra-0.6.1.tar.gz) = 56391245bf5f9a6cbf3c8d80fa921606f6c98837252a2ab09912a1a0c76f833d
-SIZE (cabal/tls-extra-0.6.1.tar.gz) = 8091
diff --git a/security/hs-tls-extra/pkg-descr b/security/hs-tls-extra/pkg-descr
deleted file mode 100644
index ea59f470718..00000000000
--- a/security/hs-tls-extra/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A set of extra definitions, default values and helpers for the tls.
-
-WWW: http://github.com/vincenthz/hs-tls
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 26d066d20b9..bc1e7a614a3 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,17 +1,19 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.1.2
-PORTREVISION= 5
+PORTVERSION= 1.2.8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= TLS/SSL protocol native implementation (Server and Client)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-pubkey \
- crypto-random-api>=0.2 cryptohash>=0.6 mtl network
+USE_CABAL= asn1-encoding asn1-types>=0.2.0 byteable cereal>=0.4 \
+ cipher-aes>=0.2 cipher-des cipher-rc4 crypto-cipher-types>=0.0.8 \
+ crypto-numbers crypto-pubkey>=0.2.4 crypto-pubkey-types>=0.4 \
+ crypto-random>=0.0 cryptohash>=0.6 data-default-class \
+ mtl network x509>=1.4.3 x509-store>=1.4.4 x509-validation>=1.5.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index 6cfabc30ca6..1c52048f4b9 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-1.1.2.tar.gz) = 0fcbc6c4609c0ed176b8c43bb9bfefdaebed392457de7511d1af7766beade1ed
-SIZE (cabal/tls-1.1.2.tar.gz) = 47559
+SHA256 (cabal/tls-1.2.8.tar.gz) = 0a160cdc57d55cfbb6828eb448b1b6ca5e0626d98536c58d7523662fac34a33a
+SIZE (cabal/tls-1.2.8.tar.gz) = 65498
diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile
new file mode 100644
index 00000000000..f7511d372f7
--- /dev/null
+++ b/security/hs-x509-store/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= x509-store
+PORTVERSION= 1.4.4
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= X.509 collection accessing and storing methods
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 crypto-pubkey-types>=0.3 \
+ mtl pem>=0.1 x509>=1.4.3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-x509-store/distinfo b/security/hs-x509-store/distinfo
new file mode 100644
index 00000000000..4375898ce2c
--- /dev/null
+++ b/security/hs-x509-store/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/x509-store-1.4.4.tar.gz) = 882fc144a6819dd9182e14297f3af9087c45840cca1c550e759783dc5a767044
+SIZE (cabal/x509-store-1.4.4.tar.gz) = 2992
diff --git a/security/hs-x509-store/pkg-descr b/security/hs-x509-store/pkg-descr
new file mode 100644
index 00000000000..0266c1e1b1a
--- /dev/null
+++ b/security/hs-x509-store/pkg-descr
@@ -0,0 +1,4 @@
+X.509 collection accessing and storing methods for certificate, crl,
+exception list.
+
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile
new file mode 100644
index 00000000000..7c3e98df223
--- /dev/null
+++ b/security/hs-x509-system/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= x509-system
+PORTVERSION= 1.4.5
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Handle per-operating-system X.509 accessors and storage
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl pem>=0.1 x509>=1.4 x509-store>=1.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-x509-system/distinfo b/security/hs-x509-system/distinfo
new file mode 100644
index 00000000000..c183148ea3b
--- /dev/null
+++ b/security/hs-x509-system/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/x509-system-1.4.5.tar.gz) = 1d098a4df1a71ac7cb371f43794c402c8b20a6e8095cc1737a4f39638930965f
+SIZE (cabal/x509-system-1.4.5.tar.gz) = 3596
diff --git a/security/hs-x509-system/pkg-descr b/security/hs-x509-system/pkg-descr
new file mode 100644
index 00000000000..18ff2338ec1
--- /dev/null
+++ b/security/hs-x509-system/pkg-descr
@@ -0,0 +1,3 @@
+System X.509 handling.
+
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile
new file mode 100644
index 00000000000..0656f73e8c5
--- /dev/null
+++ b/security/hs-x509-validation/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= x509-validation
+PORTVERSION= 1.5.0
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= X.509 Certificate and CRL validation
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 byteable crypto-pubkey>=0.1.4 \
+ crypto-pubkey-types>=0.4 cryptohash>=0.9 data-default-class \
+ mtl network pem>=0.1 x509>=1.4.7 x509-store>=1.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-x509-validation/distinfo b/security/hs-x509-validation/distinfo
new file mode 100644
index 00000000000..c3955c7bcaa
--- /dev/null
+++ b/security/hs-x509-validation/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/x509-validation-1.5.0.tar.gz) = 36e3ce3644452d72a947b3132781a445b40e14be54fae229e4e7c41b01b059f5
+SIZE (cabal/x509-validation-1.5.0.tar.gz) = 9626
diff --git a/security/hs-x509-validation/pkg-descr b/security/hs-x509-validation/pkg-descr
new file mode 100644
index 00000000000..904ee2594b7
--- /dev/null
+++ b/security/hs-x509-validation/pkg-descr
@@ -0,0 +1,3 @@
+X.509 Certificate and CRL validation.
+
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile
new file mode 100644
index 00000000000..46e6657214f
--- /dev/null
+++ b/security/hs-x509/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= x509
+PORTVERSION= 1.4.11
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= X509 reader and writer
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= asn1-encoding>=0.8 asn1-parse>=0.8 asn1-types>=0.2.3 \
+ crypto-pubkey-types>=0.4.2.1 cryptohash>=0.9 mtl pem>=0.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-x509/distinfo b/security/hs-x509/distinfo
new file mode 100644
index 00000000000..862d44b956e
--- /dev/null
+++ b/security/hs-x509/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/x509-1.4.11.tar.gz) = ea25f2efb6700d2dfc8950bcc9274320f55dce241e01cf75900c10a3af34a5ab
+SIZE (cabal/x509-1.4.11.tar.gz) = 13976
diff --git a/security/hs-x509/pkg-descr b/security/hs-x509/pkg-descr
new file mode 100644
index 00000000000..59422396a9f
--- /dev/null
+++ b/security/hs-x509/pkg-descr
@@ -0,0 +1,3 @@
+X509 reader and writer.
+
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 3c561811755..3cc85b8d5bd 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -385,6 +385,8 @@
SUBDIR += hptcli
SUBDIR += hs-angel
SUBDIR += hs-cpu
+ SUBDIR += hs-ekg
+ SUBDIR += hs-ekg-core
SUBDIR += htop
SUBDIR += httplog
SUBDIR += hwstat
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 826e504eedd..eb243bbb85f 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= angel
-PORTVERSION= 0.3.4
-PORTREVISION= 6
+PORTVERSION= 0.5.0
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Process management and supervision daemon
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= configurator>=0.1 MissingH mtl stm>=2.0 text>=0.11 \
+USE_CABAL= configurator>=0.1 mtl stm>=2.0 text>=0.11 \
unordered-containers>=0.1.4
EXECUTABLE= angel
diff --git a/sysutils/hs-angel/distinfo b/sysutils/hs-angel/distinfo
index e9d2761558b..d74a5fe9d6b 100644
--- a/sysutils/hs-angel/distinfo
+++ b/sysutils/hs-angel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/angel-0.3.4.tar.gz) = 6dd2186d6527c93591cbc02cfd9867119e1138e1cc0dcb38ebbd911f87d44c2b
-SIZE (cabal/angel-0.3.4.tar.gz) = 7185
+SHA256 (cabal/angel-0.5.0.tar.gz) = c824c77614c7af36031303c7fcdf53d769ab24fd89ec66dd28a49af83b0b0795
+SIZE (cabal/angel-0.5.0.tar.gz) = 14444
diff --git a/sysutils/hs-angel/pkg-descr b/sysutils/hs-angel/pkg-descr
index 28ebfd150f5..a06822370a2 100644
--- a/sysutils/hs-angel/pkg-descr
+++ b/sysutils/hs-angel/pkg-descr
@@ -3,4 +3,4 @@ to djb's `daemontools` or the Ruby project `god`. It's goals are to keep
a set of services running, and to facilitate the easy configuration and
restart of those services.
-WWW: http://github.com/jamwt/Angel
+WWW: http://github.com/MichaelXavier/Angel
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 577a1b92c8e..a6a34b1f965 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= cpu
-PORTVERSION= 0.1.1
-PORTREVISION= 7
+PORTVERSION= 0.1.2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Cpu information and properties helpers
+COMMENT= CPU information and properties helpers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/sysutils/hs-cpu/distinfo b/sysutils/hs-cpu/distinfo
index 8eca51227db..3b6ceee75ca 100644
--- a/sysutils/hs-cpu/distinfo
+++ b/sysutils/hs-cpu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpu-0.1.1.tar.gz) = 46429f2bfb86183ca2f7a469618079fcfd8b3878a32553868119283d51eff379
-SIZE (cabal/cpu-0.1.1.tar.gz) = 4078
+SHA256 (cabal/cpu-0.1.2.tar.gz) = 5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974
+SIZE (cabal/cpu-0.1.2.tar.gz) = 4317
diff --git a/sysutils/hs-cpu/pkg-descr b/sysutils/hs-cpu/pkg-descr
index 58e518e160f..869c037a2a1 100644
--- a/sysutils/hs-cpu/pkg-descr
+++ b/sysutils/hs-cpu/pkg-descr
@@ -1,4 +1,4 @@
-Lowlevel cpu routines to get basic properties of the cpu platform, like
+Low-level CPU routines to get basic properties of the CPU platform, like
endianness and architecture.
WWW: http://github.com/vincenthz/hs-cpu
diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile
new file mode 100644
index 00000000000..d56fbe9664c
--- /dev/null
+++ b/sysutils/hs-ekg-core/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= ekg-core
+PORTVERSION= 0.1.0.1
+CATEGORIES= sysutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Tracking of system metrics
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text unordered-containers
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo
new file mode 100644
index 00000000000..0507539b4c0
--- /dev/null
+++ b/sysutils/hs-ekg-core/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/ekg-core-0.1.0.1.tar.gz) = 4a4adfb96dc330e30e878d260c3045f13bee1272351d2d046f9d2a3b484e0afe
+SIZE (cabal/ekg-core-0.1.0.1.tar.gz) = 12014
diff --git a/sysutils/hs-ekg-core/pkg-descr b/sysutils/hs-ekg-core/pkg-descr
new file mode 100644
index 00000000000..d256ce384f9
--- /dev/null
+++ b/sysutils/hs-ekg-core/pkg-descr
@@ -0,0 +1,3 @@
+This library lets you defined and track system metrics.
+
+WWW: https://github.com/tibbe/ekg-core
diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile
new file mode 100644
index 00000000000..80471b19615
--- /dev/null
+++ b/sysutils/hs-ekg/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= ekg
+PORTVERSION= 0.4.0.1
+CATEGORIES= sysutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Remote monitoring of processes
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson ekg-core>=0.1 network snap-core snap-server text \
+ unordered-containers
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg/distinfo b/sysutils/hs-ekg/distinfo
new file mode 100644
index 00000000000..bf3e1240f23
--- /dev/null
+++ b/sysutils/hs-ekg/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/ekg-0.4.0.1.tar.gz) = dddb476745741b14513a0aa45702c96cef1dcd58d399b161833ca42c53d3f226
+SIZE (cabal/ekg-0.4.0.1.tar.gz) = 160732
diff --git a/sysutils/hs-ekg/pkg-descr b/sysutils/hs-ekg/pkg-descr
new file mode 100644
index 00000000000..95131f8c7c3
--- /dev/null
+++ b/sysutils/hs-ekg/pkg-descr
@@ -0,0 +1,5 @@
+This library lets you remotely monitor a running process over HTTP. It
+provides a simple way to integrate a monitoring server into any
+application.
+
+WWW: https://github.com/tibbe/ekg
diff --git a/textproc/Makefile b/textproc/Makefile
index 9d629bb6ea2..0299035b829 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -223,8 +223,8 @@
SUBDIR += hs-Diff
SUBDIR += hs-HStringTemplate
SUBDIR += hs-HaXml
+ SUBDIR += hs-appar
SUBDIR += hs-attoparsec
- SUBDIR += hs-attoparsec-conduit
SUBDIR += hs-attoparsec-enumerator
SUBDIR += hs-blaze-html
SUBDIR += hs-blaze-markup
@@ -245,6 +245,7 @@
SUBDIR += hs-hxt-unicode
SUBDIR += hs-lhs2tex
SUBDIR += hs-libxml
+ SUBDIR += hs-libxml-sax
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
@@ -258,9 +259,10 @@
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
SUBDIR += hs-texmath
- SUBDIR += hs-xhtml
+ SUBDIR += hs-uri
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
+ SUBDIR += hs-xml-hamlet
SUBDIR += hs-xml-types
SUBDIR += hs-xmlhtml
SUBDIR += hs-yaml
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 9f703a467cd..4cd249fc9da 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTVERSION= 0.3.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= O(ND) diff algorithm in haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 7a8f00fd29b..55cb6d8570e 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Diff-0.2.0.tar.gz) = f3a4bf6ae69627e67be0ba02b1d32b21442a89674d12b95067ce4ac57f9e0d96
-SIZE (cabal/Diff-0.2.0.tar.gz) = 3201
+SHA256 (cabal/Diff-0.3.0.tar.gz) = 28f96d7f4bb0f88a13fa0b59e89cc8b93fa901c6cbe6ca82e84540cb2291ee4c
+SIZE (cabal/Diff-0.3.0.tar.gz) = 4128
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 69cdc28d1c3..85473050649 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.7.1
-PORTREVISION= 5
+PORTVERSION= 0.7.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= StringTemplate implementation in Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder mtl parsec syb text utf8-string void
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 78a7998fa05..78d260f490e 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.7.1.tar.gz) = 8d12e36b69c8c98974f2b449b7308cecc8cf59a82049c43985f1ab6e12090c43
-SIZE (cabal/HStringTemplate-0.7.1.tar.gz) = 16457
+SHA256 (cabal/HStringTemplate-0.7.3.tar.gz) = 883fbfd35c14ab46cd1545a8643da700094297f0cb74462f460781694dd884bf
+SIZE (cabal/HStringTemplate-0.7.3.tar.gz) = 15961
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index dd09be1056f..758c73e5a13 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.24
-PORTREVISION= 4
+PORTVERSION= 1.24.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Collection of utilities for using Haskell and XML together
+COMMENT= Utilities for manipulating XML documents
LICENSE= LGPL21
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index a3c48a69d91..31395f64209 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.24.tar.gz) = b6f9b147f80dbac04b11633d0bd9309c7ce9d2b0cff67b83086212a4f0567ba2
-SIZE (cabal/HaXml-1.24.tar.gz) = 143107
+SHA256 (cabal/HaXml-1.24.1.tar.gz) = 5f258c7c6291ad54bb9a65280dd30efcbca3fc79a499d5b6575a753d3f7b78df
+SIZE (cabal/HaXml-1.24.1.tar.gz) = 142739
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-appar/Makefile
index eb361eb0b26..2a69d9bd92f 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
-PORTNAME= xhtml
-PORTVERSION= 3000.2.1
-PORTREVISION= 8
+PORTNAME= appar
+PORTVERSION= 0.1.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= XHTML combinator library
+COMMENT= Simple applicative parser
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-appar/distinfo b/textproc/hs-appar/distinfo
new file mode 100644
index 00000000000..4515d2ce6a3
--- /dev/null
+++ b/textproc/hs-appar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/appar-0.1.4.tar.gz) = 58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26
+SIZE (cabal/appar-0.1.4.tar.gz) = 3904
diff --git a/textproc/hs-appar/pkg-descr b/textproc/hs-appar/pkg-descr
new file mode 100644
index 00000000000..84b63d5d3d6
--- /dev/null
+++ b/textproc/hs-appar/pkg-descr
@@ -0,0 +1,3 @@
+A simple applicative parser in Parsec style.
+
+WWW: http://hackage.haskell.org/package/appar
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
deleted file mode 100644
index a790f4dae78..00000000000
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= attoparsec-conduit
-PORTVERSION= 1.0.1
-PORTREVISION= 4
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Consume attoparsec parsers via conduit
-
-LICENSE= BSD
-
-USE_CABAL= attoparsec>=0.10 conduit>=1.0 text>=0.11 transformers>=0.2.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
deleted file mode 100644
index 8d87d383a71..00000000000
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/attoparsec-conduit-1.0.1.tar.gz) = e55d67165e53a5d228e6f863be1d78b31052a6ccb0791905eae16da94bf56691
-SIZE (cabal/attoparsec-conduit-1.0.1.tar.gz) = 4237
diff --git a/textproc/hs-attoparsec-conduit/pkg-descr b/textproc/hs-attoparsec-conduit/pkg-descr
deleted file mode 100644
index 2111049bda7..00000000000
--- a/textproc/hs-attoparsec-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Consume attoparsec parsers via conduit.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 2de50b384f5..bc6b94d6589 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3.1
-PORTREVISION= 7
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 252241cfe23..98dde5c6df3 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.1.tar.gz) = a78a9f6ade2ae43659243b1a9e925a8c1bc2c05d94e894ca853a32b887880682
-SIZE (cabal/attoparsec-enumerator-0.3.1.tar.gz) = 2498
+SHA256 (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 3cf105cdc29120a5c21487708783155a35fd9d4df29f72e56c22ed93f85aa77c
+SIZE (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 2484
diff --git a/textproc/hs-attoparsec-enumerator/pkg-descr b/textproc/hs-attoparsec-enumerator/pkg-descr
index bdb70e667e1..9567c51433c 100644
--- a/textproc/hs-attoparsec-enumerator/pkg-descr
+++ b/textproc/hs-attoparsec-enumerator/pkg-descr
@@ -2,4 +2,4 @@ This library allows an Attoparsec parser to receive input incrementally from
an enumerator. This could be used for parsing large files, or implementing
binary network protocols.
-WWW: http://john-millikin.com/software/attoparsec-enumerator/
+WWW: https://john-millikin.com/software/attoparsec-enumerator/
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 14a766a09ff..854bb4a41a6 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -2,13 +2,13 @@
PORTNAME= attoparsec
PORTVERSION= 0.10.4.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast combinator parsing for bytestrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.1.5
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 46817a9d2d5..3e289cbbe83 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.6.1.1
-PORTREVISION= 4
+PORTVERSION= 0.7.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Blazingly fast HTML combinator library for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.5.1 text>=0.10
+USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.6 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 405d372eb92..f6d39a3e6ea 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.6.1.1.tar.gz) = 2cafc98ccbb3b9dc9c444ae306337b2aa7fd0be54b650bf208a656a8f6acee23
-SIZE (cabal/blaze-html-0.6.1.1.tar.gz) = 77759
+SHA256 (cabal/blaze-html-0.7.0.2.tar.gz) = 5b74f65b9201b1ac81b58f6c7350a2ab493e7777eb429c3ec5a0fb9c6da90f7b
+SIZE (cabal/blaze-html-0.7.0.2.tar.gz) = 75815
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index eed91b3786d..5002fc810b1 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.5
-PORTREVISION= 4
+PORTVERSION= 0.6.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Blazingly fast markup combinator library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2 text>=0.10
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index f10c9b26151..d3f24c05fe7 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.5.tar.gz) = e4d034560e6808c5fdb8ca2eeef0031f3caff5398ba4fee72a049eea43ad7a3c
-SIZE (cabal/blaze-markup-0.5.1.5.tar.gz) = 11885
+SHA256 (cabal/blaze-markup-0.6.1.0.tar.gz) = f45c0a5f3c9d9d91af3b4d0ea6d88293c036d000a71a8e63d37a21193c19b379
+SIZE (cabal/blaze-markup-0.6.1.0.tar.gz) = 12738
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index a2402120017..a131b88c753 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,15 +3,20 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse CSV formatted data efficiently with Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= dlist
+USE_ALEX= yes
+
+# Force regeneration of the lexer.
+post-patch::
+ @${RM} -rf ${WRKSRC}/dist
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 8d246349c7b..0e83a6cffbc 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.0.0.2
-PORTREVISION= 4
+PORTVERSION= 1.1.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Case insensitive string comparison
+COMMENT= Case-insensitive string comparison
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hashable>=1.0 text>=0.3
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 4845ef4e792..cc78d76b060 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.0.0.2.tar.gz) = c2952ea7e2fe052c5f8fc07d2cded328c50cb3282006d9a276d7f8101eff8c85
-SIZE (cabal/case-insensitive-1.0.0.2.tar.gz) = 4803
+SHA256 (cabal/case-insensitive-1.1.0.3.tar.gz) = 7b255fe63155d53ab84b248ab5ba9306fd4bec47a6198e3275cf9cb41c4d263b
+SIZE (cabal/case-insensitive-1.1.0.3.tar.gz) = 5188
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 06a0bae89fa..79fcf36f08e 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,46 +1,34 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.8
-PORTREVISION= 5
+PORTVERSION= 0.3.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Citation Style Language implementation in Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-OPTIONS_DEFINE= BIBUTILS HEXPAT NETWORK
-OPTIONS_DEFAULT= BIBUTILS HEXPAT NETWORK
+FLAGS_DEFINE= BIBUTILS 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
+
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
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MBIBUTILS}
-CONFIGURE_ARGS+= --flags="bibutils"
-USE_CABAL+= hs-bibutils>=0.3
-.else
-CONFIGURE_ARGS+= --flags="-bibutils"
-.endif
-
-.if ${PORT_OPTIONS:MHEXPAT}
-CONFIGURE_ARGS+= --flags="hexpat"
-USE_CABAL+= hexpat>=0.20.2
-.else
-CONFIGURE_ARGS+= --flags="-hexpat"
-.endif
-
-.if ${PORT_OPTIONS:MNETWORK}
-CONFIGURE_ARGS+= --flags="network"
-USE_CABAL+= HTTP>=4000.0.9 network>=2
-.else
-CONFIGURE_ARGS+= --flags="-network"
-.endif
+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
index 4a477d271b9..47a3e039ec5 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.8.tar.gz) = e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72
-SIZE (cabal/citeproc-hs-0.3.8.tar.gz) = 105544
+SHA256 (cabal/citeproc-hs-0.3.9.tar.gz) = 4f6b7db9b731789f25e4faebce8ec2ea4a19a920aaad6951a5e8b23cd4187438
+SIZE (cabal/citeproc-hs-0.3.9.tar.gz) = 114621
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index f9b547ffd1b..dce7da0aaa0 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 097b17e7226..8795e77ae2b 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,13 +2,13 @@
PORTNAME= double-conversion
PORTVERSION= 0.2.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast conversion between double-precision floating-point and text
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.0.8
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index cb4f047e388..9cd8859e011 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.8
-PORTREVISION= 13
+PORTVERSION= 0.3.9.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell
+COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= utf8-string xml>=1.2.6
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 4b32dddea11..41fb6a479ed 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/feed-0.3.8.tar.gz) = e614f7019a035c1eaa8952cdcfe5291c539f670f218ab591727d33b4367b71fb
-SIZE (cabal/feed-0.3.8.tar.gz) = 72269
+SHA256 (cabal/feed-0.3.9.2.tar.gz) = ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17
+SIZE (cabal/feed-0.3.9.2.tar.gz) = 73353
diff --git a/textproc/hs-feed/pkg-descr b/textproc/hs-feed/pkg-descr
index 849d5d32a39..281194338b8 100644
--- a/textproc/hs-feed/pkg-descr
+++ b/textproc/hs-feed/pkg-descr
@@ -1,3 +1,3 @@
Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell.
-WWW: http://hackage.haskell.org/package/feed
+WWW: https://github.com/sof/feed
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 081d3207f88..1d01d9c1607 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.3
-PORTREVISION= 6
+PORTVERSION= 0.20.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= XML parser/formatter based on expat
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions>=0.1 List>=0.4.2 text>=0.5 transformers \
- utf8-string
+USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 2c2f97f160d..2334a573227 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hexpat-0.20.3.tar.gz) = 3aeff6da3ea6abf2ec529d48f3774f8dea386fc2c66a662d89dedcca3603b08d
-SIZE (cabal/hexpat-0.20.3.tar.gz) = 133330
+SHA256 (cabal/hexpat-0.20.6.tar.gz) = 0b98fb2726e0be4c98102edd68025b7731b0dc8aeb9029719e601a091935ba0a
+SIZE (cabal/hexpat-0.20.6.tar.gz) = 133394
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 2f62f3cf69f..8e5720305ff 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.3.9
-PORTREVISION= 4
+PORTVERSION= 0.5.8.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,20 +9,14 @@ COMMENT= Syntax highlighting
LICENSE= GPLv2
-USE_CABAL= blaze-html>=0.4.2 mtl parsec regex-pcre-builtin
+USE_CABAL= blaze-html>=0.4.2 mtl parsec \
+ regex-pcre-builtin>=0.94.4.8.8.35 utf8-string
-OPTIONS_DEFINE= EXECUTABLE
+FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the Highlight executable
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-EXECUTABLE+= Highlight
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+EXECUTABLE_DESC= Build the Highlight executable
+EXECUTABLE_FLAG_ENABLE= executable
+EXECUTABLE_FLAG_EXECUTABLE= Highlight
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index f7f16086c03..296702ada89 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.9.tar.gz) = 0ca2abc648da30cebfffcdf22140a380df3c5d98c80984bf97ee416c351a1395
-SIZE (cabal/highlighting-kate-0.5.3.9.tar.gz) = 662621
+SHA256 (cabal/highlighting-kate-0.5.8.5.tar.gz) = d386eb0b49303c454b0cb20e2a771d48e6b51407a3e3ff130a845ce95c5fd677
+SIZE (cabal/highlighting-kate-0.5.8.5.tar.gz) = 724217
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 925d6e2a7ab..7c8ef8e9d78 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hs-bibutils
PORTVERSION= 5.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,6 @@ COMMENT= Bindings to bibutils, the bibliography conversion utilities
LICENSE= GPLv2
-BUILD_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
-RUN_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
-
USE_CABAL= syb
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index c0416e85c96..8e9b3b43dab 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTVERSION= 1.1.0.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,8 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \
- system-filepath>=0.4 tagstream-conduit>=0.4 text \
- transformers xml-conduit>=1.1 xml-types>=0.3
+USE_CABAL= conduit>=1.0 conduit-extra resourcet>=0.3 system-filepath>=0.4 \
+ tagstream-conduit>=0.4 text xml-conduit>=1.1 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index 5b21bb9b1ea..2282ea35be7 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-1.1.0.tar.gz) = a3d47dee8983828688bf9ebceccfa256c3bf1414664010a79fc82e48efc9b386
-SIZE (cabal/html-conduit-1.1.0.tar.gz) = 3789
+SHA256 (cabal/html-conduit-1.1.0.5.tar.gz) = 560bac7c5601554c8958099cc7a0035af270e1c8f93b2d76d40ea4476754bbfb
+SIZE (cabal/html-conduit-1.1.0.5.tar.gz) = 4048
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 2068c7ba452..05bb2249610 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,13 +2,13 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTML combinator library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index a3471be0d88..3fecb343a7d 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= hxt-charproperties
-PORTVERSION= 9.1.1
-PORTREVISION= 9
+PORTVERSION= 9.1.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Character properties and classes for XML and Unicode
+LICENSE= MIT
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index 0023f94b6b4..c7ee18a4db6 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-charproperties-9.1.1.tar.gz) = a8c54f7068fe8295f216e44e33d2d1e9f9cd12518eb0abe3a36802080306bb93
-SIZE (cabal/hxt-charproperties-9.1.1.tar.gz) = 225490
+SHA256 (cabal/hxt-charproperties-9.1.1.1.tar.gz) = e800393a12f3469e37d76cd5449ab22b5eccca565fdf65f075a0698fb9ae0ca9
+SIZE (cabal/hxt-charproperties-9.1.1.1.tar.gz) = 225230
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 0a340622d0c..b9b70abe8a8 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 9174312ba89..04548f1017e 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= hxt-unicode
-PORTVERSION= 9.0.2
-PORTREVISION= 9
+PORTVERSION= 9.0.2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Unicode functions for UTF-8, iso-latin-* and other encodings
+COMMENT= Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
+
+LICENSE= MIT
USE_CABAL= hxt-charproperties>=9
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index a0e27d7c238..69cb83e062b 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-unicode-9.0.2.tar.gz) = ad4132d081cc5a39b67927ca3ad725300f42758cd10783aa7a5b2d20510a23e6
-SIZE (cabal/hxt-unicode-9.0.2.tar.gz) = 13853
+SHA256 (cabal/hxt-unicode-9.0.2.2.tar.gz) = 193dbe7bb829ef3c9b8d2f5ad71bd603990310dfe02e910a9d9cb4e3ce5c92c6
+SIZE (cabal/hxt-unicode-9.0.2.2.tar.gz) = 13978
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index ad6d7a30088..132cc7748d9 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.1
-PORTREVISION= 7
+PORTVERSION= 9.3.1.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9 \
- hxt-unicode>=9.0.1 mtl>=2 network>=2.1 parsec>=2.1
+ hxt-unicode>=9.0.1 mtl>=2 network>=2.4 parsec>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index 252398aba52..c44d7543197 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.3.1.1.tar.gz) = bea0544c7945b6a268ee340be0fe0699335182602454f9565a4227d277411ff4
-SIZE (cabal/hxt-9.3.1.1.tar.gz) = 228205
+SHA256 (cabal/hxt-9.3.1.4.tar.gz) = 2e07afe8b81f01f04c586f85c44e1f13710c2565df7e5123bfb0e5822d7b964e
+SIZE (cabal/hxt-9.3.1.4.tar.gz) = 233730
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 70823f5e216..0cac8acfa32 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.18.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +17,7 @@ USE_TEX= latex dvipsk
STANDALONE= yes
EXECUTABLE= lhs2TeX
-MAN1= lhs2TeX.1
+MAN1PAGES= lhs2TeX.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
new file mode 100644
index 00000000000..4c3347d9252
--- /dev/null
+++ b/textproc/hs-libxml-sax/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= libxml-sax
+PORTVERSION= 0.7.5
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings for the libXML2 SAX interface
+
+LICENSE= MIT
+
+USE_CABAL= text>=0.7 xml-types>=0.3
+
+USES= pkgconfig
+LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-libxml-sax/distinfo b/textproc/hs-libxml-sax/distinfo
new file mode 100644
index 00000000000..3b51b84ab85
--- /dev/null
+++ b/textproc/hs-libxml-sax/distinfo
@@ -0,0 +1,2 @@
+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-sax/pkg-descr b/textproc/hs-libxml-sax/pkg-descr
new file mode 100644
index 00000000000..c1ca3f69484
--- /dev/null
+++ b/textproc/hs-libxml-sax/pkg-descr
@@ -0,0 +1,3 @@
+Bindings for the libXML2 SAX interface.
+
+WWW: https://john-millikin.com/software/haskell-libxml/
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index c52cce9e987..75f75d95ecd 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,13 +2,13 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to libxml2
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
USE_GNOME= libxml2
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index d78092d0bc7..beebcb72a88 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.10
-PORTREVISION= 5
+PORTVERSION= 1.12.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Types for representing a structured document
LICENSE= GPLv2
-USE_CABAL= syb
+USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 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 d7768952287..1a40430a7e1 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.10.tar.gz) = e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5
-SIZE (cabal/pandoc-types-1.10.tar.gz) = 13830
+SHA256 (cabal/pandoc-types-1.12.4.1.tar.gz) = 187bda4b12746b9cc460ae98b39d0964adace2bcca2fd0e343b1ea4234a86ff1
+SIZE (cabal/pandoc-types-1.12.4.1.tar.gz) = 18909
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 58077670ef0..023b419d35e 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.11.1
-PORTREVISION= 7
+PORTVERSION= 1.12.4.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,32 +10,35 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
- citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
- HTTP>=4000.0.5 json>=0.4 mtl>=1.1 network>=2 \
- pandoc-types>=1.10 parsec>=3.1 random>=1 syb>=0.1 \
- tagsoup>=0.12.5 temporary>=1.1 texmath>=0.6.1.3 \
- text>=0.11 xml>=1.3.12 zip-archive>=0.1.3.3 zlib>=0.5
+USE_CABAL= aeson>=0.7 attoparsec>=0.10 base64-bytestring>=0.1 \
+ blaze-html>=0.5 blaze-markup>=0.5.1 data-default>=0.4 \
+ extensible-exceptions>=0.1 highlighting-kate>=0.5.8 \
+ hslua>=0.3 HTTP>=4000.0.5 http-conduit>=1.9 http-types>=0.8 \
+ mtl>=1.1 network>=2 pandoc-types>=1.12.3.3 parsec>=3.1 \
+ random>=1 scientific>=0.2 syb>=0.1 tagsoup>=0.13.1 \
+ temporary>=1.1 texmath>=0.6.6.1 text>=0.11 \
+ unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
+ yaml>=0.8.8.2 zip-archive>=0.1.3.3 zlib>=0.5
+USE_ALEX= yes
+USE_HAPPY= yes
EXECUTABLE= pandoc
# For PDF generation
USE_TEX= texmf:run
-MAN1= pandoc.1
-MAN5= pandoc_markdown.5
+MAN1PAGES= pandoc.1
+MAN5PAGES= pandoc_markdown.5
-OPTIONS_DEFINE= EMBED_DATA_FILES
+FLAGS_DEFINE= EMBED_DATA_FILES HTTP_CONDUIT
+FLAGS_DEFAULT= HTTP_CONDUIT
-EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FILES_FLAG_ENABLE= embed_data_files
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEMBED_DATA_FILES}
-CONFIGURE_ARGS+= --flags="embed_data_files"
-.else
-CONFIGURE_ARGS+= --flags="-embed_data_files"
-.endif
+HTTP_CONDUIT_DESC= Enable downloading of resources over HTTPS
+HTTP_CONDUIT_FLAG_ENABLE= http-conduit
+HTTP_CONDUIT_FLAG_CABAL= http-conduit>=1.9 http-types>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index f0ca3b6cb90..03e14a741d6 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.11.1.tar.gz) = ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c
-SIZE (cabal/pandoc-1.11.1.tar.gz) = 1093354
+SHA256 (cabal/pandoc-1.12.4.2.tar.gz) = 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45
+SIZE (cabal/pandoc-1.12.4.2.tar.gz) = 1048263
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 244447974f1..d7882e83637 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,15 +1,15 @@
---- ./Setup.hs.orig 2013-01-29 01:14:38.000000000 +0100
-+++ ./Setup.hs 2013-02-17 00:48:54.000000000 +0100
-@@ -8,7 +8,7 @@
+--- ./Setup.hs.orig 2013-12-09 04:22:42.000000000 +0100
++++ ./Setup.hs 2013-12-27 02:49:01.000000000 +0100
+@@ -9,7 +9,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
--import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
+-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest), toPathTemplate)
++import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest), toPathTemplate)
import Distribution.Simple.Utils (installOrdinaryFiles, info)
+ import Distribution.Simple.Test (test)
import Prelude hiding (catch)
- import System.Process ( rawSystem )
-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
new file mode 100644
index 00000000000..e3c233a8eb6
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -0,0 +1,11 @@
+--- ./pandoc.cabal.orig 2014-05-15 00:07:54.000000000 +0200
++++ ./pandoc.cabal 2014-07-13 00:56:47.000000000 +0200
+@@ -234,7 +234,7 @@
+ blaze-markup >= 0.5.1 && < 0.7,
+ attoparsec >= 0.10 && < 0.12,
+ yaml >= 0.8.8.2 && < 0.9,
+- scientific >= 0.2 && < 0.3,
++ scientific >= 0.2 && < 0.4,
+ vector >= 0.10 && < 0.11,
+ hslua >= 0.3 && < 0.4,
+ binary >= 0.5 && < 0.8
diff --git a/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs b/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
new file mode 100644
index 00000000000..ee7e5f4ae50
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
@@ -0,0 +1,11 @@
+--- ./src/Text/Pandoc/Readers/TeXMath.hs.orig 2014-05-15 00:07:52.000000000 +0200
++++ ./src/Text/Pandoc/Readers/TeXMath.hs 2014-07-29 12:58:00.000000000 +0200
+@@ -30,7 +30,7 @@
+ module Text.Pandoc.Readers.TeXMath ( readTeXMath, readTeXMath' ) where
+
+ import Text.Pandoc.Definition
+-import Text.TeXMath
++import Text.TeXMath ( texMathToPandoc, DisplayType(DisplayBlock, DisplayInline) )
+
+ -- | Converts a raw TeX math formula to a list of 'Pandoc' inlines.
+ -- Defaults to raw formula between @$@ or @$$@ characters if entire formula
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index dab008ebc87..da61bb64cd1 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,19 +1,20 @@
Pandoc is a Haskell library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
-MediaWiki markup, and Textile, and it can write markdown,
-reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, Word
-docx, RTF, MediaWiki, Textile, groff man pages, plain text, Emacs
-Org-Mode, AsciiDoc, EPUB (v2 and v3), FictionBook2, and S5, Slidy and
-Slideous HTML slide shows. Pandoc extends standard markdown syntax with
-footnotes, embedded LaTeX, definition lists, tables, and other features.
-A compatibility mode is provided for those who need a drop-in
-replacement for Markdown.pl. In contrast to existing tools for
-converting markdown to HTML, which use regex substitutions, pandoc has a
-modular design: it consists of a set of readers, which parse text in a
-given format and produce a native representation of the document, and a
-set of writers, which convert this native representation into a target
-format. Thus, adding an input or output format requires only adding a
-reader or writer.
+MediaWiki markup, Haddock markup, OPML, Emacs Org-Mode, and Textile, and
+it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
+OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man
+pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and v3),
+FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide
+shows (S5, Slidy, Slideous, DZSlides, reveal.js). Pandoc extends
+standard markdown syntax with footnotes, embedded LaTeX, definition
+lists, tables, and other features. A compatibility mode is provided for
+those who need a drop-in replacement for Markdown.pl. In contrast to
+existing tools for converting markdown to HTML, which use regex
+substitutions, pandoc has a modular design: it consists of a set of
+readers, which parse text in a given format and produce a native
+representation of the document, and a set of writers, which convert this
+native representation into a target format. Thus, adding an input or
+output format requires only adding a reader or writer.
WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index c8894501752..04ad32624ee 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.3
-PORTREVISION= 6
+PORTVERSION= 3.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monadic parser combinators
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl text>=0.2
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 92c2d95c54f..9661ca9c9bc 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.3.tar.gz) = 9f14bb4da77eb9b0e4dbe8112559ed49409b0af8e9aef5d08941dd97e37fc4a8
-SIZE (cabal/parsec-3.1.3.tar.gz) = 27866
+SHA256 (cabal/parsec-3.1.5.tar.gz) = c572245d72bc3aff3491ce4f89215fcaa1e01c5e7b280d4c105a87db31793cb8
+SIZE (cabal/parsec-3.1.5.tar.gz) = 27894
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index c2e9c7f0031..03d2fd02ff9 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -1,8 +1,7 @@
Parsec is designed from scratch as an industrial-strength parser
-library. It is simple, safe, well documented (on the package
-homepage), has extensive libraries and good error messages, and is
-also fast. It is defined as a monad transformer that can be stacked
-on arbitrary monads, and it is also parametric in the input stream
-type.
+library. It is simple, safe, well documented (on the package homepage),
+has extensive libraries and good error messages, and is also fast. It
+is defined as a monad transformer that can be stacked on arbitrary
+monads, and it is also parametric in the input stream type.
-WWW: http://legacy.cs.uu.nl/daan/parsec.html
+WWW: http://www.cs.uu.nl/~daan/parsec.html
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 8362c78de26..85b026c72be 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= polyparse
PORTVERSION= 1.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index f49d00bdb0e..6f6e45f4654 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interface API for regex-posix,pcre,parsec,tdfa,dfa
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 22040ed682d..e646578d7ce 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93 regex-posix>=0.95.1
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index c30b14878bf..eb28d20d8e5 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= regex-pcre-builtin
-PORTVERSION= 0.94.4.5.8.31
-PORTREVISION= 5
+PORTVERSION= 0.94.4.8.8.35
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 2d16d458674..55054846dca 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = ba43c3b7e711afca22363a9af4fae8a5bb2f1eae0acc48f3d549f52a194cf9b0
-SIZE (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = 287845
+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-builtin/pkg-descr b/textproc/hs-regex-pcre-builtin/pkg-descr
index f18a0b4df0e..a837303f2a2 100644
--- a/textproc/hs-regex-pcre-builtin/pkg-descr
+++ b/textproc/hs-regex-pcre-builtin/pkg-descr
@@ -1,4 +1,3 @@
-The PCRE backend to accompany regex-base, with bundled code from
-<http://www.pcre.org>.
+The PCRE backend to accompany regex-base.
WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 093a7edc71f..cded778645e 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index 336acbe78a8..e88be7658f9 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,13 +1,14 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.1.8
-PORTREVISION= 5
+PORTVERSION= 1.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
+LICENSE= BSD3CLAUSE
+
USE_CABAL= mtl parsec regex-base>=0.93.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 3b82ec9b7dd..7a01b8d1a80 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-tdfa-1.1.8.tar.gz) = 7d9ca2ff95e602c46090dfa56f3176fe903d8d08ac9d725c79af56be0aece5d4
-SIZE (cabal/regex-tdfa-1.1.8.tar.gz) = 65948
+SHA256 (cabal/regex-tdfa-1.2.0.tar.gz) = fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401
+SIZE (cabal/regex-tdfa-1.2.0.tar.gz) = 66039
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index c51efb99836..0f26e7675e7 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.4
-PORTREVISION= 6
+PORTVERSION= 0.3.6.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast searching, splitting and replacing of ByteStrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index ade02142f72..f6e76a9eb1b 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.4.tar.gz) = 2ba4faa9759037c622091625d1d6b04d4401472d79f023631d6f8d8e2ce8e099
-SIZE (cabal/stringsearch-0.3.6.4.tar.gz) = 40116
+SHA256 (cabal/stringsearch-0.3.6.5.tar.gz) = 58d3409a551f71ccc55ded74be3f6f43b23614d74e12bc71d97d3a9271585bd6
+SIZE (cabal/stringsearch-0.3.6.5.tar.gz) = 38994
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index 30c43d4ec1d..a01d7d8aa91 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,18 +2,22 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.12.8
-PORTREVISION= 6
+PORTVERSION= 0.13.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parsing and extracting information from HTML/XML documents
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${STAGEDIR}${DATADIR}
+FLAGS_DEFINE= DOWNLOAD
+
+DOWNLOAD_DESC= Build with Download module
+DOWNLOAD_FLAG_ENABLE= download
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index ef2bb76593e..0b6a6d8008b 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.12.8.tar.gz) = a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515
-SIZE (cabal/tagsoup-0.12.8.tar.gz) = 30647
+SHA256 (cabal/tagsoup-0.13.1.tar.gz) = 1314020e877b8208f42866f4683db40403099595edcd50e556772f31a5e7355c
+SIZE (cabal/tagsoup-0.13.1.tar.gz) = 42756
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index a494ffbe238..13e06beb2e1 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= tagstream-conduit
-PORTVERSION= 0.5.4
-PORTREVISION= 5
+PORTVERSION= 0.5.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Streamlined HTML tag parser
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \
- blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
- text transformers>=0.3
+USE_CABAL= attoparsec blaze-builder case-insensitive conduit>=0.5 \
+ conduit-extra data-default>=0.5.0 resourcet text \
+ xml-conduit>=1.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index 689383ea8f7..a0dfbb65d61 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.4.tar.gz) = 1119944e51796b76138b47b52f02ce5ed669054f4e201d2b6f9ad461a7314eb6
-SIZE (cabal/tagstream-conduit-0.5.4.tar.gz) = 7904
+SHA256 (cabal/tagstream-conduit-0.5.5.1.tar.gz) = c7cad491fb468244bea58329d595a721bffa4b55028ede19b7ee458c3194fd2e
+SIZE (cabal/tagstream-conduit-0.5.5.1.tar.gz) = 9828
diff --git a/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
new file mode 100644
index 00000000000..9c8afd3d18d
--- /dev/null
+++ b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
@@ -0,0 +1,11 @@
+--- ./tagstream-conduit.cabal.orig 2014-04-01 08:43:35.000000000 +0200
++++ ./tagstream-conduit.cabal 2014-07-13 00:59:44.000000000 +0200
+@@ -43,8 +43,6 @@
+ , resourcet
+ , attoparsec
+ , blaze-builder
+- , blaze-builder-conduit >= 0.5 && < 1.2
+- , attoparsec-conduit >= 0.5
+ , xml-conduit >= 1.1.0.0
+ , data-default >= 0.5.0
+
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 8b93102a31f..2576481f27f 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.6.1.5
-PORTREVISION= 4
+PORTVERSION= 0.6.7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,21 +10,16 @@ COMMENT= Conversion of LaTeX math formulas to MathML or OMML
LICENSE= GPLv2
-USE_CABAL= parsec>=3 syb xml
+USE_CABAL= mtl pandoc-types>=1.12.3.3 parsec>=3 syb xml
-OPTIONS_DEFINE= CGI
+FLAGS_DEFINE= CGI
CGI_DESC= Compile CGI executable
+CGI_FLAG_ENABLE= cgi
+CGI_FLAG_CABAL= cgi json utf8-string
+CGI_FLAG_EXECUTABLE= texmath-cgi
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MCGI}
-CONFIGURE_ARGS+= --flags="cgi"
-USE_CABAL+= cgi json utf8-string
-EXECUTABLE+= texmath-cgi
-.else
-CONFIGURE_ARGS+= --flags="-cgi"
-.endif
+FLAGS_DISABLE= test
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 1a4a212d7b3..0a3ae630bbc 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.1.5.tar.gz) = 888cca454fc585272ed5fa41711943250f76efebbff302534d02c349409c9d95
-SIZE (cabal/texmath-0.6.1.5.tar.gz) = 43225
+SHA256 (cabal/texmath-0.6.7.tar.gz) = bfb9c02578f26bb435d3871b38a99522fbf7c8f6f083e0deed2b0e28d0aeb610
+SIZE (cabal/texmath-0.6.7.tar.gz) = 634186
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
new file mode 100644
index 00000000000..4702e41a229
--- /dev/null
+++ b/textproc/hs-uri/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri
+PORTVERSION= 0.1.6.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Library for working with URIs
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=3.0 safe utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
new file mode 100644
index 00000000000..8323c3ec072
--- /dev/null
+++ b/textproc/hs-uri/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/uri-0.1.6.2.tar.gz) = 7a4030532dece7990f4940abbed086b6e2ab7b05361a5d11bfa793ca15d25538
+SIZE (cabal/uri-0.1.6.2.tar.gz) = 5296
diff --git a/textproc/hs-uri/pkg-descr b/textproc/hs-uri/pkg-descr
new file mode 100644
index 00000000000..0b1ed596598
--- /dev/null
+++ b/textproc/hs-uri/pkg-descr
@@ -0,0 +1,4 @@
+Library for working with URIs, including parsing, rendering, merging,
+escaping.
+
+WWW: http://gitorious.org/uri
diff --git a/textproc/hs-xhtml/distinfo b/textproc/hs-xhtml/distinfo
deleted file mode 100644
index 325d004f492..00000000000
--- a/textproc/hs-xhtml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/xhtml-3000.2.1.tar.gz) = 33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8
-SIZE (cabal/xhtml-3000.2.1.tar.gz) = 14555
diff --git a/textproc/hs-xhtml/pkg-descr b/textproc/hs-xhtml/pkg-descr
deleted file mode 100644
index e548a9ec0e6..00000000000
--- a/textproc/hs-xhtml/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package provides combinators for producing XHTML 1.0, including the
-Strict, Transitional and Frameset variants.
-
-WWW: https://github.com/haskell/xhtml
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 1c5b65e86bc..cc22aeba871 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.1.0.3
-PORTREVISION= 5
+PORTVERSION= 1.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=1.0 blaze-builder>=0.2 \
- blaze-builder-conduit>=1.0 blaze-html>=0.5 blaze-markup>=0.5 \
- conduit>=1.0 data-default failure>=0.1 monad-control>=0.3 \
- resourcet>=0.3 system-filepath>=0.4 text>=0.7 \
- transformers>=0.2 xml-types>=0.3.3
+USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \
+ blaze-markup>=0.5 conduit>=1.0 conduit-extra data-default \
+ monad-control>=0.3 resourcet>=0.3 system-filepath>=0.4 \
+ text>=0.7 xml-types>=0.3.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 14fe3cd4be8..b6e3aa28c4f 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.1.0.3.tar.gz) = 24aed3c6b2e30ab7f9f4fb2af6f83ab4d14cda62893e02b6da70ae95a4b1b612
-SIZE (cabal/xml-conduit-1.1.0.3.tar.gz) = 29449
+SHA256 (cabal/xml-conduit-1.2.1.tar.gz) = 20f00e72922eecbd6c0e1fa5e6d1ca74a5a2f971372e5f70137d35869d6800ae
+SIZE (cabal/xml-conduit-1.2.1.tar.gz) = 30847
diff --git a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
new file mode 100644
index 00000000000..1d5bac0f244
--- /dev/null
+++ b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
@@ -0,0 +1,11 @@
+--- ./xml-conduit.cabal.orig 2014-05-23 05:44:22.000000000 +0200
++++ ./xml-conduit.cabal 2014-07-12 23:46:45.000000000 +0200
+@@ -31,8 +31,6 @@
+ , conduit >= 1.0 && < 1.2
+ , conduit-extra
+ , resourcet >= 0.3 && < 1.2
+- , attoparsec-conduit >= 1.0
+- , blaze-builder-conduit >= 1.0
+ , bytestring >= 0.9
+ , text >= 0.7
+ , containers >= 0.2
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
new file mode 100644
index 00000000000..b3a87513451
--- /dev/null
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= xml-hamlet
+PORTVERSION= 0.4.0.9
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Hamlet-style quasiquoter for XML content
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
new file mode 100644
index 00000000000..ccff49ad100
--- /dev/null
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/xml-hamlet-0.4.0.9.tar.gz) = 02498a736aac8bba3648349b63ba139bdd54c1830f5a1df5186a14273794a46e
+SIZE (cabal/xml-hamlet-0.4.0.9.tar.gz) = 6068
diff --git a/textproc/hs-xml-hamlet/pkg-descr b/textproc/hs-xml-hamlet/pkg-descr
new file mode 100644
index 00000000000..6d9e1277b53
--- /dev/null
+++ b/textproc/hs-xml-hamlet/pkg-descr
@@ -0,0 +1,3 @@
+Hamlet-style quasiquoter for XML content.
+
+WWW: http://www.yesodweb.com/
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 1c817fb8e0c..86d2deb0494 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-types
-PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index d0f9971573a..6ccfcf14d54 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.3.tar.gz) = 963d3a195e3407b151692173422d3ec09a7e143fd08ed35503cc6a5cff836c4b
-SIZE (cabal/xml-types-0.3.3.tar.gz) = 3606
+SHA256 (cabal/xml-types-0.3.4.tar.gz) = 1ee502b032e9a97c43250f476af69f65147667e3a1b4dd3bd404f64eb28c0999
+SIZE (cabal/xml-types-0.3.4.tar.gz) = 3857
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 655846d7d9e..4983dbc8cef 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,13 +3,13 @@
PORTNAME= xml
PORTVERSION= 1.3.13
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple XML library for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 7269193ecbc..0baac01a9af 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTVERSION= 0.2.3.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= XML parser and renderer with HTML 5 quirks mode
-LICENSE= BSD
+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
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index d97bade9a97..ccd82da2e9f 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.1.tar.gz) = cf2988cffcbe95835f44af33bae4ceca7fc3acbfc677bae5edffe47fe19213db
-SIZE (cabal/xmlhtml-0.2.1.tar.gz) = 124425
+SHA256 (cabal/xmlhtml-0.2.3.2.tar.gz) = 2300b2fcd873644f754b6ec7217b3d1cd8a4989672bd152c88313907414b5cb6
+SIZE (cabal/xmlhtml-0.2.3.2.tar.gz) = 124711
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index aeb7e943d3c..9db2499f6eb 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,17 +1,18 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.2.4
-PORTREVISION= 4
+PORTVERSION= 0.8.8.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for parsing and rendering YAML documents
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.5 attoparsec conduit>=0.5 resourcet>=0.3 text \
- transformers>=0.1 unordered-containers vector
+USE_CABAL= aeson>=0.5 attoparsec conduit>=1.0.11 resourcet>=0.3 \
+ scientific text unordered-containers vector
+
+EXECUTABLE= yaml2json json2yaml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 20238c5b694..7b5bbe3e249 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.4.tar.gz) = a00da810d835c04c49940eb73d3de9f0cd9cf52c508622579428a0eef880623e
-SIZE (cabal/yaml-0.8.2.4.tar.gz) = 66338
+SHA256 (cabal/yaml-0.8.8.4.tar.gz) = eb3066ab9eb3faed4f208a254301f109915443a88c5f634b06736366ccee05d6
+SIZE (cabal/yaml-0.8.8.4.tar.gz) = 71446
diff --git a/textproc/hs-yaml/pkg-descr b/textproc/hs-yaml/pkg-descr
index cb96676ec9f..902ebfdc6b9 100644
--- a/textproc/hs-yaml/pkg-descr
+++ b/textproc/hs-yaml/pkg-descr
@@ -1,4 +1,4 @@
-Provides support for parsing and emitting Yaml documents. This package
+Provides support for parsing and emitting Yaml documents. This package
includes the full libyaml C library version 0.1.2 by Kirill Simonov in
the package so you don't need to worry about any non-Haskell
dependencies.
diff --git a/www/Makefile b/www/Makefile
index beec64c55d0..323f767f993 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -278,6 +278,7 @@
SUBDIR += horde3-passwd
SUBDIR += horde3-trean
SUBDIR += hotcrp
+ SUBDIR += hs-DAV
SUBDIR += hs-HTTP
SUBDIR += hs-activehs
SUBDIR += hs-authenticate
@@ -287,11 +288,12 @@
SUBDIR += hs-fastcgi
SUBDIR += hs-gitit
SUBDIR += hs-hS3
- SUBDIR += hs-hamlet
SUBDIR += hs-happstack
SUBDIR += hs-happstack-server
SUBDIR += hs-heist
SUBDIR += hs-hjsmin
+ SUBDIR += hs-http-client
+ SUBDIR += hs-http-client-tls
SUBDIR += hs-http-conduit
SUBDIR += hs-http-date
SUBDIR += hs-http-reverse-proxy
@@ -302,10 +304,6 @@
SUBDIR += hs-recaptcha
SUBDIR += hs-scgi
SUBDIR += hs-shakespeare
- SUBDIR += hs-shakespeare-css
- SUBDIR += hs-shakespeare-i18n
- SUBDIR += hs-shakespeare-js
- SUBDIR += hs-shakespeare-text
SUBDIR += hs-snap
SUBDIR += hs-snap-core
SUBDIR += hs-snap-server
@@ -314,12 +312,14 @@
SUBDIR += hs-wai-app-static
SUBDIR += hs-wai-extra
SUBDIR += hs-wai-logger
- SUBDIR += hs-wai-test
SUBDIR += hs-warp
+ SUBDIR += hs-warp-tls
SUBDIR += hs-webkit
SUBDIR += hs-xss-sanitize
SUBDIR += hs-yesod
SUBDIR += hs-yesod-auth
+ SUBDIR += hs-yesod-auth-hashdb
+ SUBDIR += hs-yesod-bin
SUBDIR += hs-yesod-core
SUBDIR += hs-yesod-form
SUBDIR += hs-yesod-persistent
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
new file mode 100644
index 00000000000..7322b201b14
--- /dev/null
+++ b/www/hs-DAV/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= DAV
+PORTVERSION= 0.8
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= RFC 4918 WebDAV support
+
+LICENSE= GPLv3
+
+USE_CABAL= case-insensitive>=0.4 either>=4.1 errors http-client>=0.2 \
+ http-client-tls>=0.2 http-types>=0.7 lens>=3.0 \
+ lifted-base>=0.1 monad-control>=0.3.2 mtl>=2.1 network>=2.3 \
+ optparse-applicative>=0.5.0 transformers-base \
+ xml-conduit>=1.0 xml-hamlet>=0.4
+
+EXECUTABLE= hdav
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
new file mode 100644
index 00000000000..653a5b45cec
--- /dev/null
+++ b/www/hs-DAV/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/DAV-0.8.tar.gz) = 1901a62748916d37413b7cacf1eec97845e2158277b164fb60c429254b8b124e
+SIZE (cabal/DAV-0.8.tar.gz) = 19976
diff --git a/www/hs-DAV/pkg-descr b/www/hs-DAV/pkg-descr
new file mode 100644
index 00000000000..9daa0828a1d
--- /dev/null
+++ b/www/hs-DAV/pkg-descr
@@ -0,0 +1,6 @@
+This is a library for the Web Distributed Authoring and Versioning
+(WebDAV) extensions to HTTP. At present it supports a very small subset
+of client functionality. In addition, there is an executable, hdav,
+which can be used for command-line operation.
+
+WWW: http://floss.scru.org/hDAV
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index e5a3d4af936..438c71c7db9 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.8
-PORTREVISION= 4
+PORTVERSION= 4000.2.10
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for client-side HTTP
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= mtl network parsec
+USE_CABAL= mtl>=2.0 network parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index b8b17ea3530..f208ba4f165 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.8.tar.gz) = 086a2aa771a31845b190e2f9651ab4d8e85116aa463de5bc5e0204c1e5e70c5c
-SIZE (cabal/HTTP-4000.2.8.tar.gz) = 67903
+SHA256 (cabal/HTTP-4000.2.10.tar.gz) = efde6d9f2e8cd7b72068579f0a75449703c0fa7aee76dfc0f3af175295a127d1
+SIZE (cabal/HTTP-4000.2.10.tar.gz) = 67912
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 076dea37213..b41d551c16b 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,21 +2,21 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell code presentation tool
-LICENSE= BSD
+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 haskell-src-exts>=1.12 \
+ 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.10 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
+ 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 xhtml>=3000.2
+ text>=0.11 utf8-string>=0.3
STANDALONE= yes
EXECUTABLE= activehs
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
index e4e7da82e90..2cab802ee93 100644
--- a/www/hs-activehs/files/patch-Converter.hs
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -1,5 +1,23 @@
--- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Converter.hs 2013-05-28 16:20:35.000000000 +0200
++++ ./Converter.hs 2013-12-27 18:34:37.000000000 +0100
+@@ -28,7 +28,7 @@
+
+ import Control.Monad
+ import Data.List
+-import Data.Char
++import Data.Char hiding (Format)
+
+ ----------------------------------
+
+@@ -206,7 +206,7 @@
+ ------------------------------------
+
+ rawHtml :: String -> Block
+-rawHtml x = RawBlock "html" x
++rawHtml x = RawBlock (Format "html") x
+
+ showBlockSimple :: Language -> String -> String -> Int -> String -> [Block]
+
@@ -249,8 +249,8 @@
mkName :: String -> HSyn.Name
diff --git a/www/hs-activehs/files/patch-QuickCheck.hs b/www/hs-activehs/files/patch-QuickCheck.hs
new file mode 100644
index 00000000000..3c0c2e43857
--- /dev/null
+++ b/www/hs-activehs/files/patch-QuickCheck.hs
@@ -0,0 +1,50 @@
+--- ./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
new file mode 100644
index 00000000000..585e6ef9f43
--- /dev/null
+++ b/www/hs-activehs/files/patch-Simple.hs
@@ -0,0 +1,38 @@
+--- ./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
new file mode 100644
index 00000000000..73c64c19329
--- /dev/null
+++ b/www/hs-activehs/files/patch-Specialize.hs
@@ -0,0 +1,11 @@
+--- ./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 :: 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
+
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 68ed888b6f5..53f52357b85 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,32 +1,44 @@
--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2013-05-28 16:18:31.000000000 +0200
-@@ -63,7 +63,7 @@
++++ ./activehs.cabal 2014-07-14 02:37:00.000000000 +0200
+@@ -62,29 +62,31 @@
+ dia-functions >= 0.2.1.1 && < 0.3,
activehs-base >= 0.2 && < 0.4,
data-pprint >= 0.2 && < 0.3,
- base >= 4.0 && < 4.7,
+- base >= 4.0 && < 4.7,
- QuickCheck >= 2.4 && < 2.6,
+- array >= 0.3 && < 0.5,
++ base >= 4.0 && < 4.8,
+ QuickCheck >= 2.4 && < 2.7,
- array >= 0.3 && < 0.5,
++ array >= 0.3 && < 0.6,
directory >= 1.1 && < 1.3,
containers >= 0.4 && < 0.6,
-@@ -71,16 +71,17 @@
- text >= 0.11 && < 0.12,
+ filepath >= 1.2 && < 1.4,
+- text >= 0.11 && < 0.12,
++ text >= 1.1 && < 1.2,
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.5,
- haskell-src-exts >= 1.12 && < 1.14,
++ haskell-src-exts >= 1.15 && < 1.16,
bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,
- blaze-html >= 0.4 && < 0.6,
-+ blaze-html >= 0.4 && < 0.7,
-+ blaze-markup == 0.5.1.*,
++ blaze-html >= 0.4 && < 0.8,
++ blaze-markup >= 0.6 && < 0.7,
pureMD5 >= 2.1 && < 2.2,
deepseq >= 1.1 && < 1.4,
++ exceptions >= 0.6 && < 0.7,
split >= 0.1 && < 0.3,
- pandoc >= 1.10 && < 1.11,
-+ pandoc >= 1.10 && < 1.12,
++ pandoc >= 1.10 && < 1.13,
time >= 1.2 && < 1.5,
old-time >= 1.0 && < 1.2,
- process >= 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,
+ simple-reflect >= 0.2 && < 0.4,
+ mtl >= 2.0 && < 2.2,
+ old-locale >= 1.0 && < 1.1,
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 143f25aef2a..0aa30f30499 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,19 +1,18 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.2.6
-PORTREVISION= 5
+PORTVERSION= 1.3.2.9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Authentication methods for Haskell web applications
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \
- conduit>=0.5 http-conduit>=1.5 http-types>=0.6 network \
- tagsoup>=0.12 text transformers>=0.1 unordered-containers \
- xml-conduit>=1.0
+ conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \
+ network resourcet tagstream-conduit>=0.5.5 text \
+ unordered-containers xml-conduit>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 2af618b464d..b52343fa60b 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/authenticate-1.3.2.6.tar.gz) = 3f4b5b35e85083c22b3ff1cfa2bb18964f203b9d36695b118452aa69b0894f8b
-SIZE (cabal/authenticate-1.3.2.6.tar.gz) = 8426
+SHA256 (cabal/authenticate-1.3.2.9.tar.gz) = b93d342b23ce9bea970b7251ae0df0026759986c05c5270f36a60ca8453d6f27
+SIZE (cabal/authenticate-1.3.2.9.tar.gz) = 8517
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index e20d858e913..ccc35cb9a65 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.1.7.5
-PORTREVISION= 4
+PORTVERSION= 3001.1.8.5
PORTEPOCH= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing CGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl>=1 network>=2 parsec>=2 xhtml>=3000
+USE_CABAL= MonadCatchIO-mtl mtl>=1.0 network>=2.0 parsec>=2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index f39abd85abc..dfdc79e74de 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cgi-3001.1.7.5.tar.gz) = 5126e2eaa53cd5de59572981c00aedae5790882afda67545228eb29fe76faffd
-SIZE (cabal/cgi-3001.1.7.5.tar.gz) = 21377
+SHA256 (cabal/cgi-3001.1.8.5.tar.gz) = 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39
+SIZE (cabal/cgi-3001.1.8.5.tar.gz) = 21423
diff --git a/www/hs-cgi/files/patch-Network__CGI__Monad.hs b/www/hs-cgi/files/patch-Network__CGI__Monad.hs
new file mode 100644
index 00000000000..8956c1e1ad0
--- /dev/null
+++ b/www/hs-cgi/files/patch-Network__CGI__Monad.hs
@@ -0,0 +1,30 @@
+--- ./Network/CGI/Monad.hs.orig 2014-02-04 09:00:24.000000000 +0100
++++ ./Network/CGI/Monad.hs 2014-07-13 18:20:00.000000000 +0200
+@@ -1,4 +1,4 @@
+-{-# OPTIONS_GHC -fglasgow-exts #-}
++{-# LANGUAGE DeriveDataTypeable #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Network.CGI.Monad
+@@ -40,8 +40,7 @@
+ import Control.Monad.Reader (ReaderT(..), asks)
+ import Control.Monad.Writer (WriterT(..), tell)
+ import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
+-import Data.Typeable (Typeable(..), Typeable1(..),
+- mkTyConApp, mkTyCon)
++import Data.Typeable
+
+ import Network.CGI.Protocol
+
+@@ -55,10 +54,7 @@
+
+ -- | The CGIT monad transformer.
+ newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a }
+-
+-instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where
+- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT")
+- [typeOf1 (undefined :: m a), typeOf (undefined :: a)]
++ deriving Typeable
+
+ instance (Functor m, Monad m) => Functor (CGIT m) where
+ fmap f c = CGIT (fmap f (unCGIT c))
diff --git a/www/hs-cgi/files/patch-Network__CGI__Protocol.hs b/www/hs-cgi/files/patch-Network__CGI__Protocol.hs
new file mode 100644
index 00000000000..ab1e0cb21be
--- /dev/null
+++ b/www/hs-cgi/files/patch-Network__CGI__Protocol.hs
@@ -0,0 +1,35 @@
+--- ./Network/CGI/Protocol.hs.orig 2014-02-04 09:00:24.000000000 +0100
++++ ./Network/CGI/Protocol.hs 2014-07-13 18:20:00.000000000 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE DeriveDataTypeable #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Network.CGI.Protocol
+@@ -44,7 +45,7 @@
+ import qualified Data.ByteString.Lazy.Char8 as BS
+ import Data.ByteString.Lazy.Char8 (ByteString)
+
+-import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
++import Data.Typeable
+
+ import Network.CGI.Header
+ import Network.CGI.Multipart
+@@ -72,9 +73,6 @@
+ }
+ deriving (Show)
+
+-instance Typeable CGIResult where
+- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") []
+-
+ -- | The value of an input parameter, and some metadata.
+ data Input = Input {
+ inputValue :: ByteString,
+@@ -90,7 +88,7 @@
+ -- | The result of a CGI program.
+ data CGIResult = CGIOutput ByteString
+ | CGINothing
+- deriving (Show, Read, Eq, Ord)
++ deriving (Show, Read, Eq, Ord, Typeable)
+
+ --
+ -- * Running CGI actions
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index bfa015a9811..9a49b3998d4 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.0.1
-PORTREVISION= 6
+PORTVERSION= 0.4.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP cookie parsing and rendering
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1 data-default text>=0.7
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 464c7d76085..06b7889e424 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cookie-0.4.0.1.tar.gz) = 73967e5d4a0fe43248db582ace5f0f4cb8c7085748ea90e1dc312f3e137e6506
-SIZE (cabal/cookie-0.4.0.1.tar.gz) = 3230
+SHA256 (cabal/cookie-0.4.1.2.tar.gz) = 716006fb3934f10479252c253e729fc0cd3096cf882c68ad1aea57524d51afb7
+SIZE (cabal/cookie-0.4.1.2.tar.gz) = 4577
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 9f0c65b0844..8da590a80a4 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= css-text
-PORTVERSION= 0.1.1
-PORTREVISION= 10
+PORTVERSION= 0.1.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= CSS parser and renderer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 text>=0.11
+USE_CABAL= attoparsec>=0.10.2.0 text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo
index 9eb8af8db6b..fe1828ed108 100644
--- a/www/hs-css-text/distinfo
+++ b/www/hs-css-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/css-text-0.1.1.tar.gz) = 1ed480f350d0107e3ba95c33ab94ea4efd1956443cc7cc0f3f28616733026b83
-SIZE (cabal/css-text-0.1.1.tar.gz) = 3139
+SHA256 (cabal/css-text-0.1.2.1.tar.gz) = dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6
+SIZE (cabal/css-text-0.1.2.1.tar.gz) = 3947
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 9f3326fb18e..60090a9523b 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,13 +3,13 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing FastCGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cgi>=3000.0.0
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index e8f66d65f5f..65fded0ce52 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.10.3.1
-PORTREVISION= 5
+PORTVERSION= 0.10.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,14 @@ COMMENT= Wiki using happstack, git or darcs, and pandoc
LICENSE= GPLv2
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 cgi ConfigFile>=1 \
+USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 ConfigFile>=1 \
feed>=0.3.6 filestore>=0.6 ghc-paths happstack-server>=7.0 \
highlighting-kate>=0.5.0.1 hslogger>=1 HStringTemplate>=0.6 \
- HTTP>=4000.0 json>=0.4 mtl network>=2.3 pandoc>=1.10.0.5 \
- pandoc-types>=1.10 parsec random recaptcha>=0.1 safe SHA>1 \
- syb tagsoup>=0.12 text url utf8-string>=0.3 xhtml xml>=1.3.5 \
- xss-sanitize>=0.3 zlib>=0.5
+ HTTP>=4000.0 HTTP json>=0.4 mtl network>=2.3 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 \
+ url utf8-string>=0.3 xml>=1.3.5 xss-sanitize>=0.3 \
+ zlib>=0.5
EXECUTABLE= expireGititCache gitit
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index a5cf3d56839..e7539e0ab38 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.3.1.tar.gz) = a5aabbac331436121d7178533fad5482fb0e4469852dea48b32063ef7ccea6ea
-SIZE (cabal/gitit-0.10.3.1.tar.gz) = 209218
+SHA256 (cabal/gitit-0.10.4.tar.gz) = f64c7c76676a765fe4bee5d43aa56e2934b0e7f883671d3f38f5e6aa6ed806fc
+SIZE (cabal/gitit-0.10.4.tar.gz) = 215467
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 37ec079c4ef..81aaebfc364 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= hS3
-PORTVERSION= 0.5.7
-PORTREVISION= 5
+PORTVERSION= 0.5.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interface to Amazon's Simple Storage Service (S3)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
MissingH>=0.18.6 network random regex-compat utf8-string
diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo
index 6f7ce3b312e..ec932c8c141 100644
--- a/www/hs-hS3/distinfo
+++ b/www/hs-hS3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hS3-0.5.7.tar.gz) = c29979436fc81fb9a9b12a6cb18ab8d419d7d85bba8238e29d25e2aff836b7dc
-SIZE (cabal/hS3-0.5.7.tar.gz) = 19543
+SHA256 (cabal/hS3-0.5.8.tar.gz) = 759d37a56f0f3b2f1177c03da75410f8ee2b6f41c3f648cbc99062f269cdb9f2
+SIZE (cabal/hS3-0.5.8.tar.gz) = 19878
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
deleted file mode 100644
index 0b8d1972873..00000000000
--- a/www/hs-hamlet/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= hamlet
-PORTVERSION= 1.1.7.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haml-like template files that are compile-time checked
-
-LICENSE= MIT
-
-USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1 \
- failure>=0.1 parsec>=2 shakespeare>=1.0.1 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
deleted file mode 100644
index 28bf72ec048..00000000000
--- a/www/hs-hamlet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/hamlet-1.1.7.1.tar.gz) = b7e0549a2bfb4f76acba63f85a959f365785f1c42cbce3afc248c74ef5fe92cd
-SIZE (cabal/hamlet-1.1.7.1.tar.gz) = 21529
diff --git a/www/hs-hamlet/pkg-descr b/www/hs-hamlet/pkg-descr
deleted file mode 100644
index 6fa032658fb..00000000000
--- a/www/hs-hamlet/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Hamlet gives you a type-safe tool for generating HTML code. It works
-via Quasi-Quoting, and generating extremely efficient output code. The
-syntax is white-space sensitive, and it helps you avoid cross-site
-scripting issues and 404 errors.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 728035904c4..5687b896902 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.1.7.1
-PORTREVISION= 4
+PORTVERSION= 7.3.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web-related tools and services
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \
hslogger>=1.0.2 html monad-control>=0.3 mtl>=2 network>=2.2.3 \
- parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
- threads>=0.5 time-compat transformers>=0.1.3 \
- transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib
+ parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 \
+ text>=0.10 threads>=0.5 time-compat transformers-base>=0.4 \
+ utf8-string>=0.3.4 zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index c2586de0b0d..e9802bef80a 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.1.7.1.tar.gz) = e2fc2bf7a78a25c3a24f965972cd78ffa8c66755b54249ac34d0590fb63a09e1
-SIZE (cabal/happstack-server-7.1.7.1.tar.gz) = 78293
+SHA256 (cabal/happstack-server-7.3.7.tar.gz) = 013ee7be9884dd54c825a6b4a72dd40fbd5cb5e41384cdc7568dd1692f1c1cde
+SIZE (cabal/happstack-server-7.3.7.tar.gz) = 79407
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index f044cc5ee2f..89c1b2bc47e 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= happstack
-PORTVERSION= 7.0.1
-PORTREVISION= 7
+PORTVERSION= 7.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The haskell application server stack + code generation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= happstack-server>=7.0
diff --git a/www/hs-happstack/distinfo b/www/hs-happstack/distinfo
index 303e92e251b..cd49cc3f121 100644
--- a/www/hs-happstack/distinfo
+++ b/www/hs-happstack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-7.0.1.tar.gz) = 7da517397291c571af0606a1468911fd8f724daef67c86a6dd6b2680a9e2128b
-SIZE (cabal/happstack-7.0.1.tar.gz) = 2092
+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 fd7849fb9ba..8293991e3cb 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.12.0
-PORTREVISION= 4
+PORTVERSION= 0.13.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell template system supporting both HTML5 and XML
-LICENSE= BSD
+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 errors>=1.4 \
hashable>=1.1 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.1.6
+ vector>=0.9 xmlhtml>=0.2.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 5c4ffd04db1..447235991de 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.12.0.tar.gz) = 49ba5adf1e223507eb965b79b22f3b211e33381523330719f592767d6fdcb839
-SIZE (cabal/heist-0.12.0.tar.gz) = 61816
+SHA256 (cabal/heist-0.13.1.2.tar.gz) = 45a7d2180f6fc257ca51aab96dfb6e343e12ba5cc15cc26b293b0e0b80a30031
+SIZE (cabal/heist-0.13.1.2.tar.gz) = 63167
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 5a6597a2415..57902785d26 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,16 +1,18 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.4.1
-PORTREVISION= 5
+PORTVERSION= 0.1.4.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell implementation of a javascript minifier
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 text>=0.8
+USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 \
+ optparse-applicative>=0.7 text>=0.8
+
+EXECUTABLE= hjsmin
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 6200d8cf8c8..db2b1bad8c9 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.4.1.tar.gz) = 2a2ca985c9ba648c0c96ca684c9d9f26998af1d8e68d28ea6af50c3b4d83e364
-SIZE (cabal/hjsmin-0.1.4.1.tar.gz) = 116268
+SHA256 (cabal/hjsmin-0.1.4.7.tar.gz) = 0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf
+SIZE (cabal/hjsmin-0.1.4.7.tar.gz) = 110718
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
new file mode 100644
index 00000000000..57266744478
--- /dev/null
+++ b/www/hs-http-client-tls/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= http-client-tls
+PORTVERSION= 0.2.2
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= http-client backend using the connection package and tls library
+
+LICENSE= MIT
+
+USE_CABAL= connection>=0.2.2 data-default-class http-client>=0.3.5 \
+ network tls>=1.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-http-client-tls/distinfo b/www/hs-http-client-tls/distinfo
new file mode 100644
index 00000000000..56b5488dcf4
--- /dev/null
+++ b/www/hs-http-client-tls/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http-client-tls-0.2.2.tar.gz) = 451e5833a1f07fdc162fde4371ac92986932d5c38f9969ace7babb020bc80128
+SIZE (cabal/http-client-tls-0.2.2.tar.gz) = 2962
diff --git a/www/hs-http-client-tls/pkg-descr b/www/hs-http-client-tls/pkg-descr
new file mode 100644
index 00000000000..7b8be71041c
--- /dev/null
+++ b/www/hs-http-client-tls/pkg-descr
@@ -0,0 +1,3 @@
+Intended for use by higher-level libraries, such as http-conduit.
+
+WWW: https://github.com/snoyberg/http-client
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
new file mode 100644
index 00000000000..605648889ca
--- /dev/null
+++ b/www/hs-http-client/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= http-client
+PORTVERSION= 0.3.6.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HTTP client engine
+
+LICENSE= MIT
+
+USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \
+ cookie data-default-class exceptions>=0.4 http-types>=0.8 \
+ mime-types network>=2.3 publicsuffixlist random \
+ streaming-commons>=0.1.0.2 text>=0.11
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo
new file mode 100644
index 00000000000..27bd849d78a
--- /dev/null
+++ b/www/hs-http-client/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http-client-0.3.6.1.tar.gz) = 306d9073b8e8dd0f38c70fcaf532ba10a4054262116dce20837a7b277ab35555
+SIZE (cabal/http-client-0.3.6.1.tar.gz) = 33929
diff --git a/www/hs-http-client/pkg-descr b/www/hs-http-client/pkg-descr
new file mode 100644
index 00000000000..ce023b54063
--- /dev/null
+++ b/www/hs-http-client/pkg-descr
@@ -0,0 +1,4 @@
+An HTTP client engine, intended as a base layer for more user-friendly
+packages.
+
+WWW: https://github.com/snoyberg/http-client
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index afc47611f29..4e9e401cf29 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,24 +1,17 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.9.3
-PORTREVISION= 4
+PORTVERSION= 2.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP client package with conduit interface and HTTPS support
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \
- blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
- certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.3 \
- data-default failure>=0.1 http-types>=0.7 lifted-base>=0.1 \
- mime-types>=0.1 monad-control>=0.3 mtl network>=2.3 \
- publicsuffixlist>=0.0.3 random regex-compat resourcet>=0.3 \
- socks>=0.4 text tls>=1.0.0 tls-extra>=0.5.0 transformers>=0.2 \
- transformers-base>=0.4 utf8-string>=0.3.4 void>=0.5.5 \
- zlib-conduit>=0.5
+USE_CABAL= conduit>=0.5.5 http-client>=0.3.6 http-client-tls>=0.2.2 \
+ http-types>=0.7 lifted-base>=0.1 monad-control mtl \
+ resourcet>=1.1
.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 5687b6a73f3..bd6f3d1e839 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.9.3.tar.gz) = 73e620353cf1f818cca9c755f79ccee2768b914616181e0bed339064a444800d
-SIZE (cabal/http-conduit-1.9.3.tar.gz) = 45412
+SHA256 (cabal/http-conduit-2.1.4.tar.gz) = 4b4693a994d81d916f998218c3c89ff0fb0763b40ea6dece8354e4e38b68ae93
+SIZE (cabal/http-conduit-2.1.4.tar.gz) = 22819
diff --git a/www/hs-http-conduit/pkg-descr b/www/hs-http-conduit/pkg-descr
index e819f615fb2..0074c407329 100644
--- a/www/hs-http-conduit/pkg-descr
+++ b/www/hs-http-conduit/pkg-descr
@@ -1,5 +1,5 @@
-This package uses attoparsec for parsing the actual contents of the HTTP
+This package uses conduit for parsing the actual contents of the HTTP
connection. It also provides higher-level functions which allow you to
-avoid direct usage of conduits.
+avoid directly dealing with streaming data.
WWW: http://www.yesodweb.com/book/http-conduit
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 1bb05bdd3b8..5a7865a1718 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,13 +2,13 @@
PORTNAME= http-date
PORTVERSION= 0.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP Date parser/formatter
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index a3ddd8fef18..5e2716351a7 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,19 +1,19 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.1.1.6
-PORTREVISION= 4
+PORTVERSION= 0.4.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Reverse proxy HTTP requests, either over raw sockets or with WAI
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \
- conduit>=0.5 data-default http-conduit>=1.6 http-types>=0.6 \
- lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \
- text>=0.11 wai>=1.3 warp>=1.3.4 word8>=0.0
+USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \
+ conduit-extra data-default-class http-client>=0.3 \
+ http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \
+ network resourcet streaming-commons text>=0.11 wai>=3.0 \
+ wai-logger word8>=0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 6632a92f105..4ea7d8ec472 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 34ad0eab9ca014477fabf5372242dfe85837ad8b6f36a1e3871a80396a0e063a
-SIZE (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 6786
+SHA256 (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 30fc8eadde6efb2dd0548087d55f5baae63558d1442c5efbd0d978dda7afcf3f
+SIZE (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 8839
diff --git a/www/hs-http-reverse-proxy/pkg-descr b/www/hs-http-reverse-proxy/pkg-descr
index 7f0be104ad0..bb89c68e4f7 100644
--- a/www/hs-http-reverse-proxy/pkg-descr
+++ b/www/hs-http-reverse-proxy/pkg-descr
@@ -1,5 +1,6 @@
-Provides a simple means of reverse-proxying HTTP requests. The raw approach
-uses the same technique as leveraged by keter, whereas the WAI approach
-performs full request/response parsing via WAI and http-conduit.
+Provides a simple means of reverse-proxying HTTP requests. The raw
+approach uses the same technique as leveraged by keter, whereas the WAI
+approach performs full request/response parsing via WAI and
+http-conduit.
WWW: https://github.com/fpco/http-reverse-proxy
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 21115a19ec3..9145a64ad78 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= http-server
-PORTVERSION= 1.0.2
-PORTREVISION= 5
+PORTVERSION= 1.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for writing Haskell web servers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
+USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.4.0.0 text>=1.0 url>=2 \
+ utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index b73a2bbb895..fdcf4e8ce31 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-server-1.0.2.tar.gz) = 44456c09b639c2c6259f679a2203ab995c2204f5f1402879323be37e8daaff87
-SIZE (cabal/http-server-1.0.2.tar.gz) = 27993
+SHA256 (cabal/http-server-1.0.4.tar.gz) = 985090c8490a49bbcfafc181ac60473ba49a18eb9464f2f69b54da33aea534ea
+SIZE (cabal/http-server-1.0.4.tar.gz) = 29015
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 90e0ef26056..5062670c4ca 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.8.0
-PORTREVISION= 5
+PORTVERSION= 0.8.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generic HTTP types for Haskell (for both client and server code)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index 8037ded4259..e19ca6ef723 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-types-0.8.0.tar.gz) = e544fa89d83f4c6fa9e2a23a5389df59ee6824ded0b04a47e7d346c8df7fa191
-SIZE (cabal/http-types-0.8.0.tar.gz) = 11520
+SHA256 (cabal/http-types-0.8.5.tar.gz) = 3cb243486053f2e80af255ab79009c2ef057d314d5710ba7aa65fa3e9c164834
+SIZE (cabal/http-types-0.8.5.tar.gz) = 10781
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 70f81193468..49e1f7bb0ce 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= oeis
-PORTVERSION= 0.3.1
-PORTREVISION= 10
+PORTVERSION= 0.3.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell interface to the Online Encyclopedia of Integer Sequences
+COMMENT= Interface to the Online Encyclopedia of Integer Sequences (OEIS)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.0.2 network>=2
+USE_CABAL= HTTP network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/distinfo b/www/hs-oeis/distinfo
index 5f42d4140c8..833d5e78533 100644
--- a/www/hs-oeis/distinfo
+++ b/www/hs-oeis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/oeis-0.3.1.tar.gz) = 829308a22e330bef8e39a8fa88776488eba6213b1bd90cf70168811f5611ba4f
-SIZE (cabal/oeis-0.3.1.tar.gz) = 7311
+SHA256 (cabal/oeis-0.3.5.tar.gz) = a617e60b1ffd1e7ebc3d30b291687f25651471769fb2f6a1367defed16ae4364
+SIZE (cabal/oeis-0.3.5.tar.gz) = 29204
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index b39ca0b3490..20db2efad99 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= path-pieces
-PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTVERSION= 0.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Components of paths
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.5
diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo
index e1eabe9b9a6..d2807ddb49d 100644
--- a/www/hs-path-pieces/distinfo
+++ b/www/hs-path-pieces/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/path-pieces-0.1.2.tar.gz) = 4aada5c3651017f28f0f9676f9b79868aba8b23dc1991d0d7252b8802952bab3
-SIZE (cabal/path-pieces-0.1.2.tar.gz) = 2485
+SHA256 (cabal/path-pieces-0.1.4.tar.gz) = 5b78f3375dcbac842b7b7bf08e8398255234e8f12ede96c33f75223417b9b0bb
+SIZE (cabal/path-pieces-0.1.4.tar.gz) = 2718
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index fbbee23b789..c9451bcbf22 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= recaptcha
-PORTVERSION= 0.1
-PORTREVISION= 9
+PORTVERSION= 0.1.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Functions for using the reCAPTCHA service in web applications
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1 xhtml>=3000.0
+USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-recaptcha/distinfo b/www/hs-recaptcha/distinfo
index 1f3bdd9b576..34fd88dd381 100644
--- a/www/hs-recaptcha/distinfo
+++ b/www/hs-recaptcha/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/recaptcha-0.1.tar.gz) = de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144
-SIZE (cabal/recaptcha-0.1.tar.gz) = 2626
+SHA256 (cabal/recaptcha-0.1.0.2.tar.gz) = 30ae898cc39381b4e54bd984562a3a0e1385a393b1e318fec4a3b1bacc754d13
+SIZE (cabal/recaptcha-0.1.0.2.tar.gz) = 2667
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index 1f7dabea926..3694f29097e 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -5,13 +5,13 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing SCGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cgi network>=2.2.3
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
deleted file mode 100644
index e9a93e30c4a..00000000000
--- a/www/hs-shakespeare-css/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-css
-PORTVERSION= 1.0.5.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Stick your Haskell variables into CSS at compile time
-
-LICENSE= MIT
-
-USE_CABAL= parsec>=2 shakespeare>=1.0 text>=0.11.1.1 transformers
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
deleted file mode 100644
index 3eab08f37ee..00000000000
--- a/www/hs-shakespeare-css/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-css-1.0.5.1.tar.gz) = 5ae7e5e970affa31375e95b0d31564f0bfdaf0fdf8f3f6637bec449b2a3ba51b
-SIZE (cabal/shakespeare-css-1.0.5.1.tar.gz) = 16370
diff --git a/www/hs-shakespeare-css/pkg-descr b/www/hs-shakespeare-css/pkg-descr
deleted file mode 100644
index 55fb49f66ae..00000000000
--- a/www/hs-shakespeare-css/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation. Shakespeare templates can be used inline
-with a quasi-quoter or in an external file. Shakespeare interpolates
-variables according to the type being inserted. In this case, the
-variable type needs a ToCss instance. This package contains 2 css
-template languages. The Cassius language uses whitespace to avoid the
-need for closing brackets and semi-colons. Lucius does not care about
-whitespace and is a strict superset of css. There are also some
-significant conveniences added for css.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
deleted file mode 100644
index d82d084e00f..00000000000
--- a/www/hs-shakespeare-i18n/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-i18n
-PORTVERSION= 1.0.0.2
-PORTREVISION= 9
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Type-based approach to internationalization
-
-LICENSE= MIT
-
-USE_CABAL= parsec shakespeare>=1.0 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-i18n/distinfo b/www/hs-shakespeare-i18n/distinfo
deleted file mode 100644
index 5fb70aebdd4..00000000000
--- a/www/hs-shakespeare-i18n/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = bfb8fad2ef9916cd528479e41a694bbb9d9bd2250e3ba4104e6787b10d9dcd87
-SIZE (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = 5869
diff --git a/www/hs-shakespeare-i18n/pkg-descr b/www/hs-shakespeare-i18n/pkg-descr
deleted file mode 100644
index 58ac2326e29..00000000000
--- a/www/hs-shakespeare-i18n/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses the same approach of type-safe URLs to create
-translated content. It has a simple syntax for translators, while
-allowing the full power of Haskell for applying complex grammar rules.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
deleted file mode 100644
index af897f9128e..00000000000
--- a/www/hs-shakespeare-js/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-js
-PORTVERSION= 1.1.4
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Stick your Haskell variables into JavaScript at compile time
-
-LICENSE= MIT
-
-USE_CABAL= aeson>=0.5 shakespeare>=1.0.5 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
deleted file mode 100644
index 18932dfa3cb..00000000000
--- a/www/hs-shakespeare-js/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-js-1.1.4.tar.gz) = c3bba5e4ebb914eded23a060beb68f6e76d134aa2a42c8f654c6b118dec51616
-SIZE (cabal/shakespeare-js-1.1.4.tar.gz) = 7942
diff --git a/www/hs-shakespeare-js/pkg-descr b/www/hs-shakespeare-js/pkg-descr
deleted file mode 100644
index 81d5304b8de..00000000000
--- a/www/hs-shakespeare-js/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation . Shakespeare templates can be used inline
-with a quasi-quoter or in an external file. Shakespeare interpolates
-variables according to the type being inserted. In this case, the
-variable type needs a ToJavascript instance. There is also
-shakespeare-coffeescript for coffeescript templates. Coffescript is a
-language that compiles down to javascript. It expects a coffeescript
-compiler in your path, and variable should be a ToCoffee instance. And
-we even have a Roy template for the adventorous FP addicts.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
deleted file mode 100644
index ff1b2f64bf2..00000000000
--- a/www/hs-shakespeare-text/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-text
-PORTVERSION= 1.0.0.5
-PORTREVISION= 7
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Interpolation with quasi-quotation: put variables strings
-
-LICENSE= MIT
-
-USE_CABAL= shakespeare>=1.0 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-text/distinfo b/www/hs-shakespeare-text/distinfo
deleted file mode 100644
index c609aa2120c..00000000000
--- a/www/hs-shakespeare-text/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-text-1.0.0.5.tar.gz) = 669c298fbb7a06b667299f9ca185f32645d36aec13d9af6fb70e403d48ffde9c
-SIZE (cabal/shakespeare-text-1.0.0.5.tar.gz) = 4597
diff --git a/www/hs-shakespeare-text/pkg-descr b/www/hs-shakespeare-text/pkg-descr
deleted file mode 100644
index b9a7ea77dc4..00000000000
--- a/www/hs-shakespeare-text/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-interpolation with quasi-quotation: stick haskell variables into haskell
-strings Note there is no dependency on haskell-src-extras. If you don't
-mind that dependency, you may want to look at using these packages:
-Interpolation, interpolatedstring-perl6, interpolatedstring-qq. This
-package has 1 other general feature that those others may not (but would
-be easy to duplicate): instead of using quasi-quoting you can also use an
-external file. It also has url/embeding interpolation, with @ and ^,
-which are used in Yesod. This package also uses blaze-builder for efficiently
-constructing strings.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 2fa8c0eca70..8b6c1645a9c 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTVERSION= 2.0.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= parsec>=2 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.7
+USE_CABAL= aeson blaze-html blaze-markup exceptions parsec>=2 \
+ system-fileio>=0.3 system-filepath>=0.4 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index 24c392adb8f..d01e3de92a2 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.5.tar.gz) = 6e931034316149ace4a5aa2d035188786ba0d5a5763b20b62b04f65bc6f381b5
-SIZE (cabal/shakespeare-1.0.5.tar.gz) = 10552
+SHA256 (cabal/shakespeare-2.0.1.1.tar.gz) = 3781e221e0a70ea15ae023adb2a7dbd4461b9649a1b195da102305bf3aaaad75
+SIZE (cabal/shakespeare-2.0.1.1.tar.gz) = 58758
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index f79572e1c9c..75a5b042702 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 0.9.3.1
-PORTREVISION= 5
+PORTVERSION= 0.9.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Snap: A Haskell Web Framework (core interfaces and types)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
- case-insensitive>=0.3 enumerator>=0.4.15 HUnit>=1.2 \
- MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
- regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \
+ case-insensitive>=0.3 enumerator>=0.4.15 hashable \
+ HUnit>=1.2 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
+ random>=1 regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \
unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 0cec282680b..6f35255ef7a 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-core-0.9.3.1.tar.gz) = f8aaf66a9796e8be996649eedf1e0211f835dd0a5459a9a7a1644240c19954e0
-SIZE (cabal/snap-core-0.9.3.1.tar.gz) = 91232
+SHA256 (cabal/snap-core-0.9.6.3.tar.gz) = 81b70058ec42b9344b779b3fac0c86086f96e9510d7a88b53954c4df67a06f44
+SIZE (cabal/snap-core-0.9.6.3.tar.gz) = 91549
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 58e431c45db..7ea46c35d1b 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 0.9.3.3
-PORTREVISION= 5
+PORTVERSION= 0.9.4.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
@@ -16,18 +15,11 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
-OPTIONS_DEFINE= OPENSSL
+FLAGS_DEFINE= OPENSSL
OPENSSL_DESC= Enable HTTPS support using the HsOpenSSL library
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+= --flags="openssl"
-USE_CABAL+= HsOpenSSL>=0.10
-.else
-CONFIGURE_ARGS+= --flags="-openssl"
-.endif
+OPENSSL_FLAG_ENABLE= openssl
+OPENSSL_FLAG_CABAL= HsOpenSSL>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 67d0642c56c..c2019d9a661 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-server-0.9.3.3.tar.gz) = 2fd23a4164334592dc2c37b973e341d800734e280281b35d3c6a67f2a0efa0d8
-SIZE (cabal/snap-server-0.9.3.3.tar.gz) = 55532
+SHA256 (cabal/snap-server-0.9.4.5.tar.gz) = 37ae3557c43dcecf6938df76af1ee274b575e50a8085d12b8f80c587e94e6924
+SIZE (cabal/snap-server-0.9.4.5.tar.gz) = 58643
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 9feb788f049..3c28b02b3a2 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,27 +1,24 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.12.0
-PORTREVISION= 4
+PORTVERSION= 0.13.2.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Top-level package for the Snap Web Framework
-LICENSE= BSD
+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.10 \
- dlist>=0.5 errors>=1.4 hashable heist>=0.12 lens>=3.7.6 \
- logict>=0.4.2 MonadCatchIO-transformers>=0.2 mtl>2.0 \
- mwc-random>=0.8 pwstore-fast>=2.2 regex-posix>=0.95 \
- snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 tagged \
- text>=0.11 transformers>=0.2 unordered-containers>=0.1.4 \
- vector>=0.7.1 vector-algorithms>=0.4 xmlhtml>=0.1
+USE_CABAL= aeson 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 errors>=1.4 hashable \
+ heist>=0.13 lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \
+ mtl>2.0 mwc-random>=0.8 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
-IGNORE_DYNAMIC= yes
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index 541a2af0269..c03d580a7ea 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.12.0.tar.gz) = cec5990f0063be66453941cf91226051c00a8260708573c89f8e650ef7aa8c59
-SIZE (cabal/snap-0.12.0.tar.gz) = 82197
+SHA256 (cabal/snap-0.13.2.8.tar.gz) = ef2fa6b87e2f4eac56d8c95320575adea7eb7ae1c5914209a0590aae728036cb
+SIZE (cabal/snap-0.13.2.8.tar.gz) = 83938
diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal
new file mode 100644
index 00000000000..3cdfd461bfd
--- /dev/null
+++ b/www/hs-snap/files/patch-snap.cabal
@@ -0,0 +1,19 @@
+--- ./snap.cabal.orig 2014-07-03 21:45:03.000000000 +0200
++++ ./snap.cabal 2014-07-29 12:40:27.405965571 +0200
+@@ -186,7 +186,7 @@
+ else
+ build-depends:
+ base >= 4.4 && < 5,
+- lens >= 3.7.6 && < 4.2
++ lens >= 3.7.6 && < 4.4
+
+ extensions:
+ BangPatterns,
+@@ -236,6 +236,7 @@
+ text >= 0.11 && < 1.2
+
+ extensions:
++ TemplateHaskell
+ OverloadedStrings
+
+ ghc-prof-options: -prof -auto-all
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 63a2cef099c..cd2f846fb72 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,13 +3,13 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for working with URLs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= utf8-string>=0.3.4
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index d4f19f991bf..f66c09021dd 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 1.3.1.2
-PORTREVISION= 5
+PORTVERSION= 3.0.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,14 @@ COMMENT= WAI application for static serving
LICENSE= MIT
USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 cereal>=0.3.5 crypto-conduit>=0.4 \
- cryptohash>=0.7 file-embed>=0.0.3.1 http-date http-types>=0.7 \
- mime-types>=0.1 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.7 transformers>=0.2.2 unix-compat>=0.2 wai>=1.3
+ blaze-markup>=0.5.1 byteable cryptohash>=0.11 \
+ cryptohash-conduit file-embed>=0.0.3.1 http-date \
+ http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \
+ system-fileio>=0.3 system-filepath>=0.4 text>=0.7 \
+ unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
+ wai-extra>=3.0 warp>=3.0 zlib>=0.5
+
+EXECUTABLE= warp
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index 40092ce2f70..05acd538a49 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-1.3.1.2.tar.gz) = 9d149e143aa0d6e8e9ffbc41469e8e6992265567635903de20f887cb801d12c4
-SIZE (cabal/wai-app-static-1.3.1.2.tar.gz) = 14916
+SHA256 (cabal/wai-app-static-3.0.0.tar.gz) = 631cca083081803a81cf46d1b538f7c2dbe9c8310b94694a88220242f415f984
+SIZE (cabal/wai-app-static-3.0.0.tar.gz) = 20720
diff --git a/www/hs-wai-app-static/pkg-descr b/www/hs-wai-app-static/pkg-descr
index 1d2260eceb8..9ac593aa6ab 100644
--- a/www/hs-wai-app-static/pkg-descr
+++ b/www/hs-wai-app-static/pkg-descr
@@ -1,3 +1,3 @@
Also provides some helper functions and datatypes for use outside of WAI.
-WWW: http://www.yesodweb.com/book/wai
+WWW: http://www.yesodweb.com/book/web-application-interface
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index ac08924e614..cea0bdfb5c3 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.4
-PORTREVISION= 4
+PORTVERSION= 3.0.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,11 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
-USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- base64-bytestring case-insensitive>=0.2 conduit>=0.5 \
- data-default date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
- network>=2.2.1.5 resourcet>=0.3 stringsearch>=0.3 \
- text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \
- wai-logger>=0.2 word8 zlib-conduit>=0.5
+USE_CABAL= ansi-terminal base64-bytestring blaze-builder>=0.2.1.4 \
+ case-insensitive>=0.2 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 void>=0.5 wai>=3.0 wai-logger>=2.0 word8
.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 c2d91cbbce9..9a9792607a8 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.4.tar.gz) = ddbde27aa5bde76dc9e8d548ea71ff5b4ae1963f1f35023322ecc78b0a16c8ab
-SIZE (cabal/wai-extra-1.3.4.tar.gz) = 32600
+SHA256 (cabal/wai-extra-3.0.1.2.tar.gz) = 9f042de4a0d48c3415b2aacc8447bd938bf236a725adeeb4f5dbc635cfac6397
+SIZE (cabal/wai-extra-3.0.1.2.tar.gz) = 39555
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 8337ae5cfab..ce89b01a569 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,17 +1,17 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTVERSION= 2.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Logging system for WAI
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \
- fast-logger>=0.3 http-types network wai
+USE_CABAL= auto-update blaze-builder byteorder case-insensitive \
+ fast-logger>=2.2 http-types network unix-time>=0.2.2 \
+ wai>=2.0.0
.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 29eb1efbf1e..a0e62eb8e30 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-logger-0.3.0.tar.gz) = d80b264861eaeef7b37d35a49dd1a720b286fabeaaa67da2637d9d8cbd64528c
-SIZE (cabal/wai-logger-0.3.0.tar.gz) = 3642
+SHA256 (cabal/wai-logger-2.2.0.tar.gz) = 7e3f92d6be5a87df977fb9cc66e09e3aec5500e1dedc20886b42501f56628436
+SIZE (cabal/wai-logger-2.2.0.tar.gz) = 5963
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
deleted file mode 100644
index 2ac5ec2e3b4..00000000000
--- a/www/hs-wai-test/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= wai-test
-PORTVERSION= 1.3.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Unit test framework (built on HUnit) for WAI applications
-
-LICENSE= MIT
-
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 cookie>=0.2 \
- http-types>=0.7 HUnit>=1.2 network text>=0.7 \
- transformers>=0.2.2 wai>=1.3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
deleted file mode 100644
index 7952dc2b899..00000000000
--- a/www/hs-wai-test/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/wai-test-1.3.1.tar.gz) = 6f2ac40a1cd06eaad47a48b12856d90aef78c4c980d2384a1ad91fb1f8a28937
-SIZE (cabal/wai-test-1.3.1.tar.gz) = 3800
diff --git a/www/hs-wai-test/pkg-descr b/www/hs-wai-test/pkg-descr
deleted file mode 100644
index 3de4eb02894..00000000000
--- a/www/hs-wai-test/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Unit test framework (built on HUnit) for WAI applications.
-
-WWW: http://www.yesodweb.com/book/web-application-interface
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index e35514adbd4..11282b8b74f 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 1.4.0
-PORTREVISION= 5
+PORTVERSION= 3.0.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web Application Interface
-LICENSE= BSD
+LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 http-types>=0.7 \
- network>=2.2.1.5 text>=0.7 transformers>=0.2.2 vault>=0.1
+USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \
+ text>=0.7 vault>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 0af33c7c58c..e33c45b2344 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-1.4.0.tar.gz) = b87131aac9454e47ad4cbd19cf15000fa835df527d569bb3533d5c2c56d42388
-SIZE (cabal/wai-1.4.0.tar.gz) = 4508
+SHA256 (cabal/wai-3.0.1.1.tar.gz) = 2022773ce7137227c806a473848778e9605ce6c62f55f4eb867f32fc2a50b311
+SIZE (cabal/wai-3.0.1.1.tar.gz) = 7649
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
new file mode 100644
index 00000000000..4cb31ad4d14
--- /dev/null
+++ b/www/hs-warp-tls/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= warp-tls
+PORTVERSION= 3.0.0
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+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.1 wai>=3.0 warp>=3.0
+
+.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
new file mode 100644
index 00000000000..fbc9ba6fdae
--- /dev/null
+++ b/www/hs-warp-tls/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/warp-tls-3.0.0.tar.gz) = dce9d46532440c2429d72f21ee07ded929eb67f26909150f82698780d420f591
+SIZE (cabal/warp-tls-3.0.0.tar.gz) = 3905
diff --git a/www/hs-warp-tls/pkg-descr b/www/hs-warp-tls/pkg-descr
new file mode 100644
index 00000000000..e2f16ac294b
--- /dev/null
+++ b/www/hs-warp-tls/pkg-descr
@@ -0,0 +1,3 @@
+HTTP over SSL/TLS support for Warp via the TLS package.
+
+WWW: http://github.com/yesodweb/wai
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 4c84ffa4728..d0accb09538 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.8.1
-PORTREVISION= 4
+PORTVERSION= 3.0.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,10 @@ COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 hashable http-types>=0.7 \
- lifted-base>=0.1 network>=2.3 network-conduit>=0.5 \
- simple-sendfile>=0.2.7 transformers>=0.2.2 unix-compat>=0.2 \
- void wai>=1.3
+USE_CABAL= blaze-builder>=0.3.3 case-insensitive>=0.2 hashable \
+ http-date http-types>=0.8.5 network>=2.3 \
+ simple-sendfile>=0.2.7 streaming-commons>=0.1.2 text \
+ unix-compat>=0.2 void wai>=3.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 9e21d9f0001..16976d26d48 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.8.1.tar.gz) = 7dc4b9d3d3a8590c19a17523a2bdf1086116f333d443391385d8f424d1767f1e
-SIZE (cabal/warp-1.3.8.1.tar.gz) = 19185
+SHA256 (cabal/warp-3.0.0.5.tar.gz) = a525cc131bd85586d5cc2b28d0d75502c794e101cce043e426d796b0ba7dc9c6
+SIZE (cabal/warp-3.0.0.5.tar.gz) = 38894
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index a36cd19b9aa..7a67d88815a 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 0.12.4
-PORTREVISION= 8
+PORTVERSION= 0.12.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Binding to the Webkit library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12 glib>=0.12 gtk>=0.12 mtl pango>=0.12
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
+USE_CABAL= cairo>=0.12 glib>=0.12.1 gtk>=0.12.5.0 mtl pango>=0.12
+LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-webkit/distinfo b/www/hs-webkit/distinfo
index 61ca8a9b68b..abea02d2eb4 100644
--- a/www/hs-webkit/distinfo
+++ b/www/hs-webkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/webkit-0.12.4.tar.gz) = 7043f8cc841bee5c3ed91c2e3b6652336e6598d1246b66a487b3e19b52e492cf
-SIZE (cabal/webkit-0.12.4.tar.gz) = 60094
+SHA256 (cabal/webkit-0.12.6.1.tar.gz) = 6a4e1921775f282f1a6bc912402a602f379937d2c4e754a2ee9d87ab77fd56b6
+SIZE (cabal/webkit-0.12.6.1.tar.gz) = 148047
diff --git a/www/hs-webkit/pkg-descr b/www/hs-webkit/pkg-descr
index fa30db413f2..b55e56100c6 100644
--- a/www/hs-webkit/pkg-descr
+++ b/www/hs-webkit/pkg-descr
@@ -1,7 +1,8 @@
WebKit is a web content engine, derived from KHTML and KJS from KDE, and
used primarily in Apple's Safari browser. It is made to be embedded in
other applications, such as mail readers, or web browsers.
+
It is able to display content such as HTML, SVG, XML, and others. It also
supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index cb00f85eda1..86a6cbe99f4 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= xss-sanitize
-PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTVERSION= 0.3.5.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Sanitize untrusted HTML to prevent XSS attacks
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2 \
tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3
diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo
index d3e8e0a5479..b5469bed801 100644
--- a/www/hs-xss-sanitize/distinfo
+++ b/www/hs-xss-sanitize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xss-sanitize-0.3.3.tar.gz) = 8a9cabdfa98b686fee05171af85e45ee45887ec161cac895e204d2c72dbade76
-SIZE (cabal/xss-sanitize-0.3.3.tar.gz) = 8495
+SHA256 (cabal/xss-sanitize-0.3.5.2.tar.gz) = cbb4a0df82512ec0ddef8162d8ab26d906a98a292162748039a78367a3e66ad2
+SIZE (cabal/xss-sanitize-0.3.5.2.tar.gz) = 10856
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
new file mode 100644
index 00000000000..e151c0ae801
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= yesod-auth-hashdb
+PORTVERSION= 1.3.0.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Authentication plugin for Yesod
+
+LICENSE= MIT
+
+USE_CABAL= cryptohash>=0.8 pwstore-fast>=2.2 text>=0.7 yesod-auth>=1.3 \
+ yesod-core>=1.2 yesod-form>=1.3 yesod-persistent>=1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
new file mode 100644
index 00000000000..e82425382fb
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 984c38923340cd59b87f0862024cb5a9c02a84184093f2d52760999700afe860
+SIZE (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 6772
diff --git a/www/hs-yesod-auth-hashdb/pkg-descr b/www/hs-yesod-auth-hashdb/pkg-descr
new file mode 100644
index 00000000000..58018f786a7
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/pkg-descr
@@ -0,0 +1,5 @@
+This package is the Yesod.Auth.HashDB plugin, originally included in
+yesod-auth, but now modified to be more secure and placed in a separate
+package.
+
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 28581ed1990..c23133822c4 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,13 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
-USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
- blaze-markup>=0.5.1 data-default email-validate>=1.0 \
- file-embed hamlet>=1.1 http-conduit>=1.5 http-types \
- lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.2 \
- persistent-template>=1.2 pureMD5>=2.0 pwstore-fast>=2.2 \
- random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
- shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
+USE_CABAL= aeson>=0.5 authenticate>=1.3 base16-bytestring \
+ base64-bytestring blaze-builder blaze-html>=0.5 \
+ blaze-markup>=0.5.1 byteable conduit conduit-extra cryptohash \
+ data-default email-validate>=1.0 file-embed http-client \
+ http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \
+ network persistent>=1.2 persistent-template>=1.2 \
+ random>=1.0.0.2 resourcet safe shakespeare text>=0.7 \
unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \
yesod-persistent>=1.2
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index c07f593a517..1418abc5cc9 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.2.0.tar.gz) = 0740b3fc8825ca9d97ae3589cb86ff9d81e87c1703f8d2341fd45b9ed728b7aa
-SIZE (cabal/yesod-auth-1.2.0.tar.gz) = 26852
+SHA256 (cabal/yesod-auth-1.3.4.tar.gz) = 1ee00d9afefb3fd225e5163f689561ebf8d9a1862eb04a72a2dcb89574b61c8d
+SIZE (cabal/yesod-auth-1.3.4.tar.gz) = 36720
diff --git a/www/hs-yesod-auth/files/patch-yesod-auth.cabal b/www/hs-yesod-auth/files/patch-yesod-auth.cabal
new file mode 100644
index 00000000000..4a117f77df8
--- /dev/null
+++ b/www/hs-yesod-auth/files/patch-yesod-auth.cabal
@@ -0,0 +1,21 @@
+--- ./yesod-auth.cabal.orig 2014-06-05 07:12:31.000000000 +0200
++++ ./yesod-auth.cabal 2014-07-13 02:34:37.000000000 +0200
+@@ -33,10 +33,7 @@
+ , text >= 0.7
+ , mime-mail >= 0.3
+ , yesod-persistent >= 1.2
+- , hamlet >= 1.1
+ , shakespeare
+- , shakespeare-css >= 1.0
+- , shakespeare-js >= 1.0.2
+ , containers
+ , unordered-containers
+ , yesod-form >= 1.3 && < 1.4
+@@ -63,7 +60,6 @@
+ , blaze-builder
+ , conduit
+ , conduit-extra
+- , attoparsec-conduit
+
+ exposed-modules: Yesod.Auth
+ Yesod.Auth.BrowserId
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
new file mode 100644
index 00000000000..19d98b79123
--- /dev/null
+++ b/www/hs-yesod-bin/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME= yesod-bin
+PORTVERSION= 1.2.12.3
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Yesod helper executable
+
+LICENSE= MIT
+
+USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \
+ conduit>=0.5 conduit-extra data-default-class file-embed \
+ fsnotify>=0.0 ghc-paths>=0.1 http-conduit \
+ http-reverse-proxy>=0.1.1 http-types>=0.7 lifted-base \
+ network optparse-applicative>=0.5 parsec>=2.1 \
+ project-template>=0.1.1 resourcet>=0.3 shakespeare>=1.0.2 \
+ split>=0.2 streaming-commons system-fileio>=0.3 \
+ system-filepath>=0.4 tar>=0.4 text>=0.11 unix-compat>=0.2 \
+ unordered-containers wai>=1.4 wai-extra warp>=1.3.7.5 \
+ yaml>=0.8 zlib>=0.5
+
+EXECUTABLE= yesod-ghc-wrapper yesod-ld-wrapper yesod-ar-wrapper yesod
+STANDALONE= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo
new file mode 100644
index 00000000000..106a58bb071
--- /dev/null
+++ b/www/hs-yesod-bin/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/yesod-bin-1.2.12.3.tar.gz) = fdbb49b6300fc933532097e81b1b4bc13aa30f5910ae58a376e414412be7a75e
+SIZE (cabal/yesod-bin-1.2.12.3.tar.gz) = 366916
diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
new file mode 100644
index 00000000000..9275385a07a
--- /dev/null
+++ b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
@@ -0,0 +1,21 @@
+--- ./yesod-bin.cabal.orig 2014-06-18 07:02:50.000000000 +0200
++++ ./yesod-bin.cabal 2014-07-13 02:02:06.000000000 +0200
+@@ -52,10 +52,6 @@
+ , parsec >= 2.1 && < 4
+ , text >= 0.11
+ , shakespeare
+- , shakespeare-text >= 1.0
+- , shakespeare >= 1.0.2 && < 2.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0.2
+ , bytestring >= 0.9.1.4
+ , time >= 1.1.4
+ , template-haskell
+@@ -86,7 +82,6 @@
+ , http-reverse-proxy >= 0.1.1
+ , network
+ , http-conduit
+- , network-conduit
+ , project-template >= 0.1.1
+ , transformers
+ , warp >= 1.3.7.5
diff --git a/www/hs-yesod-bin/pkg-descr b/www/hs-yesod-bin/pkg-descr
new file mode 100644
index 00000000000..3e72c5005a0
--- /dev/null
+++ b/www/hs-yesod-bin/pkg-descr
@@ -0,0 +1,3 @@
+Provides scaffolding, devel server, and some simple code generation helpers.
+
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 4a42203c2a1..66cee0c476a 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.2.0.4
-PORTREVISION= 4
+PORTVERSION= 1.2.19
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +9,15 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson>=0.5 attoparsec-conduit 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 conduit>=0.5 cookie>=0.4 \
- data-default failure>=0.2 fast-logger>=0.2 hamlet>=1.1 \
- http-types>=0.7 lifted-base>=0.1 monad-control>=0.3 \
- monad-logger>=0.3.1 parsec>=2 path-pieces>=0.1.2 \
- random>=1.0.0.2 resourcet>=0.4.6 safe shakespeare>=1.0 \
- shakespeare-css>=1.0 shakespeare-i18n>=1.0 shakespeare-js>=1.0.2 \
- text>=0.7 transformers>=0.2.2 transformers-base>=0.4 \
- vector>=0.9 wai>=1.4 wai-extra>=1.3 warp>=1.3.8 \
+USE_CABAL= aeson>=0.5 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 conduit>=1.0.11 conduit-extra \
+ cookie>=0.4.1 data-default exceptions fast-logger>=0.2 \
+ http-types>=0.7 lifted-base>=0.1.2 monad-control>=0.3 \
+ monad-logger>=0.3.1 mtl parsec>=2 path-pieces>=0.1.2 \
+ random>=1.0.0.2 resourcet>=0.4.9 safe shakespeare>=1.0 \
+ text>=0.7 transformers-base>=0.4 unix-compat vector>=0.9 \
+ wai>=1.4 wai-extra>=1.3 wai-logger>=0.2 warp>=1.3.8 \
yesod-routes>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 551574a78b8..bd6bedf8a0f 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.2.0.4.tar.gz) = b45c7a827472ea30b48e42687f6287df3cc8d43882fed6a35cc796224d455d25
-SIZE (cabal/yesod-core-1.2.0.4.tar.gz) = 54637
+SHA256 (cabal/yesod-core-1.2.19.tar.gz) = 3422d2042af60ed5bf71fdb71934b289e69a35d6cbe3adc7561e877c3f7a9b36
+SIZE (cabal/yesod-core-1.2.19.tar.gz) = 62546
diff --git a/www/hs-yesod-core/files/patch-yesod-core.cabal b/www/hs-yesod-core/files/patch-yesod-core.cabal
new file mode 100644
index 00000000000..c27fac059fb
--- /dev/null
+++ b/www/hs-yesod-core/files/patch-yesod-core.cabal
@@ -0,0 +1,40 @@
+--- ./yesod-core.cabal.orig 2014-06-09 09:45:07.000000000 +0200
++++ ./yesod-core.cabal 2014-07-13 01:09:02.000000000 +0200
+@@ -32,11 +32,7 @@
+ , text >= 0.7
+ , template-haskell
+ , path-pieces >= 0.1.2 && < 0.2
+- , hamlet >= 1.1
+ , shakespeare >= 1.0 && < 2.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0
+- , shakespeare-i18n >= 1.0
+ , blaze-builder >= 0.2.1.4 && < 0.4
+ , transformers >= 0.2.2
+ , mtl
+@@ -60,7 +56,6 @@
+ , conduit >= 1.0.11
+ , resourcet >= 0.4.9 && < 1.2
+ , lifted-base >= 0.1.2
+- , attoparsec-conduit
+ , blaze-html >= 0.5
+ , blaze-markup >= 0.5.1
+ , data-default
+@@ -111,9 +106,6 @@
+ ,wai
+ ,yesod-core
+ ,bytestring
+- ,hamlet
+- ,shakespeare-css
+- ,shakespeare-js
+ ,text
+ ,http-types
+ , random
+@@ -142,7 +134,6 @@
+ , criterion
+ , bytestring
+ , text
+- , hamlet
+ , transformers
+ , yesod-core
+ , blaze-html
diff --git a/www/hs-yesod-core/pkg-descr b/www/hs-yesod-core/pkg-descr
index b243d4c6a8e..16a53f5f3e7 100644
--- a/www/hs-yesod-core/pkg-descr
+++ b/www/hs-yesod-core/pkg-descr
@@ -1,5 +1,5 @@
Yesod is a framework designed to foster creation of RESTful web
-application that have strong compile-time guarantees of correctness. It
+application that have strong compile-time guarantees of correctness. It
also affords space efficient code and portability to many deployment
backends, from CGI to stand-alone serving.
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index f606df7527f..ae17e260a7f 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTVERSION= 1.3.14
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,11 +10,10 @@ COMMENT= Form handling support for Yesod Web Framework
LICENSE= MIT
USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 crypto-api>=0.8 data-default \
- email-validate>=1.0 hamlet>=1.1 network>=2.2 persistent>=1.2 \
- resourcet shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
- text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
- yesod-core>=1.2 yesod-persistent>=1.2
+ blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \
+ network>=2.2 persistent>=1.2 resourcet shakespeare text>=0.9 \
+ wai>=1.3 xss-sanitize>=0.3.0.1 yesod-core>=1.2 \
+ yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 7a77230b936..08fdcc5c980 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.3.0.tar.gz) = cc9a11a07d182656dd59fd4b63a10587b577c238e2a8cd2a891e0c1e0c4ce2f8
-SIZE (cabal/yesod-form-1.3.0.tar.gz) = 18892
+SHA256 (cabal/yesod-form-1.3.14.tar.gz) = 509f3c230fb33a4ddfab8f00392439248ea1acc413d18a3f221eb863b2a25d28
+SIZE (cabal/yesod-form-1.3.14.tar.gz) = 24300
diff --git a/www/hs-yesod-form/files/patch-yesod-form.cabal b/www/hs-yesod-form/files/patch-yesod-form.cabal
new file mode 100644
index 00000000000..5f7ff91d1c1
--- /dev/null
+++ b/www/hs-yesod-form/files/patch-yesod-form.cabal
@@ -0,0 +1,13 @@
+--- ./yesod-form.cabal.orig 2014-06-09 09:46:28.000000000 +0200
++++ ./yesod-form.cabal 2014-07-13 02:03:44.000000000 +0200
+@@ -17,10 +17,7 @@
+ , yesod-core >= 1.2 && < 1.3
+ , yesod-persistent >= 1.2 && < 1.3
+ , time >= 1.1.4
+- , hamlet >= 1.1.8
+ , shakespeare
+- , shakespeare-css >= 1.0
+- , shakespeare-js >= 1.0.2
+ , persistent >= 1.2 && < 1.4
+ , template-haskell
+ , transformers >= 0.2.2
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index c9381b7ab31..16f5a68b66f 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= blaze-builder conduit lifted-base persistent>=1.2 \
- persistent-template>=1.2 pool-conduit resourcet \
- transformers>=0.2.2 yesod-core>=1.2
+USE_CABAL= blaze-builder conduit persistent>=1.2 persistent-template>=1.2 \
+ resource-pool resourcet>=0.4.5 yesod-core>=1.2.2
.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 012fce1e320..a566e7408d0 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.2.0.tar.gz) = 1334f48f1386003699a08f4e24505c633e89519874c351750958745b85d1ffbf
-SIZE (cabal/yesod-persistent-1.2.0.tar.gz) = 3926
+SHA256 (cabal/yesod-persistent-1.2.3.tar.gz) = fc3627ff021573cb92403b667e20ebb6194b227f30a189019d288be1cdbfbacd
+SIZE (cabal/yesod-persistent-1.2.3.tar.gz) = 4169
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index 953998759fe..f0167597d96 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.2.0.1
+PORTVERSION= 1.2.13
# Please note that the port *strictly depends* on certain versions of other
# ports, so revisit the USE_CABAL line on bumping the portrevision. Thanks!
-PORTREVISION= 4
+PORTREVISION= 0
+
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,130 +13,128 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.1.0_6 \
- ansi-terminal==0.6_5 \
- asn1-data==0.7.1_6 \
- asn1-types==0.1.3_4 \
- attoparsec==0.10.4.0_5 \
- attoparsec-conduit==1.0.1_4 \
- authenticate==1.3.2.6_5 \
- base-unicode-symbols==0.2.2.4_6 \
- base64-bytestring==1.0.0.1_5 \
- blaze-builder==0.3.1.1_4 \
- blaze-builder-conduit==1.0.0_5 \
- blaze-html==0.6.1.1_4 \
- blaze-markup==0.5.1.5_4 \
- byteorder==1.0.4_4 \
- case-insensitive==1.0.0.2_4 \
- cereal==0.3.5.2_7 \
- certificate==1.3.7_4 \
- cipher-aes==0.1.8_4 \
- cipher-rc4==0.1.2_5 \
- clientsession==0.9_4 \
- conduit==1.0.5_4 \
- cookie==0.4.0.1_6 \
- cprng-aes==0.3.4_6 \
- crypto-api==0.12.1_4 \
- crypto-conduit==0.5.2_4 \
- crypto-numbers==0.1.3_5 \
- crypto-pubkey==0.1.3_4 \
- crypto-pubkey-types==0.3.2_4 \
- crypto-random-api==0.2.0_5 \
- cryptohash==0.9.0_4 \
- css-text==0.1.1_10 \
- data-default==0.5.3_4 \
- data-default-class==0.0.1_4 \
- data-default-instances-base==0.0.1_4 \
- data-default-instances-containers==0.0.1_4 \
- data-default-instances-dlist==0.0.1_4 \
- data-default-instances-old-locale==0.0.1_4 \
- date-cache==0.3.0_6 \
- dlist==0.5_13 \
- email-validate==1.0.0_5 \
- entropy==0.2.1_9 \
- failure==0.2.0.1_8 \
- fast-logger==0.3.1_7 \
- file-embed==0.0.4.7_5 \
- filesystem-conduit==1.0.0_5 \
- hamlet==1.1.7.1_4 \
- hashable==1.1.2.5_4,1 \
- hjsmin==0.1.4.1_5 \
- hspec==1.5.4_4 \
- hspec-expectations==0.3.2_4 \
- html-conduit==1.1.0_5 \
- http-conduit==1.9.3_4 \
- http-date==0.0.4_6 \
- http-types==0.8.0_5 \
- language-javascript==0.5.7_6 \
- lifted-base==0.2.0.5_4 \
- mime-mail==0.4.1.2_7 \
- mime-types==0.1.0.3_5 \
- mmorph==1.0.0_4 \
- monad-control==0.3.2.1_4 \
- monad-logger==0.3.1.1_4 \
- network-conduit==1.0.0_5 \
- path-pieces==0.1.2_6 \
- pem==0.1.2_6 \
- persistent==1.2.0.1_4 \
- persistent-template==1.2.0_4 \
- pool-conduit==0.1.2_4 \
- primitive==0.5.0.1_6 \
- publicsuffixlist==0.1_4 \
- pureMD5==2.1.2.1_7 \
- pwstore-fast==2.3_7 \
- quickcheck-io==0.1.0_4 \
- resource-pool==0.2.1.1_6 \
- resourcet==0.4.7.1_4 \
- safe==0.3.3_9 \
- semigroups==0.9.1_4 \
- setenv==0.1.0_6 \
- SHA==1.6.1_6 \
- shakespeare==1.0.5_4 \
- shakespeare-css==1.0.5.1_4 \
- shakespeare-i18n==1.0.0.2_9 \
- shakespeare-js==1.1.4_4 \
- shakespeare-text==1.0.0.5_7 \
- silently==1.2.4.1_5 \
- simple-sendfile==0.2.11_5 \
- skein==1.0.3_4 \
- socks==0.5.1_4 \
- stringsearch==0.3.6.4_6 \
- system-fileio==0.3.11_5 \
- system-filepath==0.4.7_6 \
- tagged==0.6_4 \
- tagsoup==0.12.8_6 \
- tagstream-conduit==0.5.4_5 \
- tls==1.1.2_5 \
- tls-extra==0.6.1_6 \
- transformers-base==0.4.1_9 \
- unix-compat==0.4.1.1_4 \
- unordered-containers==0.2.3.1_4 \
- utf8-light==0.4.0.1_8 \
- utf8-string==0.3.7_9 \
- vault==0.2.0.4_5 \
- vector==0.10.0.1_6 \
- void==0.6_4 \
- wai==1.4.0_5 \
- wai-app-static==1.3.1.2_5 \
- wai-extra==1.3.4_4 \
- wai-logger==0.3.0_7 \
- wai-test==1.3.1_4 \
- warp==1.3.8.1_4 \
- word8==0.0.3_5 \
- xml-conduit==1.1.0.3_5 \
- xml-types==0.3.3_6 \
- xss-sanitize==0.3.3_6 \
- yaml==0.8.2.4_4 \
- yesod==1.2.0.1_4 \
- yesod-auth==1.2.0_4 \
- yesod-core==1.2.0.4_4 \
- yesod-form==1.3.0_4 \
- yesod-persistent==1.2.0_4 \
- yesod-routes==1.2.0_4 \
- yesod-static==1.2.0_4 \
- yesod-test==1.2.0_4 \
- zlib-bindings==0.1.1.3_5 \
- zlib-conduit==1.0.0_5
+USE_CABAL= ansi-terminal==0.6.1.1 \
+ ansi-wl-pprint==0.6.7.1 \
+ asn1-encoding==0.8.1.3 \
+ asn1-parse==0.8.1 \
+ asn1-types==0.2.3 \
+ authenticate==1.3.2.9 \
+ auto-update==0.1.0.0 \
+ base16-bytestring==0.1.1.6 \
+ base64-bytestring==1.0.0.1_6 \
+ blaze-builder==0.3.3.2 \
+ blaze-html==0.7.0.2 \
+ blaze-markup==0.6.1.0 \
+ byteable==0.1.1 \
+ byteorder==1.0.4_5 \
+ cereal==0.4.0.1 \
+ cipher-aes==0.2.8 \
+ cipher-des==0.0.6 \
+ cipher-rc4==0.1.4 \
+ clientsession==0.9.0.3 \
+ conduit==1.1.7 \
+ conduit-extra==1.1.3 \
+ connection==0.2.3 \
+ cookie==0.4.1.2 \
+ cprng-aes==0.5.2 \
+ crypto-api==0.13 \
+ crypto-cipher-types==0.0.9 \
+ crypto-numbers==0.2.3 \
+ crypto-pubkey==0.2.4 \
+ crypto-pubkey-types==0.4.2.2 \
+ crypto-random==0.0.7 \
+ cryptohash==0.11.6 \
+ cryptohash-conduit==0.1.1 \
+ css-text==0.1.2.1 \
+ data-default==0.5.3_5 \
+ data-default-class==0.0.1_5 \
+ data-default-instances-base==0.0.1_5 \
+ data-default-instances-containers==0.0.1_5 \
+ data-default-instances-dlist==0.0.1_5 \
+ data-default-instances-old-locale==0.0.1_5 \
+ dlist==0.7.1 \
+ email-validate==2.0.1 \
+ entropy==0.3.2 \
+ esqueleto==1.4.4 \
+ exceptions==0.6.1 \
+ fast-logger==2.2.0 \
+ file-embed==0.0.7 \
+ hjsmin==0.1.4.7 \
+ hspec==1.11.0 \
+ hspec-expectations==0.6.0.1 \
+ html-conduit==1.1.0.5 \
+ http-client==0.3.6.1 \
+ http-client-tls==0.2.2 \
+ http-conduit==2.1.4 \
+ http-date==0.0.4_7 \
+ http-reverse-proxy==0.4.0.1 \
+ http-types==0.8.5 \
+ language-javascript==0.5.13 \
+ lifted-base==0.2.3.0 \
+ mime-mail==0.4.5.2 \
+ mime-types==0.1.0.4 \
+ mmorph==1.0.3 \
+ monad-control==0.3.3.0 \
+ monad-logger==0.3.7.1 \
+ monad-loops==0.4.2.1 \
+ nats==0.2 \
+ optparse-applicative==0.9.1.1 \
+ path-pieces==0.1.4 \
+ pem==0.2.2 \
+ persistent==1.3.1.1 \
+ persistent-template==1.3.1.4 \
+ publicsuffixlist==0.1_5 \
+ pwstore-fast==2.4.1 \
+ quickcheck-io==0.1.1 \
+ resource-pool==0.2.3.0 \
+ resourcet==1.1.2.3 \
+ safe==0.3.7 \
+ securemem==0.1.3 \
+ semigroups==0.15.2 \
+ setenv==0.1.1.1 \
+ SHA==1.6.4.1 \
+ shakespeare==2.0.1.1 \
+ silently==1.2.4.1_6 \
+ simple-sendfile==0.2.15 \
+ skein==1.0.9 \
+ socks==0.5.4 \
+ stm-chans==3.0.0.2 \
+ streaming-commons==0.1.4.1 \
+ stringsearch==0.3.6.5 \
+ system-fileio==0.3.14 \
+ system-filepath==0.4.12 \
+ tagged==0.7.2 \
+ tagsoup==0.13.1 \
+ tagstream-conduit==0.5.5.1 \
+ tf-random==0.5 \
+ tls==1.2.8 \
+ transformers-base==0.4.2 \
+ utf8-string==0.3.8 \
+ void==0.6.1 \
+ wai==3.0.1.1 \
+ wai-app-static==3.0.0 \
+ wai-extra==3.0.1.2 \
+ wai-logger==2.2.0 \
+ warp==3.0.0.5 \
+ warp-tls==3.0.0 \
+ word8==0.1.1 \
+ x509==1.4.11 \
+ x509-store==1.4.4 \
+ x509-system==1.4.5 \
+ x509-validation==1.5.0 \
+ xml-conduit==1.2.1 \
+ xml-types==0.3.4 \
+ xss-sanitize==0.3.5.2 \
+ yaml==0.8.8.4 \
+ yesod==1.2.6.1 \
+ yesod-auth==1.3.4 \
+ yesod-auth-hashdb==1.3.0.1 \
+ yesod-core==1.2.19 \
+ yesod-form==1.3.14 \
+ yesod-persistent==1.2.3 \
+ yesod-routes==1.2.0.7 \
+ yesod-static==1.2.4 \
+ yesod-test==1.2.3.2 \
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index da99efc3d3c..8d4be8693a7 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.2.0.1.tar.gz) = 253ce16ed96383f11959f3b345a211999c93fc86ff5b777cede88756fa44ce41
-SIZE (cabal/yesod-platform-1.2.0.1.tar.gz) = 2583
+SHA256 (cabal/yesod-platform-1.2.13.tar.gz) = 547e18f9a4e64ac16ae77ed3975898203cf915c9c280c1c30dcc3a286858e854
+SIZE (cabal/yesod-platform-1.2.13.tar.gz) = 2671
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
index 33a0aebc30b..14696b1716a 100644
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -1,11 +1,51 @@
---- ./yesod-platform.cabal.orig 2013-04-25 08:09:38.000000000 +0200
-+++ ./yesod-platform.cabal 2013-05-03 19:11:59.000000000 +0200
-@@ -67,7 +67,7 @@
- , fsnotify == 0.0.11
- , ghc-paths == 0.1.0.9
- , hamlet == 1.1.7.1
-- , hashable == 1.2.0.7
-+ , hashable == 1.1.2.5
- , hjsmin == 0.1.4.1
- , hspec == 1.5.3
- , hspec-expectations == 0.3.2
+--- ./yesod-platform.cabal.orig 2014-08-05 20:57:15.000000000 +0100
++++ ./yesod-platform.cabal 2014-08-10 03:02:38.000000000 +0100
+@@ -20,13 +20,11 @@
+ , asn1-encoding == 0.8.1.3
+ , asn1-parse == 0.8.1
+ , asn1-types == 0.2.3
+- , attoparsec-conduit == 1.1.0
+ , authenticate == 1.3.2.9
+ , auto-update == 0.1.0.0
+ , base16-bytestring == 0.1.1.6
+ , base64-bytestring == 1.0.0.1
+ , blaze-builder == 0.3.3.2
+- , blaze-builder-conduit == 1.1.0
+ , blaze-html == 0.7.0.2
+ , blaze-markup == 0.6.1.0
+ , byteable == 0.1.1
+@@ -63,7 +61,6 @@
+ , exceptions == 0.6.1
+ , fast-logger == 2.2.0
+ , file-embed == 0.0.7
+- , hamlet == 1.2.0
+ , hjsmin == 0.1.4.7
+ , hspec == 1.11.0
+ , hspec-expectations == 0.6.0.1
+@@ -83,7 +80,6 @@
+ , monad-logger == 0.3.7.1
+ , monad-loops == 0.4.2.1
+ , nats == 0.2
+- , network-conduit == 1.1.0
+ , optparse-applicative == 0.9.1.1
+ , path-pieces == 0.1.4
+ , pem == 0.2.2
+@@ -99,10 +95,6 @@
+ , semigroups == 0.15.2
+ , setenv == 0.1.1.1
+ , shakespeare == 2.0.1.1
+- , shakespeare-css == 1.1.0
+- , shakespeare-i18n == 1.1.0
+- , shakespeare-js == 1.3.0
+- , shakespeare-text == 1.1.0
+ , silently == 1.2.4.1
+ , simple-sendfile == 0.2.15
+ , skein == 1.0.9
+@@ -124,7 +116,6 @@
+ , wai-app-static == 3.0.0
+ , wai-extra == 3.0.1.2
+ , wai-logger == 2.2.0
+- , wai-test == 3.0.0
+ , warp == 3.0.0.5
+ , warp-tls == 3.0.0
+ , word8 == 0.1.1
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index ac9af6b3bf2..db24bc76371 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-routes
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.0.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index 54b19c75d08..97861b1d107 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.2.0.tar.gz) = 62c5aa9a212a467c5918e250247c2801efa1b56cfcaaf1f1e108d02ccd06ffb4
-SIZE (cabal/yesod-routes-1.2.0.tar.gz) = 20175
+SHA256 (cabal/yesod-routes-1.2.0.7.tar.gz) = d25cd11aef62bb11ea630f758b86f20019dfa1355d36b71bc0b657b8b4b72202
+SIZE (cabal/yesod-routes-1.2.0.7.tar.gz) = 21387
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index ad27340e9a9..a57fa250c45 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,14 @@ COMMENT= Static file serving subsite for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \
- crypto-conduit>=0.4 cryptohash>=0.6.1 data-default \
- file-embed>=0.0.4.1 http-types>=0.7 shakespeare-css>=1.0.3 \
- system-fileio>=0.3 system-filepath>=0.4.6 text>=0.9 \
- transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \
- wai-app-static>=1.3 yesod-core>=1.2
+USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \
+ blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \
+ cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \
+ data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \
+ http-types>=0.7 mime-types>=0.1 resourcet>=0.4 \
+ shakespeare>=2.0 system-fileio>=0.3 system-filepath>=0.4.6 \
+ text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 \
+ wai>=1.3 wai-app-static>=1.3.2 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index 980979c2e51..5d5f582e045 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.2.0.tar.gz) = 5f72dfc5c72de6eac00b4e7f82aac185eeba2aa5bbed0872a9507f8c26bcd3a1
-SIZE (cabal/yesod-static-1.2.0.tar.gz) = 8505
+SHA256 (cabal/yesod-static-1.2.4.tar.gz) = 3f180018dee2e3dd8c306bebdedfd67a8160e8836adc097765a7c95765f8ab64
+SIZE (cabal/yesod-static-1.2.4.tar.gz) = 25099
diff --git a/www/hs-yesod-static/files/patch-yesod-static.cabal b/www/hs-yesod-static/files/patch-yesod-static.cabal
new file mode 100644
index 00000000000..85d1c2f30ae
--- /dev/null
+++ b/www/hs-yesod-static/files/patch-yesod-static.cabal
@@ -0,0 +1,18 @@
+--- ./yesod-static.cabal.orig 2014-06-09 09:45:32.000000000 +0200
++++ ./yesod-static.cabal 2014-07-13 02:04:58.000000000 +0200
+@@ -47,7 +47,6 @@
+ , system-filepath >= 0.4.6 && < 0.5
+ , system-fileio >= 0.3
+ , data-default
+- , shakespeare-css >= 1.0.3
+ , mime-types >= 0.1
+ , hjsmin
+ , filepath >= 1.3
+@@ -107,7 +106,6 @@
+ , system-filepath
+ , system-fileio
+ , data-default
+- , shakespeare-css
+ , mime-types
+ , hjsmin
+ , filepath
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index 69fa68058e7..c1e11857516 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,9 +12,8 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cookie hspec>=1.4 \
html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \
- network>=2.2 persistent>=1.0 pool-conduit text \
- transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \
- xml-types>=0.3 yesod-core>=1.2
+ network>=2.2 persistent>=1.0 text wai>=1.3 wai-extra \
+ xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index b0921e9d0b9..281c8b35f86 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-1.2.0.tar.gz) = 7894450772e93995bb156ffaba53024669d6f644dad0603d8b024b612e7490a0
-SIZE (cabal/yesod-test-1.2.0.tar.gz) = 11914
+SHA256 (cabal/yesod-test-1.2.3.2.tar.gz) = a9ebab87f5633bb6979d5714703b8448f1fb6d6278cf37c3d1122d9136a80716
+SIZE (cabal/yesod-test-1.2.3.2.tar.gz) = 13269
diff --git a/www/hs-yesod-test/files/patch-yesod-test.cabal b/www/hs-yesod-test/files/patch-yesod-test.cabal
new file mode 100644
index 00000000000..0d0492cc775
--- /dev/null
+++ b/www/hs-yesod-test/files/patch-yesod-test.cabal
@@ -0,0 +1,10 @@
+--- ./yesod-test.cabal.orig 2014-06-09 09:47:25.000000000 +0200
++++ ./yesod-test.cabal 2014-07-13 02:06:10.000000000 +0200
+@@ -19,7 +19,6 @@
+ , persistent >= 1.0
+ , transformers >= 0.2.2
+ , wai >= 1.3
+- , wai-test >= 1.3
+ , wai-extra
+ , network >= 2.2
+ , http-types >= 0.7
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index b9a9a7b08e0..de8876a177f 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.2.0.1
-PORTREVISION= 4
+PORTVERSION= 1.2.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,11 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 data-default \
- hamlet>=1.1 monad-control>=0.3 network-conduit safe \
- shakespeare-css>=1.0 shakespeare-js>=1.0.2 text \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 yesod-core>=1.2 \
- yesod-form>=1.3 yesod-persistent>=1.2
+USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \
+ data-default fast-logger monad-control>=0.3 monad-logger \
+ safe shakespeare>=2.0 text unordered-containers wai>=1.3 \
+ wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 \
+ yesod-core>=1.2.2 yesod-form>=1.3 yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index e02b4ba9d92..03a4bb5008e 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.2.0.1.tar.gz) = a32a88bd9cd2fcda76965c66457241acc25a652e8eb9b58d144afa5929e013f2
-SIZE (cabal/yesod-1.2.0.1.tar.gz) = 7652
+SHA256 (cabal/yesod-1.2.6.1.tar.gz) = a2c624171e86f4c56f55634d02e72ea911147e1e40d3c322254cc72ed9ba38f6
+SIZE (cabal/yesod-1.2.6.1.tar.gz) = 7846
diff --git a/www/hs-yesod/files/patch-yesod.cabal b/www/hs-yesod/files/patch-yesod.cabal
new file mode 100644
index 00000000000..bbd9afdfa00
--- /dev/null
+++ b/www/hs-yesod/files/patch-yesod.cabal
@@ -0,0 +1,19 @@
+--- ./yesod.cabal.orig 2014-06-09 09:48:13.000000000 +0200
++++ ./yesod.cabal 2014-07-13 03:05:49.000000000 +0200
+@@ -30,16 +30,12 @@
+ , transformers >= 0.2.2
+ , wai >= 1.3
+ , wai-extra >= 1.3
+- , hamlet >= 1.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0
+ , warp >= 1.3
+ , blaze-html >= 0.5
+ , blaze-markup >= 0.5.1
+ , aeson
+ , safe
+ , data-default
+- , network-conduit
+ , unordered-containers
+ , yaml
+ , text
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index eb84f299b84..cdffa17aaa6 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= GLURaw
-PORTVERSION= 1.3.0.0
-PORTREVISION= 4
+PORTVERSION= 1.4.0.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Raw binding for the OpenGL graphics system
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= OpenGLRaw>=1.3
+USE_CABAL= OpenGLRaw>=1.3.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo
index 9b072353f7e..4425dd221aa 100644
--- a/x11-toolkits/hs-GLURaw/distinfo
+++ b/x11-toolkits/hs-GLURaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/GLURaw-1.3.0.0.tar.gz) = e03905710043eb2e9878e5fc75f969c4f120321bc6a7709cde3a9890be3c08ea
-SIZE (cabal/GLURaw-1.3.0.0.tar.gz) = 7779
+SHA256 (cabal/GLURaw-1.4.0.1.tar.gz) = 9655644beb54ff8fac68f2e0fd8a8e9a1e8409272e2e4c963ccce9bcd60e0ecc
+SIZE (cabal/GLURaw-1.4.0.1.tar.gz) = 8445
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index a59785ea00b..89cd69cf91e 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= GLUT
-PORTVERSION= 2.4.0.0
-PORTREVISION= 5
+PORTVERSION= 2.5.1.1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell binding for the OpenGL Utility Toolkit
+COMMENT= Binding for the OpenGL Utility Toolkit
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= OpenGL>=2.8 OpenGLRaw>=1.3
+USE_CABAL= OpenGL>=2.8.0.0 OpenGLRaw>=1.3.0.0
USE_GL= glut
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index 976142b5547..802a7539d53 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/GLUT-2.4.0.0.tar.gz) = 100df2d724dfad26b0c8d47b17d4cef9dcbc12a75cce7a096046c27485b4cbbc
-SIZE (cabal/GLUT-2.4.0.0.tar.gz) = 643788
+SHA256 (cabal/GLUT-2.5.1.1.tar.gz) = 4a8177e154ead5a7bcc110f8fe408f9cf720783dde024ac1936cd95b659b2d59
+SIZE (cabal/GLUT-2.5.1.1.tar.gz) = 655292
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 6c0e69362b2..1a0e977c2fe 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 2.8.0.0
-PORTREVISION= 4
+PORTVERSION= 2.9.2.0
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding for the OpenGL graphics system
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= GLURaw>=1.1.0.0 OpenGLRaw>=1.3.0.0
+USE_CABAL= GLURaw>=1.3.0.0 OpenGLRaw>=1.4.1.0 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index f241d0a4385..a5b42d42f71 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenGL-2.8.0.0.tar.gz) = ce753d8db75b5096e030422765193c4975779b42bfffa467408a40d8c43965f1
-SIZE (cabal/OpenGL-2.8.0.0.tar.gz) = 123107
+SHA256 (cabal/OpenGL-2.9.2.0.tar.gz) = 1758f6cacc9ea8f0d410fd0abc1a19f2a50dffdb62736d66d4e62b20619545e9
+SIZE (cabal/OpenGL-2.9.2.0.tar.gz) = 122514
diff --git a/x11-toolkits/hs-OpenGL/pkg-descr b/x11-toolkits/hs-OpenGL/pkg-descr
index 6ae7c4bb7d3..dfe00572bbc 100644
--- a/x11-toolkits/hs-OpenGL/pkg-descr
+++ b/x11-toolkits/hs-OpenGL/pkg-descr
@@ -1,4 +1,4 @@
-A Haskell binding for the OpenGL graphics system (GL, version 2.1) and
+A Haskell binding for the OpenGL graphics system (GL, version 3.2) and
its accompanying utility library (GLU, version 1.3).
OpenGL is the industry's most widely used and supported 2D and 3D
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index 9877f41667b..e8fd726580e 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= OpenGLRaw
-PORTVERSION= 1.3.0.0
-PORTREVISION= 5
+PORTVERSION= 1.5.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Raw binding for the OpenGL graphics system
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_GL= gl glut
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
index a170675a30f..071c30d4c6c 100644
--- a/x11-toolkits/hs-OpenGLRaw/distinfo
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenGLRaw-1.3.0.0.tar.gz) = 6228ca9ac967350fcb6abac25b8027660ad8599914a60ef0fd10919a6d2cd745
-SIZE (cabal/OpenGLRaw-1.3.0.0.tar.gz) = 75328
+SHA256 (cabal/OpenGLRaw-1.5.0.0.tar.gz) = 852aa5229722269d70daed3c04b95e9dc7b7013efd62ebc4f2873a81768b9a12
+SIZE (cabal/OpenGLRaw-1.5.0.0.tar.gz) = 102276
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index f3dc1ae8c22..a42b896a5f7 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.7
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Gtk+ graphical user interface library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12.0 gio>=0.12.0 glib>=0.12.0 mtl pango>=0.12.0
+USE_CABAL= cairo>=0.12.5.3 gio>=0.12.5 glib>=0.12.5.4 mtl pango>=0.12.5.3
USE_GNOME= gtk20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo
index c823f13ccb7..9d4f9f3d4f6 100644
--- a/x11-toolkits/hs-gtk/distinfo
+++ b/x11-toolkits/hs-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk-0.12.4.tar.gz) = e21ed8c3c7c0345bbaec8f1537a8605c64804e9937cef0cc9a84fce65274ce70
-SIZE (cabal/gtk-0.12.4.tar.gz) = 661848
+SHA256 (cabal/gtk-0.12.5.7.tar.gz) = 7c1c759dbbd7dec96da17e294d4d91542e731e62e41c9647394394df7a245d41
+SIZE (cabal/gtk-0.12.5.7.tar.gz) = 671695
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 84a5454f4dc..80ddf2d020f 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gtk2hs
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -13,55 +12,34 @@ COMMENT= GTK2 Binding for Haskell
METAPORT= yes
USE_CABAL= glib gio cairo pango gtk
-OPTIONS_DEFINE= GCONF GLADE GSTREAMER GTKGLEXT GTKSOURCEVIEW2 SVGCAIRO VTE WEBKIT SOEGTK
+FLAGS_DEFINE= GCONF GLADE GSTREAMER GTKGLEXT GTKSOURCEVIEW2 SVGCAIRO VTE WEBKIT SOEGTK
-GCONF_DESC= GConf2 configuration system
-GLADE_DESC= libglade UI loader
-GSTREAMER_DESC= Media codec library
-GTKGLEXT_DESC= Gtk+ OpenGL extension
-GTKSOURCEVIEW2_DESC= Source code editor
-SVGCAIRO_DESC= Cairo SVG loader
-VTE_DESC= Terminal emulator
-WEBKIT_DESC= WebKit rendering engine
-SOEGTK_DESC= Examples for Haskell SoE
+GCONF_DESC= GConf2 configuration system
+GCONF_FLAG_CABAL= gconf
-.include "../../lang/ghc/bsd.cabal.options.mk"
+GLADE_DESC= libglade UI loader
+GLADE_FLAG_CABAL= glade
-.if ${PORT_OPTIONS:MGCONF}
-USE_CABAL+= gconf
-.endif
+GSTREAMER_DESC= Media codec library
+GSTREAMER_FLAG_CABAL= gstreamer
-.if ${PORT_OPTIONS:MGLADE}
-USE_CABAL+= glade
-.endif
+GTKGLEXT_DESC= Gtk+ OpenGL extension
+GTKGLEXT_FLAG_CABAL= gtkglext
-.if ${PORT_OPTIONS:MGSTREAMER}
-USE_CABAL+= gstreamer
-.endif
+GTKSOURCEVIEW2_DESC= Source code editor
+GTKSOURCEVIEW2_FLAG_CABAL= gtksourceview2
-.if ${PORT_OPTIONS:MGTKGLEXT}
-USE_CABAL+= gtkglext
-.endif
+SVGCAIRO_DESC= Cairo SVG loader
+SVGCAIRO_FLAG_CABAL= svgcairo
-.if ${PORT_OPTIONS:MGSOURCEVIEW2}
-USE_CABAL+= gsourceview2
-.endif
+VTE_DESC= Terminal emulator
+VTE_FLAG_CABAL= vte
-.if ${PORT_OPTIONS:MSVGCAIRO}
-USE_CABAL+= svgcairo
-.endif
+WEBKIT_DESC= WebKit rendering engine
+WEBKIT_FLAG_CABAL= webkit
-.if ${PORT_OPTIONS:MVTE}
-USE_CABAL+= vte
-.endif
-
-.if ${PORT_OPTIONS:MWEBKIT}
-USE_CABAL+= webkit
-.endif
-
-.if ${PORT_OPTIONS:MSOEGTK}
-USE_CABAL+= soegtk
-.endif
+SOEGTK_DESC= Examples for Haskell SoE
+SOEGTK_FLAG_CABAL= soegtk
.include "../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-gtk2hs/pkg-descr b/x11-toolkits/hs-gtk2hs/pkg-descr
index 2374ea3a9f3..008e26d0fde 100644
--- a/x11-toolkits/hs-gtk2hs/pkg-descr
+++ b/x11-toolkits/hs-gtk2hs/pkg-descr
@@ -15,4 +15,4 @@ Gtk2Hs features:
o SourceView, an editor widget with syntax highlighting.
o the Mozilla browser rendering engine in a Gtk+ widget
-WWW: http://haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index 6e4bd4831a2..a92f7c8ac90 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtkglext
-PORTVERSION= 0.12.1
-PORTREVISION= 10
+PORTVERSION= 0.12.5.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LIB_DEPENDS= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12
+USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0 mtl pango>=0.12.5.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-gtkglext/distinfo b/x11-toolkits/hs-gtkglext/distinfo
index 52dc619f045..5f00678add5 100644
--- a/x11-toolkits/hs-gtkglext/distinfo
+++ b/x11-toolkits/hs-gtkglext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtkglext-0.12.1.tar.gz) = b8dc90ea46d898dd7583cf8456e77cbffb60f7e32005f927f5b9660b3f93c8ed
-SIZE (cabal/gtkglext-0.12.1.tar.gz) = 30992
+SHA256 (cabal/gtkglext-0.12.5.0.tar.gz) = 13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6
+SIZE (cabal/gtkglext-0.12.5.0.tar.gz) = 31884
diff --git a/x11-toolkits/hs-gtkglext/pkg-descr b/x11-toolkits/hs-gtkglext/pkg-descr
index db9a7548730..32286f74bd1 100644
--- a/x11-toolkits/hs-gtkglext/pkg-descr
+++ b/x11-toolkits/hs-gtkglext/pkg-descr
@@ -1,4 +1,4 @@
GtkGLExt provides the GDK objects to support OpenGL rendering in GTK+, and
GtkWidget API add-ons to make GTK+ widgets OpenGL-capable.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 791ba7186b0..a52afac6c65 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtksourceview2
-PORTVERSION= 0.12.3.1
-PORTREVISION= 8
+PORTVERSION= 0.12.5.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GtkSourceView library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk>=0.12 mtl
+USE_CABAL= glib>=0.12 gtk>=0.12.5.0 mtl
USE_GNOME= gtksourceview2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtksourceview2/distinfo b/x11-toolkits/hs-gtksourceview2/distinfo
index 2dd7e0f6ab1..4df78a7bdb5 100644
--- a/x11-toolkits/hs-gtksourceview2/distinfo
+++ b/x11-toolkits/hs-gtksourceview2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtksourceview2-0.12.3.1.tar.gz) = cfe2467347280c1cfaf2a977b465214f2ea90fb17c84ad0f13f9b7518e9221b1
-SIZE (cabal/gtksourceview2-0.12.3.1.tar.gz) = 55932
+SHA256 (cabal/gtksourceview2-0.12.5.0.tar.gz) = 49bbd6fe74a9a3c9e1439231f9ed244a05ec10507b7455be05465954b2d3b788
+SIZE (cabal/gtksourceview2-0.12.5.0.tar.gz) = 57462
diff --git a/x11-toolkits/hs-gtksourceview2/pkg-descr b/x11-toolkits/hs-gtksourceview2/pkg-descr
index d63e878bc9b..1ef0ceb7e6c 100644
--- a/x11-toolkits/hs-gtksourceview2/pkg-descr
+++ b/x11-toolkits/hs-gtksourceview2/pkg-descr
@@ -2,4 +2,4 @@ GtkSourceView is a text widget that extends the standard GTK+ 2.x text widget
GtkTextView. It improves GtkTextView by implementing syntax highlighting and
other features typical of a source editor.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 23d68d7a51d..b9fce3498c6 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pango
-PORTVERSION= 0.12.4
-PORTREVISION= 6
+PORTVERSION= 0.12.5.3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Pango text rendering engine
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12.0 glib>=0.12.0 mtl
+USE_CABAL= cairo>=0.12.5.3 glib>=0.12.5.3 mtl
USE_GNOME= pango
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo
index f2b37f3924e..557bf99d94d 100644
--- a/x11-toolkits/hs-pango/distinfo
+++ b/x11-toolkits/hs-pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pango-0.12.4.tar.gz) = ac6c821544546366bb7e01de85d7c56a6b6accd1af5f78b68cd4a867579d8721
-SIZE (cabal/pango-0.12.4.tar.gz) = 60049
+SHA256 (cabal/pango-0.12.5.3.tar.gz) = 2a1d6f647298270e816275d5f5c42f16fcd12ddf8afc55e3fe2b6309febdc4d8
+SIZE (cabal/pango-0.12.5.3.tar.gz) = 60968
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index c39de099e93..289449b458c 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vte
-PORTVERSION= 0.12.1
-PORTREVISION= 10
+PORTVERSION= 0.12.5.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the VTE library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12
+USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0 mtl pango>=0.12.5.0
USE_GNOME= vte
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-vte/distinfo b/x11-toolkits/hs-vte/distinfo
index 0f6dce1a34e..bda72606123 100644
--- a/x11-toolkits/hs-vte/distinfo
+++ b/x11-toolkits/hs-vte/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vte-0.12.1.tar.gz) = 745af86a3cf5b6e501dd6b3bec4680422a214e8cbc77989d347d061334cc2ffd
-SIZE (cabal/vte-0.12.1.tar.gz) = 41120
+SHA256 (cabal/vte-0.12.5.0.tar.gz) = 7a49dc54b7b69bf920c7269c5e29e34adfe531a4e7dcd37e5f3d4616033cc03e
+SIZE (cabal/vte-0.12.5.0.tar.gz) = 41210
diff --git a/x11-toolkits/hs-vte/pkg-descr b/x11-toolkits/hs-vte/pkg-descr
index 3f2a0d6d768..f075178ba4a 100644
--- a/x11-toolkits/hs-vte/pkg-descr
+++ b/x11-toolkits/hs-vte/pkg-descr
@@ -3,4 +3,4 @@ uses it to determine if data received from a pseudo-terminal is a control
sequence or just random data. The sample program "interpret" illustrates
more or less what the widget sees after it filters incoming data.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 97ad3eb58d0..bcd5ce0cbdb 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= wx
-PORTVERSION= 0.90.0.1
-PORTREVISION= 8
+PORTVERSION= 0.90.1.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell
-USE_CABAL= stm wxcore>=0.90
-
-BROKEN= does not build with any of the supported wx
+USE_CABAL= stm wxcore>=0.90.1.0
USE_WX= 3.0
WX_COMPS= wx
diff --git a/x11-toolkits/hs-wx/distinfo b/x11-toolkits/hs-wx/distinfo
index de00bac3e88..66eb7f0937a 100644
--- a/x11-toolkits/hs-wx/distinfo
+++ b/x11-toolkits/hs-wx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wx-0.90.0.1.tar.gz) = 150d448988afe0914aebb7bd61d58a27d12dd857e3d79e128ddf33a9f5a5db84
-SIZE (cabal/wx-0.90.0.1.tar.gz) = 47811
+SHA256 (cabal/wx-0.90.1.0.tar.gz) = c94e6ac36aa019e091098d871d4c39eb3f6735f6ef03e6093b7bb0715aaec998
+SIZE (cabal/wx-0.90.1.0.tar.gz) = 48667
diff --git a/x11-toolkits/hs-wx/pkg-descr b/x11-toolkits/hs-wx/pkg-descr
index a49e8a23ba3..a3eec956f63 100644
--- a/x11-toolkits/hs-wx/pkg-descr
+++ b/x11-toolkits/hs-wx/pkg-descr
@@ -1,6 +1,6 @@
wxHaskell is a portable and native GUI library for Haskell. It is built
on top of wxWidgets - a comprehensive C++ library that is portable
across all major GUI platforms; including GTK, Windows, X11, and MacOS
-X. This version works with wxWidgets 2.9 only.
+X.
WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 3ab194b0d69..fa50f2ed6c8 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= wxc
-PORTVERSION= 0.90.0.4
-PORTREVISION= 7
+PORTVERSION= 0.90.1.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell C++ wrapper
-USE_CABAL= wxdirect>=0.90
-
-BROKEN= does not build with any of the supported wx
+USE_CABAL= wxdirect>=0.90.1.0
USES= dos2unix
USE_WX= 3.0
@@ -20,8 +17,15 @@ WX_UNICODE= yes
OPTIONS_EXCLUDE=DOCS
post-patch::
- @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-2.9-config"| ; \
- s|/sbin/ldconfig -n|/sbin/ldconfig -m| ' ${WRKSRC}/Setup.hs
+ @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"| ; \
+ s|/sbin/ldconfig -n|/sbin/ldconfig -m| ; \
+ s|"2.9"|"3.0"|' \
+ ${WRKSRC}/Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${OSVERSION} >= 900000
+EXTRA_PATCHES+= ${PATCHDIR}/nopatch-wxc.cabal
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wxc/distinfo b/x11-toolkits/hs-wxc/distinfo
index e8062af03ff..a8f612b5ce0 100644
--- a/x11-toolkits/hs-wxc/distinfo
+++ b/x11-toolkits/hs-wxc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxc-0.90.0.4.tar.gz) = e69e4870c33dc32ee388c5f1be5b0ad1f2b231aa16a51da205cfa295430402ae
-SIZE (cabal/wxc-0.90.0.4.tar.gz) = 181799
+SHA256 (cabal/wxc-0.90.1.1.tar.gz) = ec71deebafdb69e50742acf1a4307ab2706f3282d24022a8a603eb3d35bc6e33
+SIZE (cabal/wxc-0.90.1.1.tar.gz) = 183992
diff --git a/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal b/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal
new file mode 100644
index 00000000000..1e5363f34d9
--- /dev/null
+++ b/x11-toolkits/hs-wxc/files/nopatch-wxc.cabal
@@ -0,0 +1,11 @@
+--- ./wxc.cabal.orig 2014-03-22 21:53:20.000000000 +0100
++++ ./wxc.cabal 2014-07-20 08:09:51.000000000 +0200
+@@ -161,6 +161,8 @@
+ base >= 4 && < 5,
+ wxdirect >= 0.90.1.0
+
++ cc-options: -std=c++11
++
+ x-dll-sources:
+ src/cpp/apppath.cpp
+ src/cpp/dragimage.cpp
diff --git a/x11-toolkits/hs-wxc/files/patch-src__cpp__eljpen.cpp b/x11-toolkits/hs-wxc/files/patch-src__cpp__eljpen.cpp
deleted file mode 100644
index 577dcdee6b0..00000000000
--- a/x11-toolkits/hs-wxc/files/patch-src__cpp__eljpen.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cpp/eljpen.cpp.orig 2012-07-03 11:12:17.000000000 +0100
-+++ ./src/cpp/eljpen.cpp 2012-09-06 15:58:22.000000000 +0100
-@@ -156,7 +156,7 @@
- EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref)
- {
- #if defined(__WXGTK__)
-- *_ref = NULL;
-+ *_ref = (GdkPixbuf *) NULL;
- #else
- *_ref = *(((wxPen*)self)->GetStipple());
- #endif
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 e6acc24af26..00000000000
--- a/x11-toolkits/hs-wxc/files/patch-wxc.cabal
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./wxc.cabal.orig 2013-12-19 21:28:05.000000000 +0100
-+++ ./wxc.cabal 2013-12-19 21:36:12.000000000 +0100
-@@ -273,3 +273,4 @@
-
- x-dll-extra-libraries:
-
-+ cc-options: -std=gnu++0x
diff --git a/x11-toolkits/hs-wxc/pkg-descr b/x11-toolkits/hs-wxc/pkg-descr
index 38627ecd2e0..79c2ea3d3a8 100644
--- a/x11-toolkits/hs-wxc/pkg-descr
+++ b/x11-toolkits/hs-wxc/pkg-descr
@@ -1,9 +1,5 @@
wxHaskell is a portable and native GUI library for Haskell. It is built
on top of wxWidgets, a comprehensive C++ library that is portable across
-all major GUI platforms, including GTK, Windows, X11, and MacOS X. This
-version works with wxWidgets 2.9 only. Distributed under the WXWINDOWS
-LIBRARY LICENSE. Please see LICENSE file, but note that this is essentially
-LGPL with an exception allowing binary distribution of proprietary software.
-This is the same license as wxWidgets itself uses.
+all major GUI platforms, including GTK, Windows, X11, and MacOS X.
WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 9cba613bd1c..252ad15a8ee 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= wxcore
-PORTVERSION= 0.90.0.3
-PORTREVISION= 7
+PORTVERSION= 0.90.1.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell core
-USE_CABAL= parsec stm wxc>=0.90.0.4 wxdirect>=0.90
-
-BROKEN= does not build with any of the supported wx
+USE_CABAL= parsec stm wxc>=0.90.1.0 wxdirect>=0.90.1.0
USE_WX= 3.0
WX_COMPS= wx
diff --git a/x11-toolkits/hs-wxcore/distinfo b/x11-toolkits/hs-wxcore/distinfo
index a8d051625f1..a120a76a237 100644
--- a/x11-toolkits/hs-wxcore/distinfo
+++ b/x11-toolkits/hs-wxcore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxcore-0.90.0.3.tar.gz) = bcc6530a8c087248ab9404fc370e0fd8556d9d05c318780a1ff2a7cf4c86e934
-SIZE (cabal/wxcore-0.90.0.3.tar.gz) = 354646
+SHA256 (cabal/wxcore-0.90.1.1.tar.gz) = f7b5a63d0d2fbaef6e8ffb9565ac30b347ece2efd0483dfe1e89ac839cdc46d5
+SIZE (cabal/wxcore-0.90.1.1.tar.gz) = 358007
diff --git a/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal b/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
index f3eec8462d6..791693780a9 100644
--- a/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
+++ b/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
@@ -1,11 +1,16 @@
---- ./wxcore.cabal.orig 2012-07-04 12:29:33.000000000 +0200
-+++ ./wxcore.cabal 2013-04-30 23:37:11.000000000 +0200
-@@ -80,7 +80,7 @@
+--- ./wxcore.cabal.orig 2014-03-22 22:01:18.000000000 +0100
++++ ./wxcore.cabal 2014-07-14 00:59:34.000000000 +0200
+@@ -78,11 +78,11 @@
+
+ if flag(splitBase)
build-depends:
- array >= 0.2 && < 0.5,
+- array >= 0.2 && < 0.5,
++ array >= 0.2 && < 0.6,
base >= 4 && < 5,
-- containers >= 0.2 && < 0.5
-+ containers >= 0.2 && < 0.6
+ containers >= 0.2 && < 0.6
else
build-depends:
- array >= 0.1 && < 0.3,
+- array >= 0.1 && < 0.3,
++ array >= 0.1 && < 0.6,
+ base >= 3 && < 4,
+ containers >= 0.1 && < 0.3
diff --git a/x11-toolkits/hs-wxcore/pkg-descr b/x11-toolkits/hs-wxcore/pkg-descr
index 9666ec72f6d..31bf09fc9ca 100644
--- a/x11-toolkits/hs-wxcore/pkg-descr
+++ b/x11-toolkits/hs-wxcore/pkg-descr
@@ -1,10 +1,5 @@
wxHaskell is a portable and native GUI library for Haskell. It is built
on top of wxWidgets, a comprehensive C++ library that is portable across
-all major GUI platforms, including GTK, Windows, X11, and MacOS X. This
-version works with wxWidgets 2.9 only. Distributed under the WXWINDOWS
-LIBRARY LICENSE. Please see LICENSE file, but note that this is
-essentially LGPL with an exception allowing binary distribution of
-proprietary software. This is the same license as wxWidgets itself
-uses.
+all major GUI platforms, including GTK, Windows, X11, and MacOS X.
WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index ea76e7947e4..f398df324d0 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -1,18 +1,21 @@
# $FreeBSD$
PORTNAME= wxdirect
-PORTVERSION= 0.90.0.1
-PORTREVISION= 8
+PORTVERSION= 0.90.1.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Helper tool for building wxHaskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= parsec>=2.1.0 strict
EXECUTABLE= wxdirect
+post-patch::
+ @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-3.0-config"|' \
+ ${WRKSRC}/src/ParseC.hs
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wxdirect/distinfo b/x11-toolkits/hs-wxdirect/distinfo
index 938dccea2c8..34d3f2d5abc 100644
--- a/x11-toolkits/hs-wxdirect/distinfo
+++ b/x11-toolkits/hs-wxdirect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxdirect-0.90.0.1.tar.gz) = 237b377387f2b9375d42abbb791001ddc07fa36d990b8720372f00c3fba35a12
-SIZE (cabal/wxdirect-0.90.0.1.tar.gz) = 31211
+SHA256 (cabal/wxdirect-0.90.1.1.tar.gz) = 282968b7fc52ed67f1efaf357cac05ffad58b7f80128062549801b6309ed7045
+SIZE (cabal/wxdirect-0.90.1.1.tar.gz) = 29893
diff --git a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs
deleted file mode 100644
index c286a3cb265..00000000000
--- a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/CompileClassInfo.hs.orig 2012-04-18 17:05:10.000000000 +0200
-+++ ./src/CompileClassInfo.hs 2013-05-04 03:12:14.541798377 +0200
-@@ -45,6 +45,7 @@
- , [ " ) where"
- , ""
- , "import System.IO.Unsafe( unsafePerformIO )"
-+ , "import Foreign.C.Types ( CInt(..), CWchar(..), CDouble(..) )"
- , "import " ++ moduleRoot ++ moduleClassTypesName
- , "import " ++ moduleRoot ++ "WxcTypes"
- , "import " ++ moduleRoot ++ moduleClassesName
diff --git a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs
deleted file mode 100644
index 5e78697528c..00000000000
--- a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/CompileClasses.hs.orig 2012-04-18 17:05:10.000000000 +0200
-+++ ./src/CompileClasses.hs 2013-05-04 03:12:06.682675621 +0200
-@@ -101,6 +101,7 @@
- , "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
- , "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
- , "import System.IO.Unsafe( unsafePerformIO )"
-+ , "import Foreign.C.Types ( CInt(..), CWchar(..), CDouble(..) )"
- , "import " ++ moduleRoot ++ "WxcTypes"
- , "import " ++ moduleRoot ++ moduleClassTypesName
- , ""
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
index e8e10ac59a1..153e628b848 100644
--- a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
+++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
@@ -1,11 +1,11 @@
---- ./wxdirect.cabal.orig 2012-04-18 17:05:11.000000000 +0200
-+++ ./wxdirect.cabal 2013-04-30 22:35:06.000000000 +0200
-@@ -66,7 +66,7 @@
+--- ./wxdirect.cabal.orig 2014-03-22 15:08:59.000000000 +0100
++++ ./wxdirect.cabal 2014-07-13 01:10:34.000000000 +0200
+@@ -51,7 +51,7 @@
+ strict,
+ time >= 1.0 && < 1.5,
+ filepath < 1.4,
+- process >= 1.1 && < 1.2
++ process >= 1.1 && < 1.3
+
if flag(splitBase)
build-depends:
- base >= 4 && < 5,
-- containers >= 0.2 && < 0.5
-+ containers >= 0.2 && < 0.6
- else
- build-depends:
- base >= 3 && < 4,
diff --git a/x11-toolkits/hs-wxdirect/pkg-descr b/x11-toolkits/hs-wxdirect/pkg-descr
index 5a608f1fd3c..31bf09fc9ca 100644
--- a/x11-toolkits/hs-wxdirect/pkg-descr
+++ b/x11-toolkits/hs-wxdirect/pkg-descr
@@ -1,6 +1,5 @@
wxHaskell is a portable and native GUI library for Haskell. It is built
on top of wxWidgets, a comprehensive C++ library that is portable across
-all major GUI platforms, including GTK, Windows, X11, and MacOS X. This
-version works with wxWidgets 2.9 only.
+all major GUI platforms, including GTK, Windows, X11, and MacOS X.
WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 40c47f1916f..0b362a434aa 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,33 +2,26 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
-PORTVERSION= 0.11.1
-PORTREVISION= 6
+PORTVERSION= 0.11.3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Third-party extensions for xmonad
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= mtl random utf8-string X11>=1.6 xmonad>=0.11
+USE_CABAL= extensible-exceptions mtl>=1 random utf8-string X11>=1.6.1 \
+ xmonad>=0.11
USE_XORG= x11
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
-OPTIONS_DEFINE= XFT
-OPTIONS_DEFAULT= XFT
+FLAGS_DEFINE= XFT
+FLAGS_DEFAULT= XFT
XFT_DESC= Use Xft to render text
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MXFT}
-CONFIGURE_ARGS+= --flags="use_xft"
-USE_CABAL+= X11-xft>=0.2
-.else
-CONFIGURE_ARGS+= --flags="-use_xft"
-.endif
+XFT_FLAG_ENABLE= use_xft
+XFT_FLAG_CABAL= X11-xft>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 2dc4812e95c..e39158a5763 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.11.1.tar.gz) = 347f805fa1b5aed59bc589afce9e19ef13e392b1f7cad8857deef01b916da68c
-SIZE (cabal/xmonad-contrib-0.11.1.tar.gz) = 401391
+SHA256 (cabal/xmonad-contrib-0.11.3.tar.gz) = aae39e11681fe8e8763d203ed6964a7e18b1558d8b8322b9ae5e523f46de0992
+SIZE (cabal/xmonad-contrib-0.11.3.tar.gz) = 401707
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 0d682b20bb2..06da894f0ed 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,18 +3,18 @@
PORTNAME= xmonad
PORTVERSION= 0.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Tiling window manager
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl utf8-string>=0.3 X11>=1.5
USE_XORG= x11
-MAN1= xmonad.1
+MAN1PAGES= xmonad.1
MAN1SRC= man
EXECUTABLE= xmonad
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 2ec8de5ba7b..cb4e30036d6 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= 11
+PORTREVISION= 12
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index bc978bc118d..4aebb8f031f 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -2,31 +2,24 @@
# $FreeBSD$
PORTNAME= X11
-PORTVERSION= 1.6.1.1
-PORTREVISION= 6
+PORTVERSION= 1.6.1.2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the X11 graphics library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-default
USE_XORG= x11 xrandr xext
-OPTIONS_DEFINE= XINERAMA
-OPTIONS_DEFAULT= XINERAMA
+FLAGS_DEFINE= XINERAMA
+FLAGS_DEFAULT= XINERAMA
-XINERAMA_DESC= Build with Xinerama support
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+= xinerama
-CONFIGURE_ARGS+= --configure-option="--with-xinerama"
-.else
-CONFIGURE_ARGS+= --configure-option="--without-xinerama"
-.endif
+XINERAMA_DESC= Build with Xinerama support
+XINERAMA_FLAG_XORG= xinerama
+XINERAMA_FLAG_CONFIGURE_ON= --configure-option="--with-xinerama"
+XINERAMA_FLAG_CONFIGURE_OFF= --configure-option="--without-xinerama"
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-X11/distinfo b/x11/hs-X11/distinfo
index a4ea495f953..c82724f1124 100644
--- a/x11/hs-X11/distinfo
+++ b/x11/hs-X11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/X11-1.6.1.1.tar.gz) = 7ce575c613786c73efb20d5680a9e572aa1f1c91c3963e285011235759b76eae
-SIZE (cabal/X11-1.6.1.1.tar.gz) = 188628
+SHA256 (cabal/X11-1.6.1.2.tar.gz) = 5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf
+SIZE (cabal/X11-1.6.1.2.tar.gz) = 188612
diff --git a/x11/hs-X11/pkg-descr b/x11/hs-X11/pkg-descr
index 66f6c2fd2d3..3f1b006d7d4 100644
--- a/x11/hs-X11/pkg-descr
+++ b/x11/hs-X11/pkg-descr
@@ -2,4 +2,3 @@ A Haskell binding to the X11 library. The binding is a direct
translation of C binding.
WWW: https://github.com/haskell-pkg-janitors/X11
-
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 0c9cda673d1..f4da73a70ec 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,80 +2,51 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.17
-PORTREVISION= 4
+PORTVERSION= 0.21
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Minimalistic text-based status bar
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 parsec stm>=2.3 X11>=1.6.1
-USE_XORG= xrandr
+USE_CABAL= HTTP>=4000 mtl>=2.0 parsec regex-compat stm>=2.3 \
+ utf8-string X11>=1.6.1
EXECUTABLE= xmobar
+
STANDALONE= yes
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${STAGEDIR}${DATADIR}
-OPTIONS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED
-OPTIONS_DEFAULT= UTF8
+FLAGS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED
+FLAGS_DEFAULT= UTF8
XFT_DESC= Use Xft to render text (UTF-8 support included)
+XFT_FLAG_ENABLE= with_xft
+XFT_FLAG_CABAL= utf8-string X11-xft>=0.2
+
UTF8_DESC= UTF-8 support
+UTF8_FLAG_ENABLE= with_utf8
+UTF8_FLAG_CABAL= utf8-string
+
MPD_DESC= mpd support
+MPD_FLAG_ENABLE= with_mpd
+MPD_FLAG_CABAL= libmpd
+
INOTIFY_DESC= inotify support
+INOTIFY_FLAG_ENABLE= with_inotify
+INOTIFY_FLAG_CABAL= hinotify>=0.3
+
DATEZONE_DESC= Localized date support
-THREADED_DESC= Use threaded runtime
+DATEZONE_FLAG_ENABLE= with_datezone
+DATEZONE_FLAG_CABAL= timezone-olson>=0.1 timezone-series>=0.1
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+THREADED_DESC= Use threaded runtime
+THREADED_FLAG_ENABLE= with_threaded
# Disable unsupported options
-CONFIGURE_ARGS+= --flags="-with_iwlib -with_dbus -with_mpris"
-
-.if ${PORT_OPTIONS:MXFT}
-CONFIGURE_ARGS+= --flags="with_xft"
-USE_CABAL+= utf8-string X11-xft>=0.2
-.else
-CONFIGURE_ARGS+= --flags="-with_xft"
-.endif
-
-.if ${PORT_OPTIONS:MUTF8}
-CONFIGURE_ARGS+= --flags="with_utf8"
-.if empty(PORT_OPTIONS:MXFT)
-USE_CABAL+= utf8-string
-.endif
-.else
-CONFIGURE_ARGS+= --flags="-with_utf8"
-.endif
-
-.if ${PORT_OPTIONS:MMPD}
-CONFIGURE_ARGS+= --flags="with_mpd"
-USE_CABAL+= libmpd
-.else
-CONFIGURE_ARGS+= --flags="-with_mpd"
-.endif
-
-.if ${PORT_OPTIONS:MINOTIFY}
-CONFIGURE_ARGS+= --flags="with_inotify"
-USE_CABAL+= hinotify>=0.3
-.else
-CONFIGURE_ARGS+= --flags="-with_inotify"
-.endif
-
-.if ${PORT_OPTIONS:MDATEZONE}
-CONFIGURE_ARGS+= --flags="with_datezone"
-USE_CABAL+= timezone-olson>=0.1 timezone-series>=0.1
-.else
-CONFIGURE_ARGS+= --flags="-with_datezone"
-.endif
-
-.if ${PORT_OPTIONS:MTHREADED}
-CONFIGURE_ARGS+= --flags="with_threaded"
-.else
-CONFIGURE_ARGS+= --flags="-with_threaded"
-.endif
+FLAGS_DISABLE= with_mpris with_dbus with_iwlib with_alsa
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 0e8232b6846..cd90d009824 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmobar-0.17.tar.gz) = ba8876287b96be1172ee98d1cb3fd5b69a1209bd2b80b47c7f773bd6711f0b2a
-SIZE (cabal/xmobar-0.17.tar.gz) = 79261
+SHA256 (cabal/xmobar-0.21.tar.gz) = f576b6c090db0d8ea8497106dfa8098c529ec620d41d5e2791a47e04d0d20fc0
+SIZE (cabal/xmobar-0.21.tar.gz) = 85387
diff --git a/x11/hs-xmobar/pkg-descr b/x11/hs-xmobar/pkg-descr
index f9b40a20c4c..088ae15a5a4 100644
--- a/x11/hs-xmobar/pkg-descr
+++ b/x11/hs-xmobar/pkg-descr
@@ -2,4 +2,4 @@ Xmobar is a minimalistic text based status bar. Inspired by the Ion3
status bar, it supports similar features, like dynamic color management,
output templates, and extensibility through plugins.
-WWW: http://projects.haskell.org/xmobar/
+WWW: http://xmobar.org/