aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile32
-rw-r--r--devel/hs-BNFC/Makefile7
-rw-r--r--devel/hs-BNFC/distinfo4
-rw-r--r--devel/hs-Boolean/Makefile3
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-BoundedChan/Makefile1
-rw-r--r--devel/hs-ConfigFile/Makefile5
-rw-r--r--devel/hs-ConfigFile/distinfo4
-rw-r--r--devel/hs-DrIFT/Makefile4
-rw-r--r--devel/hs-DrIFT/files/patch-src_ParseLib2.hs25
-rw-r--r--devel/hs-Glob/Makefile2
-rw-r--r--devel/hs-Glob/files/patch-Glob.cabal11
-rw-r--r--devel/hs-HUnit/Makefile2
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-List/Makefile3
-rw-r--r--devel/hs-List/distinfo4
-rw-r--r--devel/hs-MaybeT/distinfo2
-rw-r--r--devel/hs-MaybeT/pkg-descr3
-rw-r--r--devel/hs-MemoTrie/Makefile2
-rw-r--r--devel/hs-MissingH/Makefile5
-rw-r--r--devel/hs-MissingH/distinfo4
-rw-r--r--devel/hs-MissingH/pkg-descr6
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile5
-rw-r--r--devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal11
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile3
-rw-r--r--devel/hs-MonadCatchIO-transformers/distinfo4
-rw-r--r--devel/hs-MonadRandom/Makefile5
-rw-r--r--devel/hs-MonadRandom/distinfo4
-rw-r--r--devel/hs-ObjectName/Makefile3
-rw-r--r--devel/hs-ObjectName/distinfo4
-rw-r--r--devel/hs-ObjectName/pkg-descr2
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-QuickCheck/Makefile5
-rw-r--r--devel/hs-QuickCheck/distinfo4
-rw-r--r--devel/hs-QuickCheck/pkg-descr2
-rw-r--r--devel/hs-ReadArgs/Makefile3
-rw-r--r--devel/hs-ReadArgs/distinfo4
-rw-r--r--devel/hs-STMonadTrans/Makefile3
-rw-r--r--devel/hs-STMonadTrans/distinfo4
-rw-r--r--devel/hs-SafeSemaphore/Makefile2
-rw-r--r--devel/hs-ShellCheck/Makefile7
-rw-r--r--devel/hs-ShellCheck/distinfo4
-rw-r--r--devel/hs-ShellCheck/files/patch-ShellCheck.cabal28
-rw-r--r--devel/hs-StateVar/Makefile (renamed from devel/hs-ranges/Makefile)9
-rw-r--r--devel/hs-StateVar/distinfo2
-rw-r--r--devel/hs-StateVar/pkg-descr4
-rw-r--r--devel/hs-Stream/Makefile3
-rw-r--r--devel/hs-Stream/distinfo4
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-abstract-deque/Makefile8
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-activehs-base/Makefile2
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal10
-rw-r--r--devel/hs-alex/Makefile3
-rw-r--r--devel/hs-alex/distinfo4
-rw-r--r--devel/hs-ansi-terminal/Makefile3
-rw-r--r--devel/hs-ansi-terminal/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile5
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/pkg-descr2
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-asn1-data/Makefile2
-rw-r--r--devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs11
-rw-r--r--devel/hs-asn1-encoding/Makefile5
-rw-r--r--devel/hs-asn1-encoding/distinfo4
-rw-r--r--devel/hs-asn1-parse/Makefile5
-rw-r--r--devel/hs-asn1-parse/distinfo4
-rw-r--r--devel/hs-asn1-types/Makefile5
-rw-r--r--devel/hs-asn1-types/distinfo4
-rw-r--r--devel/hs-async/Makefile3
-rw-r--r--devel/hs-async/distinfo4
-rw-r--r--devel/hs-atomic-primops/Makefile3
-rw-r--r--devel/hs-atomic-primops/distinfo4
-rw-r--r--devel/hs-auto-update/Makefile3
-rw-r--r--devel/hs-auto-update/distinfo4
-rw-r--r--devel/hs-base-orphans/Makefile13
-rw-r--r--devel/hs-base-orphans/distinfo2
-rw-r--r--devel/hs-base-orphans/pkg-descr6
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/Makefile2
-rw-r--r--devel/hs-basic-prelude/Makefile7
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile5
-rw-r--r--devel/hs-bifunctors/distinfo4
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile6
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo4
-rw-r--r--devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal12
-rw-r--r--devel/hs-blaze-builder/Makefile3
-rw-r--r--devel/hs-blaze-builder/distinfo4
-rw-r--r--devel/hs-blaze-builder/pkg-descr2
-rw-r--r--devel/hs-blaze-textual/Makefile6
-rw-r--r--devel/hs-blaze-textual/distinfo4
-rw-r--r--devel/hs-bloomfilter/Makefile3
-rw-r--r--devel/hs-bloomfilter/distinfo4
-rw-r--r--devel/hs-boxes/Makefile3
-rw-r--r--devel/hs-boxes/distinfo4
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-byteable/Makefile2
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-bytestring-lexing/Makefile4
-rw-r--r--devel/hs-bytestring-lexing/distinfo4
-rw-r--r--devel/hs-bytestring-mmap/Makefile13
-rw-r--r--devel/hs-bytestring-mmap/distinfo2
-rw-r--r--devel/hs-bytestring-mmap/pkg-descr5
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-bytestring-show/Makefile2
-rw-r--r--devel/hs-c2hs/Makefile5
-rw-r--r--devel/hs-c2hs/distinfo4
-rw-r--r--devel/hs-cabal-install/Makefile6
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/hs-cereal/Makefile3
-rw-r--r--devel/hs-cereal/distinfo4
-rw-r--r--devel/hs-cereal/pkg-descr6
-rw-r--r--devel/hs-checkers/Makefile3
-rw-r--r--devel/hs-checkers/distinfo4
-rw-r--r--devel/hs-checkers/pkg-descr8
-rw-r--r--devel/hs-chunked-data/Makefile7
-rw-r--r--devel/hs-chunked-data/distinfo4
-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/Makefile3
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-conduit-combinators/Makefile8
-rw-r--r--devel/hs-conduit-combinators/distinfo4
-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-extra/Makefile5
-rw-r--r--devel/hs-conduit-extra/distinfo4
-rw-r--r--devel/hs-conduit/Makefile7
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-constraints/Makefile15
-rw-r--r--devel/hs-constraints/distinfo2
-rw-r--r--devel/hs-constraints/pkg-descr5
-rw-r--r--devel/hs-convertible/Makefile5
-rw-r--r--devel/hs-convertible/distinfo4
-rw-r--r--devel/hs-convertible/pkg-descr2
-rw-r--r--devel/hs-cpphs/Makefile5
-rw-r--r--devel/hs-cpphs/distinfo4
-rw-r--r--devel/hs-darcs/Makefile23
-rw-r--r--devel/hs-darcs/distinfo4
-rw-r--r--devel/hs-data-default-class/Makefile2
-rw-r--r--devel/hs-data-default-instances-base/Makefile2
-rw-r--r--devel/hs-data-default-instances-containers/Makefile2
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile2
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile4
-rw-r--r--devel/hs-data-default/Makefile2
-rw-r--r--devel/hs-data-hash/Makefile3
-rw-r--r--devel/hs-data-hash/distinfo4
-rw-r--r--devel/hs-data-ordlist/Makefile13
-rw-r--r--devel/hs-data-ordlist/distinfo2
-rw-r--r--devel/hs-data-ordlist/pkg-descr3
-rw-r--r--devel/hs-data-pprint/Makefile3
-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/Makefile2
-rw-r--r--devel/hs-datetime/Makefile7
-rw-r--r--devel/hs-datetime/distinfo4
-rw-r--r--devel/hs-datetime/pkg-descr6
-rw-r--r--devel/hs-deepseq-generics/Makefile3
-rw-r--r--devel/hs-deepseq-generics/distinfo4
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal11
-rw-r--r--devel/hs-directory-tree/Makefile2
-rw-r--r--devel/hs-dlist-instances/Makefile2
-rw-r--r--devel/hs-dlist/Makefile3
-rw-r--r--devel/hs-dlist/distinfo4
-rw-r--r--devel/hs-easy-file/Makefile13
-rw-r--r--devel/hs-easy-file/distinfo2
-rw-r--r--devel/hs-easy-file/pkg-descr3
-rw-r--r--devel/hs-edit-distance/Makefile3
-rw-r--r--devel/hs-edit-distance/distinfo4
-rw-r--r--devel/hs-edit-distance/pkg-descr2
-rw-r--r--devel/hs-either/Makefile9
-rw-r--r--devel/hs-either/distinfo4
-rw-r--r--devel/hs-enclosed-exceptions/Makefile3
-rw-r--r--devel/hs-enclosed-exceptions/distinfo4
-rw-r--r--devel/hs-enumerator/Makefile2
-rw-r--r--devel/hs-equivalence/Makefile5
-rw-r--r--devel/hs-equivalence/distinfo4
-rw-r--r--devel/hs-errors/Makefile5
-rw-r--r--devel/hs-errors/distinfo4
-rw-r--r--devel/hs-exceptions/Makefile5
-rw-r--r--devel/hs-exceptions/distinfo4
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extra/Makefile13
-rw-r--r--devel/hs-extra/distinfo2
-rw-r--r--devel/hs-extra/pkg-descr10
-rw-r--r--devel/hs-fast-logger/Makefile5
-rw-r--r--devel/hs-fast-logger/distinfo4
-rw-r--r--devel/hs-fast-logger/files/patch-fast-logger.cabal10
-rw-r--r--devel/hs-fgl/Makefile5
-rw-r--r--devel/hs-fgl/distinfo4
-rw-r--r--devel/hs-fgl/pkg-descr4
-rw-r--r--devel/hs-file-embed/Makefile3
-rw-r--r--devel/hs-file-embed/distinfo4
-rw-r--r--devel/hs-filemanip/Makefile3
-rw-r--r--devel/hs-filemanip/distinfo4
-rw-r--r--devel/hs-filestore/Makefile6
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-free/Makefile9
-rw-r--r--devel/hs-free/distinfo4
-rw-r--r--devel/hs-fsnotify/Makefile6
-rw-r--r--devel/hs-fsnotify/distinfo4
-rw-r--r--devel/hs-fsnotify/pkg-descr2
-rw-r--r--devel/hs-gconf/Makefile5
-rw-r--r--devel/hs-gconf/distinfo4
-rw-r--r--devel/hs-generic-deriving/Makefile3
-rw-r--r--devel/hs-generic-deriving/distinfo4
-rw-r--r--devel/hs-geniplate-mirror/Makefile (renamed from devel/hs-geniplate/Makefile)7
-rw-r--r--devel/hs-geniplate-mirror/distinfo2
-rw-r--r--devel/hs-geniplate-mirror/pkg-descr3
-rw-r--r--devel/hs-geniplate/distinfo2
-rw-r--r--devel/hs-geniplate/pkg-descr3
-rw-r--r--devel/hs-ghc-events/Makefile5
-rw-r--r--devel/hs-ghc-events/distinfo4
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-gio/Makefile5
-rw-r--r--devel/hs-gio/distinfo4
-rw-r--r--devel/hs-git-annex/Makefile51
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-git-annex/files/patch-Setup.hs28
-rw-r--r--devel/hs-git-annex/files/patch-Utility__Yesod.hs20
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal19
-rw-r--r--devel/hs-git-annex/pkg-descr27
-rw-r--r--devel/hs-glade/Makefile18
-rw-r--r--devel/hs-glade/distinfo2
-rw-r--r--devel/hs-glade/pkg-descr4
-rw-r--r--devel/hs-glib/Makefile5
-rw-r--r--devel/hs-glib/distinfo4
-rw-r--r--devel/hs-glib/pkg-descr9
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo4
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs11
-rw-r--r--devel/hs-haddock-api/Makefile15
-rw-r--r--devel/hs-haddock-api/distinfo2
-rw-r--r--devel/hs-haddock-api/pkg-descr3
-rw-r--r--devel/hs-haddock-library/Makefile3
-rw-r--r--devel/hs-haddock-library/distinfo4
-rw-r--r--devel/hs-haddock/Makefile7
-rw-r--r--devel/hs-haddock/distinfo4
-rw-r--r--devel/hs-happy/Makefile3
-rw-r--r--devel/hs-happy/distinfo4
-rw-r--r--devel/hs-hashable/Makefile3
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashed-storage/Makefile2
-rw-r--r--devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs8
-rw-r--r--devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs8
-rw-r--r--devel/hs-hashtables/Makefile5
-rw-r--r--devel/hs-hashtables/distinfo4
-rw-r--r--devel/hs-haskell-platform/Makefile58
-rw-r--r--devel/hs-haskell-platform/pkg-descr15
-rw-r--r--devel/hs-haskell-src-exts/Makefile3
-rw-r--r--devel/hs-haskell-src-exts/distinfo4
-rw-r--r--devel/hs-haskell-src/Makefile3
-rw-r--r--devel/hs-haskell-src/distinfo4
-rw-r--r--devel/hs-hasktags/Makefile3
-rw-r--r--devel/hs-hasktags/distinfo4
-rw-r--r--devel/hs-hastache/Makefile7
-rw-r--r--devel/hs-hastache/distinfo4
-rw-r--r--devel/hs-hex/Makefile (renamed from devel/hs-MaybeT/Makefile)7
-rw-r--r--devel/hs-hex/distinfo2
-rw-r--r--devel/hs-hex/pkg-descr3
-rw-r--r--devel/hs-hinotify/Makefile3
-rw-r--r--devel/hs-hinotify/distinfo4
-rw-r--r--devel/hs-hinotify/files/patch-hinotify.cabal12
-rw-r--r--devel/hs-hint/Makefile3
-rw-r--r--devel/hs-hint/distinfo4
-rw-r--r--devel/hs-hint/pkg-descr8
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile7
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile9
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hourglass/Makefile13
-rw-r--r--devel/hs-hourglass/distinfo2
-rw-r--r--devel/hs-hourglass/pkg-descr6
-rw-r--r--devel/hs-hsb2hs/Makefile18
-rw-r--r--devel/hs-hsb2hs/distinfo2
-rw-r--r--devel/hs-hsb2hs/pkg-descr6
-rw-r--r--devel/hs-hslogger/Makefile5
-rw-r--r--devel/hs-hslogger/distinfo4
-rw-r--r--devel/hs-hslogger/pkg-descr12
-rw-r--r--devel/hs-hslua/Makefile5
-rw-r--r--devel/hs-hslua/distinfo4
-rw-r--r--devel/hs-hslua/pkg-descr2
-rw-r--r--devel/hs-hspec-core/Makefile17
-rw-r--r--devel/hs-hspec-core/distinfo2
-rw-r--r--devel/hs-hspec-core/pkg-descr4
-rw-r--r--devel/hs-hspec-discover/Makefile17
-rw-r--r--devel/hs-hspec-discover/distinfo2
-rw-r--r--devel/hs-hspec-discover/pkg-descr3
-rw-r--r--devel/hs-hspec-expectations/Makefile3
-rw-r--r--devel/hs-hspec-expectations/distinfo4
-rw-r--r--devel/hs-hspec/Makefile12
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-hspec/pkg-descr11
-rw-r--r--devel/hs-js-flot/Makefile13
-rw-r--r--devel/hs-js-flot/distinfo2
-rw-r--r--devel/hs-js-flot/pkg-descr7
-rw-r--r--devel/hs-js-jquery/Makefile13
-rw-r--r--devel/hs-js-jquery/distinfo2
-rw-r--r--devel/hs-js-jquery/pkg-descr7
-rw-r--r--devel/hs-keys/Makefile6
-rw-r--r--devel/hs-keys/distinfo4
-rw-r--r--devel/hs-kqueue/Makefile2
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal17
-rw-r--r--devel/hs-language-c/Makefile4
-rw-r--r--devel/hs-language-c/distinfo4
-rw-r--r--devel/hs-language-javascript/Makefile3
-rw-r--r--devel/hs-language-javascript/distinfo4
-rw-r--r--devel/hs-language-javascript/pkg-descr2
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lens/Makefile17
-rw-r--r--devel/hs-lens/distinfo4
-rw-r--r--devel/hs-lifted-async/Makefile16
-rw-r--r--devel/hs-lifted-async/distinfo2
-rw-r--r--devel/hs-lifted-async/pkg-descr4
-rw-r--r--devel/hs-lifted-base/Makefile3
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-logict/Makefile2
-rw-r--r--devel/hs-map-syntax/Makefile15
-rw-r--r--devel/hs-map-syntax/distinfo2
-rw-r--r--devel/hs-map-syntax/pkg-descr6
-rw-r--r--devel/hs-memory/Makefile13
-rw-r--r--devel/hs-memory/distinfo2
-rw-r--r--devel/hs-memory/pkg-descr9
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-mmorph/Makefile3
-rw-r--r--devel/hs-mmorph/distinfo4
-rw-r--r--devel/hs-monad-control/Makefile3
-rw-r--r--devel/hs-monad-control/distinfo4
-rw-r--r--devel/hs-monad-logger/Makefile3
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-loops/Makefile3
-rw-r--r--devel/hs-monad-loops/distinfo4
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par/Makefile5
-rw-r--r--devel/hs-monad-par/distinfo4
-rw-r--r--devel/hs-monad-par/pkg-descr4
-rw-r--r--devel/hs-monads-tf/Makefile2
-rw-r--r--devel/hs-mono-traversable/Makefile5
-rw-r--r--devel/hs-mono-traversable/distinfo4
-rw-r--r--devel/hs-mono-traversable/pkg-descr3
-rw-r--r--devel/hs-mtl/Makefile3
-rw-r--r--devel/hs-mtl/distinfo4
-rw-r--r--devel/hs-mueval/Makefile5
-rw-r--r--devel/hs-mueval/distinfo4
-rw-r--r--devel/hs-murmur-hash/Makefile3
-rw-r--r--devel/hs-murmur-hash/distinfo4
-rw-r--r--devel/hs-mutable-containers/Makefile15
-rw-r--r--devel/hs-mutable-containers/distinfo2
-rw-r--r--devel/hs-mutable-containers/pkg-descr10
-rw-r--r--devel/hs-newtype/Makefile13
-rw-r--r--devel/hs-newtype/distinfo2
-rw-r--r--devel/hs-newtype/pkg-descr5
-rw-r--r--devel/hs-old-locale/Makefile13
-rw-r--r--devel/hs-old-locale/distinfo2
-rw-r--r--devel/hs-old-locale/pkg-descr4
-rw-r--r--devel/hs-old-time/Makefile15
-rw-r--r--devel/hs-old-time/distinfo2
-rw-r--r--devel/hs-old-time/pkg-descr3
-rw-r--r--devel/hs-optparse-applicative/Makefile5
-rw-r--r--devel/hs-optparse-applicative/distinfo4
-rw-r--r--devel/hs-parallel/Makefile3
-rw-r--r--devel/hs-parallel/distinfo4
-rw-r--r--devel/hs-pcre-light/Makefile3
-rw-r--r--devel/hs-pcre-light/distinfo4
-rw-r--r--devel/hs-prelude-extras/Makefile2
-rw-r--r--devel/hs-preprocessor-tools/Makefile15
-rw-r--r--devel/hs-preprocessor-tools/distinfo2
-rw-r--r--devel/hs-preprocessor-tools/pkg-descr6
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-primitive/Makefile3
-rw-r--r--devel/hs-primitive/distinfo4
-rw-r--r--devel/hs-profunctors/Makefile6
-rw-r--r--devel/hs-profunctors/distinfo4
-rw-r--r--devel/hs-project-template/Makefile6
-rw-r--r--devel/hs-project-template/distinfo4
-rw-r--r--devel/hs-quickcheck-io/Makefile2
-rw-r--r--devel/hs-random/Makefile3
-rw-r--r--devel/hs-random/distinfo4
-rw-r--r--devel/hs-ranges/distinfo2
-rw-r--r--devel/hs-ranges/pkg-descr4
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-reflection/Makefile3
-rw-r--r--devel/hs-reflection/distinfo4
-rw-r--r--devel/hs-reflection/pkg-descr12
-rw-r--r--devel/hs-resource-pool/Makefile7
-rw-r--r--devel/hs-resource-pool/distinfo4
-rw-r--r--devel/hs-resourcet/Makefile5
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-safe/Makefile3
-rw-r--r--devel/hs-safe/distinfo4
-rw-r--r--devel/hs-safe/pkg-descr16
-rw-r--r--devel/hs-scientific/Makefile3
-rw-r--r--devel/hs-scientific/distinfo4
-rw-r--r--devel/hs-securemem/Makefile5
-rw-r--r--devel/hs-securemem/distinfo4
-rw-r--r--devel/hs-setenv/Makefile3
-rw-r--r--devel/hs-setenv/distinfo4
-rw-r--r--devel/hs-shake/Makefile7
-rw-r--r--devel/hs-shake/distinfo4
-rw-r--r--devel/hs-shake/pkg-descr2
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile3
-rw-r--r--devel/hs-silently/distinfo4
-rw-r--r--devel/hs-silently/pkg-descr2
-rw-r--r--devel/hs-simple-reflect/Makefile2
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-split/Makefile2
-rw-r--r--devel/hs-split/files/patch-split.cabal11
-rw-r--r--devel/hs-stm-chans/Makefile3
-rw-r--r--devel/hs-stm-chans/distinfo4
-rw-r--r--devel/hs-stm/Makefile3
-rw-r--r--devel/hs-stm/distinfo4
-rw-r--r--devel/hs-streaming-commons/Makefile3
-rw-r--r--devel/hs-streaming-commons/distinfo4
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile3
-rw-r--r--devel/hs-syb-with-class/distinfo4
-rw-r--r--devel/hs-syb/Makefile3
-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/Makefile5
-rw-r--r--devel/hs-system-filepath/distinfo4
-rw-r--r--devel/hs-system-filepath/pkg-descr2
-rw-r--r--devel/hs-tagged/Makefile3
-rw-r--r--devel/hs-tagged/distinfo4
-rw-r--r--devel/hs-temporary/Makefile2
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework/Makefile5
-rw-r--r--devel/hs-test-framework/distinfo4
-rw-r--r--devel/hs-test-framework/pkg-descr2
-rw-r--r--devel/hs-testpack/Makefile17
-rw-r--r--devel/hs-testpack/distinfo2
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs74
-rw-r--r--devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs22
-rw-r--r--devel/hs-testpack/files/patch-testpack.cabal11
-rw-r--r--devel/hs-testpack/pkg-descr9
-rw-r--r--devel/hs-text-icu/Makefile3
-rw-r--r--devel/hs-text-icu/distinfo4
-rw-r--r--devel/hs-text/Makefile3
-rw-r--r--devel/hs-text/distinfo4
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-threads/Makefile5
-rw-r--r--devel/hs-threads/distinfo4
-rw-r--r--devel/hs-threadscope/Makefile5
-rw-r--r--devel/hs-threadscope/distinfo4
-rw-r--r--devel/hs-time-compat/Makefile4
-rw-r--r--devel/hs-time-locale-compat/Makefile13
-rw-r--r--devel/hs-time-locale-compat/distinfo2
-rw-r--r--devel/hs-time-locale-compat/pkg-descr3
-rw-r--r--devel/hs-timezone-olson/Makefile3
-rw-r--r--devel/hs-timezone-olson/distinfo4
-rw-r--r--devel/hs-timezone-series/Makefile3
-rw-r--r--devel/hs-timezone-series/distinfo4
-rw-r--r--devel/hs-timezone-series/pkg-descr3
-rw-r--r--devel/hs-transformers-base/Makefile5
-rw-r--r--devel/hs-transformers-base/distinfo4
-rw-r--r--devel/hs-transformers-compat/Makefile5
-rw-r--r--devel/hs-transformers-compat/distinfo4
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-unix-compat/Makefile3
-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/Makefile3
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-string/Makefile5
-rw-r--r--devel/hs-utf8-string/distinfo4
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile3
-rw-r--r--devel/hs-uuagc-cabal/distinfo4
-rw-r--r--devel/hs-uuagc/Makefile5
-rw-r--r--devel/hs-uuagc/distinfo4
-rw-r--r--devel/hs-uuid-types/Makefile15
-rw-r--r--devel/hs-uuid-types/distinfo2
-rw-r--r--devel/hs-uuid-types/pkg-descr4
-rw-r--r--devel/hs-uuid/Makefile6
-rw-r--r--devel/hs-uuid/distinfo4
-rw-r--r--devel/hs-uuid/pkg-descr2
-rw-r--r--devel/hs-uulib/Makefile3
-rw-r--r--devel/hs-uulib/distinfo4
-rw-r--r--devel/hs-uulib/pkg-descr3
-rw-r--r--devel/hs-vault/Makefile3
-rw-r--r--devel/hs-vault/distinfo4
-rw-r--r--devel/hs-vault/pkg-descr10
-rw-r--r--devel/hs-vector-algorithms/Makefile3
-rw-r--r--devel/hs-vector-algorithms/distinfo4
-rw-r--r--devel/hs-vector-binary-instances/Makefile2
-rw-r--r--devel/hs-vector-instances/Makefile3
-rw-r--r--devel/hs-vector-instances/distinfo4
-rw-r--r--devel/hs-vector-th-unbox/Makefile3
-rw-r--r--devel/hs-vector-th-unbox/distinfo4
-rw-r--r--devel/hs-vector-th-unbox/pkg-descr3
-rw-r--r--devel/hs-vector/Makefile3
-rw-r--r--devel/hs-vector/distinfo4
-rw-r--r--devel/hs-void/Makefile3
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-word8/Makefile3
-rw-r--r--devel/hs-word8/distinfo4
515 files changed, 1502 insertions, 1347 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 7b15bb05189..2b9280b82f2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -758,7 +758,6 @@
SUBDIR += hs-HUnit
SUBDIR += hs-IfElse
SUBDIR += hs-List
- SUBDIR += hs-MaybeT
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
SUBDIR += hs-MonadCatchIO-mtl
@@ -771,6 +770,7 @@
SUBDIR += hs-STMonadTrans
SUBDIR += hs-SafeSemaphore
SUBDIR += hs-ShellCheck
+ SUBDIR += hs-StateVar
SUBDIR += hs-Stream
SUBDIR += hs-TypeCompose
SUBDIR += hs-abstract-deque
@@ -787,6 +787,7 @@
SUBDIR += hs-async
SUBDIR += hs-atomic-primops
SUBDIR += hs-auto-update
+ SUBDIR += hs-base-orphans
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
@@ -802,6 +803,7 @@
SUBDIR += hs-byteable
SUBDIR += hs-byteorder
SUBDIR += hs-bytestring-lexing
+ SUBDIR += hs-bytestring-mmap
SUBDIR += hs-bytestring-nums
SUBDIR += hs-bytestring-show
SUBDIR += hs-c2hs
@@ -816,6 +818,7 @@
SUBDIR += hs-conduit-combinators
SUBDIR += hs-conduit-extra
SUBDIR += hs-configurator
+ SUBDIR += hs-constraints
SUBDIR += hs-convertible
SUBDIR += hs-cpphs
SUBDIR += hs-darcs
@@ -826,6 +829,7 @@
SUBDIR += hs-data-default-instances-dlist
SUBDIR += hs-data-default-instances-old-locale
SUBDIR += hs-data-hash
+ SUBDIR += hs-data-ordlist
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
@@ -833,6 +837,7 @@
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
SUBDIR += hs-dlist-instances
+ SUBDIR += hs-easy-file
SUBDIR += hs-edit-distance
SUBDIR += hs-either
SUBDIR += hs-enclosed-exceptions
@@ -841,6 +846,7 @@
SUBDIR += hs-errors
SUBDIR += hs-exceptions
SUBDIR += hs-extensible-exceptions
+ SUBDIR += hs-extra
SUBDIR += hs-fast-logger
SUBDIR += hs-fgl
SUBDIR += hs-file-embed
@@ -850,35 +856,41 @@
SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
SUBDIR += hs-generic-deriving
- SUBDIR += hs-geniplate
+ SUBDIR += hs-geniplate-mirror
SUBDIR += hs-ghc-events
SUBDIR += hs-ghc-mtl
SUBDIR += hs-ghc-paths
SUBDIR += hs-gio
SUBDIR += hs-git-annex
- SUBDIR += hs-glade
SUBDIR += hs-glib
SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
+ SUBDIR += hs-haddock-api
SUBDIR += hs-haddock-library
SUBDIR += hs-happy
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
SUBDIR += hs-hashtables
- SUBDIR += hs-haskell-platform
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
SUBDIR += hs-hasktags
SUBDIR += hs-hastache
+ SUBDIR += hs-hex
SUBDIR += hs-hinotify
SUBDIR += hs-hint
SUBDIR += hs-hlibev
SUBDIR += hs-hlint
SUBDIR += hs-hoogle
+ SUBDIR += hs-hourglass
+ SUBDIR += hs-hsb2hs
SUBDIR += hs-hslogger
SUBDIR += hs-hslua
SUBDIR += hs-hspec
+ SUBDIR += hs-hspec-core
+ SUBDIR += hs-hspec-discover
SUBDIR += hs-hspec-expectations
+ SUBDIR += hs-js-flot
+ SUBDIR += hs-js-jquery
SUBDIR += hs-keys
SUBDIR += hs-kqueue
SUBDIR += hs-language-c
@@ -886,8 +898,11 @@
SUBDIR += hs-largeword
SUBDIR += hs-lazysmallcheck
SUBDIR += hs-lens
+ SUBDIR += hs-lifted-async
SUBDIR += hs-lifted-base
SUBDIR += hs-logict
+ SUBDIR += hs-map-syntax
+ SUBDIR += hs-memory
SUBDIR += hs-mmap
SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
@@ -900,17 +915,21 @@
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
+ SUBDIR += hs-mutable-containers
+ SUBDIR += hs-newtype
+ SUBDIR += hs-old-locale
+ SUBDIR += hs-old-time
SUBDIR += hs-optparse-applicative
SUBDIR += hs-parallel
SUBDIR += hs-pcre-light
SUBDIR += hs-prelude-extras
+ SUBDIR += hs-preprocessor-tools
SUBDIR += hs-prettyclass
SUBDIR += hs-primitive
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
SUBDIR += hs-quickcheck-io
SUBDIR += hs-random
- SUBDIR += hs-ranges
SUBDIR += hs-readline
SUBDIR += hs-reflection
SUBDIR += hs-resource-pool
@@ -939,13 +958,13 @@
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-time-locale-compat
SUBDIR += hs-timezone-olson
SUBDIR += hs-timezone-series
SUBDIR += hs-transformers-base
@@ -962,6 +981,7 @@
SUBDIR += hs-uuagc-bootstrap
SUBDIR += hs-uuagc-cabal
SUBDIR += hs-uuid
+ SUBDIR += hs-uuid-types
SUBDIR += hs-uulib
SUBDIR += hs-vault
SUBDIR += hs-vector
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index af88fa7a6aa..84eafee9333 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= BNFC
-PORTVERSION= 2.6.0.3
-PORTREVISION= 8
+PORTVERSION= 2.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +16,5 @@ 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-BNFC/distinfo b/devel/hs-BNFC/distinfo
index e9bab0aa265..b8879a264d2 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/BNFC-2.6.0.3.tar.gz) = 583aeac56d9444ba191501936c290136ba37b95dbee7d5a965d1ee4935cf6844
-SIZE (cabal/BNFC-2.6.0.3.tar.gz) = 202928
+SHA256 (cabal/BNFC-2.8.tar.gz) = 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34
+SIZE (cabal/BNFC-2.8.tar.gz) = 183591
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 91e98547d0b..7ec21fea8b6 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index faa46cd23da..1e079675c17 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.2.1.tar.gz) = 994a6d08702c248595b44405e39a1619925e03b2c1d182faaaa408c6594c206e
-SIZE (cabal/Boolean-0.2.1.tar.gz) = 6551
+SHA256 (cabal/Boolean-0.2.3.tar.gz) = f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3
+SIZE (cabal/Boolean-0.2.3.tar.gz) = 6608
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index 131bed2f97d..c8119ab585f 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 70e100d1a23..4c6a953287f 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= ConfigFile
-PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Configuration file reading and writing
-LICENSE= LGPL21
+LICENSE= BSD3CLAUSE
USE_CABAL= MissingH>=1.0.0 mtl parsec
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index 00591e70c9d..e680782c4d1 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ConfigFile-1.1.2.tar.gz) = 38f6df24926c4952af198cbc9e45e72a62af73adeef097767889e9321bca2d76
-SIZE (cabal/ConfigFile-1.1.2.tar.gz) = 28947
+SHA256 (cabal/ConfigFile-1.1.4.tar.gz) = ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514
+SIZE (cabal/ConfigFile-1.1.4.tar.gz) = 28969
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-DrIFT/Makefile
index 8f15319c7ed..d95e146dd20 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-DrIFT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DrIFT
PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Program to derive type class instances
LICENSE= BSD3CLAUSE
-USE_CABAL= random
+USE_CABAL= old-time random
EXECUTABLE= DrIFT drift-ghc
diff --git a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
new file mode 100644
index 00000000000..19cfa80fac8
--- /dev/null
+++ b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
@@ -0,0 +1,25 @@
+--- src/ParseLib2.hs.orig 2013-11-11 15:22:00 UTC
++++ src/ParseLib2.hs
+@@ -32,6 +32,7 @@ module ParseLib2
+ opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
+
+ import Data.Char
++import Control.Applicative (Alternative, empty, (<|>))
+ import Control.Monad
+
+ infixr 5 +++
+@@ -62,6 +63,14 @@ instance MonadPlus Parser where
+ -- mplus :: Parser a -> Parser a -> Parser a
+ (P p) `mplus` (P q) = P (\pos inp -> (p pos inp ++ q pos inp))
+
++instance Applicative Parser where
++ pure = return
++ (<*>) = ap
++
++instance Alternative Parser where
++ empty = mzero
++ (<|>) = mplus
++
+ -- bits which donn't fit into Haskell's type classes just yet :-(
+
+ env :: Parser Pos
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index b1770a38513..9897d6cf146 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Glob
PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Glob/files/patch-Glob.cabal b/devel/hs-Glob/files/patch-Glob.cabal
new file mode 100644
index 00000000000..70ad0f1072e
--- /dev/null
+++ b/devel/hs-Glob/files/patch-Glob.cabal
@@ -0,0 +1,11 @@
+--- Glob.cabal.orig 2014-05-08 18:30:42 UTC
++++ Glob.cabal
+@@ -28,7 +28,7 @@ Library
+ , containers < 0.6
+ , directory < 1.3
+ , dlist >= 0.4 && < 0.8
+- , filepath >= 1.1 && < 1.4
++ , filepath >= 1.1 && < 1.5
+ , transformers >= 0.2 && < 0.6
+
+ if os(windows)
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 0ea1145739d..3c35bfea1d7 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HUnit
PORTVERSION= 1.2.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 22293a3fe58..b32219be07d 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 3425de3ff55..1dec721ed58 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= List
-PORTVERSION= 0.5.1
-PORTREVISION= 8
+PORTVERSION= 0.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index 3defb9015b0..4ce3b381a90 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/List-0.5.1.tar.gz) = 3778f7695dbd2b75840724a1dea0430801d65242117df3815e6500281155f3c1
-SIZE (cabal/List-0.5.1.tar.gz) = 6234
+SHA256 (cabal/List-0.5.2.tar.gz) = 27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac
+SIZE (cabal/List-0.5.2.tar.gz) = 6242
diff --git a/devel/hs-MaybeT/distinfo b/devel/hs-MaybeT/distinfo
deleted file mode 100644
index 29fcb61095c..00000000000
--- a/devel/hs-MaybeT/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MaybeT-0.1.2.tar.gz) = 995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632
-SIZE (cabal/MaybeT-0.1.2.tar.gz) = 3206
diff --git a/devel/hs-MaybeT/pkg-descr b/devel/hs-MaybeT/pkg-descr
deleted file mode 100644
index d608e29182a..00000000000
--- a/devel/hs-MaybeT/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Support for computations with failures.
-
-WWW: http://hackage.haskell.org/package/MaybeT
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 5f2fb3cd200..a94f819844d 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MemoTrie
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index a0f3a6b2235..6566861950c 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= MissingH
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Large utility library
LICENSE= BSD3CLAUSE
-USE_CABAL= hslogger HUnit mtl network parsec random regex-compat
+USE_CABAL= hslogger HUnit mtl network old-time parsec random regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index d07a86e81d9..5093588314d 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MissingH-1.2.1.0.tar.gz) = 5aafea2d9e8e64644c8b7b6c149bb74422501aaff1aa3d422f838741a1fbf723
-SIZE (cabal/MissingH-1.2.1.0.tar.gz) = 116445
+SHA256 (cabal/MissingH-1.3.0.1.tar.gz) = ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3
+SIZE (cabal/MissingH-1.3.0.1.tar.gz) = 116812
diff --git a/devel/hs-MissingH/pkg-descr b/devel/hs-MissingH/pkg-descr
index 132fdd8377f..1eba7e5cfb0 100644
--- a/devel/hs-MissingH/pkg-descr
+++ b/devel/hs-MissingH/pkg-descr
@@ -1,5 +1,5 @@
-MissingH is a library of all sorts of utility functions for
-Haskell programmers. It is written in pure Haskell and thus
-should be extremely portable and easy to use.
+MissingH is a library of all sorts of utility functions for Haskell
+programmers. It is written in pure Haskell and thus should be extremely
+portable and easy to use.
WWW: http://software.complete.org/missingh
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 994f983e10e..6a337d038cc 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MonadCatchIO-mtl
PORTVERSION= 0.3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,7 @@ COMMENT= Monad-transformer version of the Control.Exception module
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0 \
- MonadCatchIO-transformers<=0.3.1.1
+USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
new file mode 100644
index 00000000000..987af20bcd8
--- /dev/null
+++ b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
@@ -0,0 +1,11 @@
+--- MonadCatchIO-mtl.cabal.orig 2014-01-04 20:24:53 UTC
++++ MonadCatchIO-mtl.cabal
+@@ -18,7 +18,7 @@ build-type: Simple
+ tested-with: GHC==6.12.3, GHC==7.0.3, GHC==7.2.1, GHC==7.4.2, GHC==7.6.0
+
+ Library
+- build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.0
++ build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.*
+ extensions: PackageImports
+
+ exposed-modules: Control.Monad.CatchIO
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index 54f8df1aac9..cbc9815e0cc 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= MonadCatchIO-transformers
-PORTVERSION= 0.3.1.0
-PORTREVISION= 1
+PORTVERSION= 0.3.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
index edba83884d1..d18607148b8 100644
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ b/devel/hs-MonadCatchIO-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = b62beda19ba6bb407113e5ad7b6fa63bb77d24b83e8d09fd0a48a14995f7bae4
-SIZE (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = 4530
+SHA256 (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd
+SIZE (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 4526
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index 312259c8b85..eb2e52ed439 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.1.13
-PORTREVISION= 1
+PORTVERSION= 0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random-number generation monad
-USE_CABAL= mtl random
+USE_CABAL= mtl random transformers-compat>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index 8c3fe557f96..ab6bac38276 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadRandom-0.1.13.tar.gz) = d3ae5f7c2e9703a31e4b81d4634457073105327a30be373c0554d0a5ab1721de
-SIZE (cabal/MonadRandom-0.1.13.tar.gz) = 4465
+SHA256 (cabal/MonadRandom-0.4.tar.gz) = d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93
+SIZE (cabal/MonadRandom-0.4.tar.gz) = 5064
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 4f0f606dc25..968768c567a 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ObjectName
-PORTVERSION= 1.0.0.0
-PORTREVISION= 14
+PORTVERSION= 1.1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index 978ef01c8d4..ecc51246047 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ObjectName-1.0.0.0.tar.gz) = 358b7185d1f3e414a4a28155a93e15b433833967542f81354e50d0a88052217b
-SIZE (cabal/ObjectName-1.0.0.0.tar.gz) = 1843
+SHA256 (cabal/ObjectName-1.1.0.0.tar.gz) = afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e
+SIZE (cabal/ObjectName-1.1.0.0.tar.gz) = 2583
diff --git a/devel/hs-ObjectName/pkg-descr b/devel/hs-ObjectName/pkg-descr
index 3dda124ae15..36b626faa37 100644
--- a/devel/hs-ObjectName/pkg-descr
+++ b/devel/hs-ObjectName/pkg-descr
@@ -2,4 +2,4 @@ This tiny Haskell package contains the class ObjectName, which corresponds to
the general notion of explicitly handled identifiers for API objects, e.g. a
texture object name in OpenGL or a buffer object name in OpenAL.
-WWW: http://www.haskell.org/HOpenGL/
+WWW: https://github.com/svenpanne/ObjectName
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d07c5ba97b3..d1e061850da 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 6cb9901c9b4..fe1fad80de3 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.6
-PORTREVISION= 6
+PORTVERSION= 2.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Automatic testing of Haskell programs
LICENSE= BSD3CLAUSE
-USE_CABAL= random
+USE_CABAL= extensible-exceptions random tf-random>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 25296515a92..87c1a1a57ee 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/QuickCheck-2.6.tar.gz) = 8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d
-SIZE (cabal/QuickCheck-2.6.tar.gz) = 26466
+SHA256 (cabal/QuickCheck-2.8.1.tar.gz) = 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b
+SIZE (cabal/QuickCheck-2.8.1.tar.gz) = 38999
diff --git a/devel/hs-QuickCheck/pkg-descr b/devel/hs-QuickCheck/pkg-descr
index ad7ef2bf497..5664e388de1 100644
--- a/devel/hs-QuickCheck/pkg-descr
+++ b/devel/hs-QuickCheck/pkg-descr
@@ -9,4 +9,4 @@ the QuickCheck library. QuickCheck provides combinators to define
properties, observe the distribution of test data, and define test data
generators.
-WWW: http://code.haskell.org/QuickCheck
+WWW: https://github.com/nick8325/quickcheck
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 831b6f11893..146a4d2074c 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ReadArgs
-PORTVERSION= 1.2.1
-PORTREVISION= 8
+PORTVERSION= 1.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
index dd9187fefd3..37d4784294c 100644
--- a/devel/hs-ReadArgs/distinfo
+++ b/devel/hs-ReadArgs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ReadArgs-1.2.1.tar.gz) = dbae7a2b77bc4d2acb159e946d99cda5234e07020e295fe815ce8383ad792f25
-SIZE (cabal/ReadArgs-1.2.1.tar.gz) = 5102
+SHA256 (cabal/ReadArgs-1.2.2.tar.gz) = 47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec
+SIZE (cabal/ReadArgs-1.2.2.tar.gz) = 5102
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index 044bbc2d1aa..25128f80d3f 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= STMonadTrans
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
index d032299a328..6b2f9f9399e 100644
--- a/devel/hs-STMonadTrans/distinfo
+++ b/devel/hs-STMonadTrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/STMonadTrans-0.3.2.tar.gz) = 70be84c06ce312a56dbf37d674ad709700850b7fd4cb55198d7ae45a985e85b2
-SIZE (cabal/STMonadTrans-0.3.2.tar.gz) = 4792
+SHA256 (cabal/STMonadTrans-0.3.3.tar.gz) = d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315
+SIZE (cabal/STMonadTrans-0.3.3.tar.gz) = 4820
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 9261c258c10..09e5c1586ef 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 8eb695171db..356124bdf46 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= ShellCheck
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.8
CATEGORIES= devel haskell
MAINTAINER= luca.pizzamiglio@gmail.com
COMMENT= Shell script analysis tool
-LICENSE= AGPLv3
+LICENSE= GPLv3
-USE_CABAL= json>=0.7 parsec QuickCheck>=2.6 regex-posix>=0.95.2 \
- regex-compat>=0.95.1 tf-random>=0.5
+USE_CABAL= json mtl parsec QuickCheck>=2.7.4 regex-tdfa
EXECUTABLE= shellcheck
diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo
index 31b621660d6..d50766e71b3 100644
--- a/devel/hs-ShellCheck/distinfo
+++ b/devel/hs-ShellCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ShellCheck-0.3.5.tar.gz) = 9289fda0b3683f4e7c2c003f875a9e308897368fe956ed924a76cafc2fdc9974
-SIZE (cabal/ShellCheck-0.3.5.tar.gz) = 77173
+SHA256 (cabal/ShellCheck-0.3.8.tar.gz) = c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a
+SIZE (cabal/ShellCheck-0.3.8.tar.gz) = 86202
diff --git a/devel/hs-ShellCheck/files/patch-ShellCheck.cabal b/devel/hs-ShellCheck/files/patch-ShellCheck.cabal
deleted file mode 100644
index 0783474e383..00000000000
--- a/devel/hs-ShellCheck/files/patch-ShellCheck.cabal
+++ /dev/null
@@ -1,28 +0,0 @@
---- ShellCheck.cabal.orig 2014-11-10 01:30:00.000000000 +0100
-+++ ShellCheck.cabal 2015-02-03 18:19:38.355225341 +0100
-@@ -42,7 +42,7 @@
- mtl,
- parsec,
- regex-compat,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- exposed-modules:
- ShellCheck.Analytics
- ShellCheck.AST
-@@ -64,7 +64,7 @@
- parsec,
- regex-compat,
- transformers,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- main-is: shellcheck.hs
-
- test-suite test-shellcheck
-@@ -79,6 +79,6 @@
- parsec,
- regex-compat,
- transformers,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- main-is: test/shellcheck.hs
-
diff --git a/devel/hs-ranges/Makefile b/devel/hs-StateVar/Makefile
index b6ef5563348..1bbf8dd2016 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
-PORTNAME= ranges
-PORTVERSION= 0.2.4
-PORTREVISION= 11
+PORTNAME= StateVar
+PORTVERSION= 1.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Ranges and various functions on them
+COMMENT= State variables
LICENSE= BSD3CLAUSE
+USE_CABAL= stm>=2.0
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
new file mode 100644
index 00000000000..584800b0abf
--- /dev/null
+++ b/devel/hs-StateVar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/StateVar-1.1.0.1.tar.gz) = 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa
+SIZE (cabal/StateVar-1.1.0.1.tar.gz) = 4462
diff --git a/devel/hs-StateVar/pkg-descr b/devel/hs-StateVar/pkg-descr
new file mode 100644
index 00000000000..2ebca92925f
--- /dev/null
+++ b/devel/hs-StateVar/pkg-descr
@@ -0,0 +1,4 @@
+This package contains state variables, which are references in the IO monad,
+like IORefs or parts of the OpenGL state.
+
+WWW: https://github.com/haskell-opengl/StateVar
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 1ab08f957a0..a1a634bb31d 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Stream
-PORTVERSION= 0.4.7.1
-PORTREVISION= 1
+PORTVERSION= 0.4.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 26503246952..04b62c912e1 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Stream-0.4.7.1.tar.gz) = c3779c9c848f7f64daa69289d095c5f7a9d4cd50bfcc7aac4892b9cdaf810022
-SIZE (cabal/Stream-0.4.7.1.tar.gz) = 6208
+SHA256 (cabal/Stream-0.4.7.2.tar.gz) = 990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1
+SIZE (cabal/Stream-0.4.7.2.tar.gz) = 6543
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 82265d6f9a2..4c9b28156e6 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -3,7 +3,7 @@
PORTNAME= TypeCompose
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 251b6dc881b..7ac40b058d8 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= random
-FLAGS_DEFINE= USECAS
-
-USECAS_DESC= Use hardware compare-and-swap
-USECAS_FLAG_ENABLE= useCAS
-USECAS_FLAG_CABAL= atomic-primops>=0.5.0.2
+FLAGS_DISABLE= useCAS
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index 2175c9194c4..f0b52453e55 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 4f135c3558b..2d421bb0b27 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 81d7f9fed20..9f24f99262f 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,12 +1,12 @@
---- ./activehs-base.cabal.orig 2012-09-11 09:56:08.000000000 +0200
-+++ ./activehs-base.cabal 2014-07-12 18:56:46.000000000 +0200
-@@ -21,7 +21,7 @@
+--- activehs-base.cabal.orig 2012-09-11 07:56:08 UTC
++++ activehs-base.cabal
+@@ -21,7 +21,7 @@ Library
Exposed-Modules:
ActiveHs.Base
Build-Depends:
- base >= 4.0 && < 4.7,
- QuickCheck >= 2.4 && < 2.6
-+ base >= 4.0 && < 4.8,
-+ QuickCheck >= 2.4 && < 2.7
++ base >= 4.0 && < 4.9,
++ QuickCheck >= 2.4 && < 2.9
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 1bcecfe44aa..48134fc0ad1 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.1.3
-PORTREVISION= 1
+PORTVERSION= 3.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 2fb8b8d7a09..be00f43be4a 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/alex-3.1.3.tar.gz) = 8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92
-SIZE (cabal/alex-3.1.3.tar.gz) = 99868
+SHA256 (cabal/alex-3.1.4.tar.gz) = d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
+SIZE (cabal/alex-3.1.4.tar.gz) = 101827
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index e208e0fab8c..400c6373755 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6.1.1
-PORTREVISION= 1
+PORTVERSION= 0.6.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index ab587274127..718b46e311b 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-terminal-0.6.1.1.tar.gz) = 9133a6dc6f99fff3f7d004aa400f4b40424c8999fcd392674d939f2fee65ed1a
-SIZE (cabal/ansi-terminal-0.6.1.1.tar.gz) = 14169
+SHA256 (cabal/ansi-terminal-0.6.2.1.tar.gz) = 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6
+SIZE (cabal/ansi-terminal-0.6.2.1.tar.gz) = 14652
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 967bdd462d7..d9fb74075c8 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.7.1
-PORTREVISION= 1
+PORTVERSION= 0.6.7.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= The Wadler/Leijen Pretty Printer for colored ANSI terminal output
+COMMENT= Wadler/Leijen Pretty Printer for colored ANSI terminal output
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index 54ada87882a..fed41c5cffc 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.7.1.tar.gz) = d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af
-SIZE (cabal/ansi-wl-pprint-0.6.7.1.tar.gz) = 14862
+SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
+SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
diff --git a/devel/hs-ansi-wl-pprint/pkg-descr b/devel/hs-ansi-wl-pprint/pkg-descr
index d50b3ea2a6f..9d46eced388 100644
--- a/devel/hs-ansi-wl-pprint/pkg-descr
+++ b/devel/hs-ansi-wl-pprint/pkg-descr
@@ -1,5 +1,5 @@
This is a pretty printing library based on Wadler's paper "A Prettier
-Printer". It has been enhanced with support for ANSI terminal colored
+Printer". It has been enhanced with support for ANSI terminal colored
output using the ansi-terminal package.
WWW: http://github.com/batterseapower/ansi-wl-pprint
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 6bec6c61c2b..aa861a9d666 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 71e04c9f91f..ebef297582c 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
new file mode 100644
index 00000000000..2ead06800a2
--- /dev/null
+++ b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
@@ -0,0 +1,11 @@
+--- Data/ASN1/Parse.hs.orig 2012-08-28 06:24:31 UTC
++++ Data/ASN1/Parse.hs
+@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
+
+ -- | Parse ASN1 Monad
+ newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
+- deriving (Functor, Monad, MonadError String)
++ deriving (Functor, Applicative, Monad, MonadError String)
+
+ -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
+ runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index ed5163b38cd..1eec53a2bd0 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-encoding
-PORTVERSION= 0.8.1.3
-PORTREVISION= 1
+PORTVERSION= 0.9.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ 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
+USE_CABAL= asn1-types>=0.3.0 hourglass>=0.2.6 mtl
.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
index 4cbf02a2cfd..a96bb12cd1e 100644
--- a/devel/hs-asn1-encoding/distinfo
+++ b/devel/hs-asn1-encoding/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-encoding-0.8.1.3.tar.gz) = d1a26d9e2df6f0c815ff347093b20e06a21feeaee2f9204af7aeb797ba541900
-SIZE (cabal/asn1-encoding-0.8.1.3.tar.gz) = 16099
+SHA256 (cabal/asn1-encoding-0.9.0.tar.gz) = 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b
+SIZE (cabal/asn1-encoding-0.9.0.tar.gz) = 15997
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index 9d72a74512a..e341cd39d2b 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-parse
-PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simple monadic parser for ASN1 stream types
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 mtl text>=0.11
+USE_CABAL= asn1-encoding>=0.9 asn1-types>=0.3 mtl
.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
index 24f8b3b2168..1f5f1e11179 100644
--- a/devel/hs-asn1-parse/distinfo
+++ b/devel/hs-asn1-parse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-parse-0.8.1.tar.gz) = 09567b3f06d428a194fe8132acf002f8dbfb8694a113dce14edd79a54a5d3508
-SIZE (cabal/asn1-parse-0.8.1.tar.gz) = 2724
+SHA256 (cabal/asn1-parse-0.9.1.tar.gz) = e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de
+SIZE (cabal/asn1-parse-0.9.1.tar.gz) = 2785
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index 62af2832fed..e3d8a821761 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-types
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= ASN.1 types
LICENSE= BSD3CLAUSE
+USE_CABAL= hourglass
+
.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 8de841f5efb..784bf5efbed 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-types-0.2.3.tar.gz) = 84c3778b36978f673fe916b325759ff9ac2294900c052190afd868fa8d84bfb1
-SIZE (cabal/asn1-types-0.2.3.tar.gz) = 5411
+SHA256 (cabal/asn1-types-0.3.0.tar.gz) = b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa
+SIZE (cabal/asn1-types-0.3.0.tar.gz) = 5391
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index 3080730f36f..0477a9e43e8 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.1.5
-PORTREVISION= 1
+PORTVERSION= 2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index eb7776b972e..ff48c0540e0 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/async-2.0.1.5.tar.gz) = cd13ac558f4f63e567100805770648e89307a3210852b17038c9be4fcc3aa83c
-SIZE (cabal/async-2.0.1.5.tar.gz) = 8350
+SHA256 (cabal/async-2.0.2.tar.gz) = db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b
+SIZE (cabal/async-2.0.2.tar.gz) = 8565
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index e60e8a71d68..17672a1cee0 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= atomic-primops
-PORTVERSION= 0.6.0.6
-PORTREVISION= 1
+PORTVERSION= 0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index 6fd81c03a08..8ec74aa1c2b 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/atomic-primops-0.6.0.6.tar.gz) = 8bf1532162ec95f68de7c84d8245ed2afdb41ceb3b7084dc4a3f94949ad12982
-SIZE (cabal/atomic-primops-0.6.0.6.tar.gz) = 30305
+SHA256 (cabal/atomic-primops-0.8.tar.gz) = c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471
+SIZE (cabal/atomic-primops-0.8.tar.gz) = 33588
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index 96dce5a0ce9..b0219c06daa 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= auto-update
-PORTVERSION= 0.1.0.0
-PORTREVISION= 1
+PORTVERSION= 0.1.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
index d13525953f8..5e052685046 100644
--- a/devel/hs-auto-update/distinfo
+++ b/devel/hs-auto-update/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/auto-update-0.1.0.0.tar.gz) = 1430f24db953b022fa2d425ec3c77ecc2211464300db6aad1b67c4cb19530a00
-SIZE (cabal/auto-update-0.1.0.0.tar.gz) = 4018
+SHA256 (cabal/auto-update-0.1.2.2.tar.gz) = 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db
+SIZE (cabal/auto-update-0.1.2.2.tar.gz) = 6651
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
new file mode 100644
index 00000000000..4bda66211d9
--- /dev/null
+++ b/devel/hs-base-orphans/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= base-orphans
+PORTVERSION= 0.4.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Backwards-compatible orphan instances for base
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
new file mode 100644
index 00000000000..96924c04e28
--- /dev/null
+++ b/devel/hs-base-orphans/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/base-orphans-0.4.4.tar.gz) = f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42
+SIZE (cabal/base-orphans-0.4.4.tar.gz) = 13068
diff --git a/devel/hs-base-orphans/pkg-descr b/devel/hs-base-orphans/pkg-descr
new file mode 100644
index 00000000000..fb5d2787f1d
--- /dev/null
+++ b/devel/hs-base-orphans/pkg-descr
@@ -0,0 +1,6 @@
+base-orphans defines orphan instances that mimic instances available in
+later versions of base to a wider (older) range of compilers.
+base-orphans does not export anything except the orphan instances
+themselves and complements.
+
+WWW: https://github.com/haskell-compat/base-orphans#readme
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 2efbbc49cce..66fed67ce04 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 4c38126b305..781e32c8fd3 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 718bc0d03f2..3e577f7abf2 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index c8ab94d07c5..ac37d873a53 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Enhanced core prelude; a common foundation for alternate preludes
LICENSE= MIT
-USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe system-filepath>=0.4 \
- text unordered-containers vector
+USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe 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 527c7426e52..a1e555b0639 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.8.tar.gz) = effa8e5982753ddace4ccfc6f387b81395ec7e14ec0e6d0cc93660a09bb6dc53
-SIZE (cabal/basic-prelude-0.3.8.tar.gz) = 4887
+SHA256 (cabal/basic-prelude-0.5.0.tar.gz) = d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1
+SIZE (cabal/basic-prelude-0.5.0.tar.gz) = 5743
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 2a53c30f560..95a22f469d7 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 4.1.1.1
-PORTREVISION= 1
+PORTVERSION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Bifunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroupoids semigroups>=0.8.3.1 tagged>=0.4.4
+USE_CABAL= semigroups>=0.8.3.1 tagged>=0.7.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index c538d89044a..29f009f021b 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bifunctors-4.1.1.1.tar.gz) = 115fd3a4b592ec6de09c6e2311d365968e0e6669745a96943352357bbdc1612c
-SIZE (cabal/bifunctors-4.1.1.1.tar.gz) = 10310
+SHA256 (cabal/bifunctors-5.tar.gz) = 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d
+SIZE (cabal/bifunctors-5.tar.gz) = 10562
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 960a9c5bc76..6d852cd3c6b 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 87ae14936e3..5681e08b168 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder-enumerator
-PORTVERSION= 0.2.0.6
-PORTREVISION= 1
+PORTVERSION= 0.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Enumeratees for the incremental conversion of builders to bytestrings
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1
+USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 \
+ streaming-commons>=0.1.10
.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 4dee74024e9..03c89197465 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.6.tar.gz) = d7cfd62b51b5c4ec82609f791a191f12dfed25476b10888b216bc69d1b0abc5d
-SIZE (cabal/blaze-builder-enumerator-0.2.0.6.tar.gz) = 3785
+SHA256 (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96
+SIZE (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 4248
diff --git a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
new file mode 100644
index 00000000000..2cc38b10c15
--- /dev/null
+++ b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
@@ -0,0 +1,12 @@
+--- blaze-builder-enumerator.cabal.orig 2015-04-01 17:10:57 UTC
++++ blaze-builder-enumerator.cabal
+@@ -49,8 +49,7 @@ Library
+
+ if flag(newbuilder)
+ Build-depends:
+- bytestring-builder >= 0.10.4 && <0.11
+- , blaze-builder >= 0.2.1.4 && <0.5
++ blaze-builder >= 0.2.1.4 && <0.5
+ else
+ Build-depends:
+ blaze-builder >= 0.3 && <0.4
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 8c6ba8f1fad..d09ea0698f1 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.3.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 107715379cf..2f75f60ae43 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-0.3.3.2.tar.gz) = 80b43d4a012a513c3c012de0f76858e74765e079c58d42cd6010fc185478110d
-SIZE (cabal/blaze-builder-0.3.3.2.tar.gz) = 67371
+SHA256 (cabal/blaze-builder-0.4.0.1.tar.gz) = c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5
+SIZE (cabal/blaze-builder-0.4.0.1.tar.gz) = 57113
diff --git a/devel/hs-blaze-builder/pkg-descr b/devel/hs-blaze-builder/pkg-descr
index b0596e949b8..3dea556895f 100644
--- a/devel/hs-blaze-builder/pkg-descr
+++ b/devel/hs-blaze-builder/pkg-descr
@@ -6,4 +6,4 @@ prefetching in later processing steps (e.g. compression) and reduces the sytem
call overhead when writing the resulting lazy bytestring to a file or sending
it over the network.
-WWW: http://github.com/meiersi/blaze-builder
+WWW: http://github.com/lpsmith/blaze-builder
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index 74c4836e091..e34329a2fa7 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-textual
-PORTVERSION= 0.2.0.9
-PORTREVISION= 1
+PORTVERSION= 0.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Fast rendering of common datatypes
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 text>=0.11.0.2 vector
+USE_CABAL= blaze-builder>=0.2.1.4 double-conversion>=0.2.0.1 \
+ old-locale text>=0.11.0.2 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index ee3585b1d16..08620f567b4 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-textual-0.2.0.9.tar.gz) = c005e4e8e33b696b7b127384e96885c1e7e66d0ee5b064bbeb330a66e50d9ebf
-SIZE (cabal/blaze-textual-0.2.0.9.tar.gz) = 6848
+SHA256 (cabal/blaze-textual-0.2.1.0.tar.gz) = 1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d
+SIZE (cabal/blaze-textual-0.2.1.0.tar.gz) = 6914
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index f472f5fe82f..99228152485 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bloomfilter
-PORTVERSION= 2.0.0.0
-PORTREVISION= 1
+PORTVERSION= 2.0.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index 417ce9e01d5..85c94c7fff6 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bloomfilter-2.0.0.0.tar.gz) = ee1cff0f5ad4afd238e169277ed4467ccf02c81429de1a22d5dec65c2272d11d
-SIZE (cabal/bloomfilter-2.0.0.0.tar.gz) = 22090
+SHA256 (cabal/bloomfilter-2.0.1.0.tar.gz) = 6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f
+SIZE (cabal/bloomfilter-2.0.1.0.tar.gz) = 22100
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index a8f60775230..e77118f2047 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= boxes
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index 8932bb3eb16..e6d86386416 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/boxes-0.1.3.tar.gz) = 78fe880778f3ee427b0ab4a4d6e7ddd194e7030d711d9ba491c8d4d3811c2aea
-SIZE (cabal/boxes-0.1.3.tar.gz) = 5347
+SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8
+SIZE (cabal/boxes-0.1.4.tar.gz) = 6481
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 3d23d629a3b..e9240b6062b 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index cfe0bfa25af..543bb55fcf8 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 83968bad93c..0c6670728d2 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index ea57dd6a26b..adf7ab389d0 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= bytestring-lexing
-PORTVERSION= 0.4.3.2
+PORTVERSION= 0.5.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse and produce literals from strict or lazy bytestrings
-LICENSE= BSD3CLAUSE
+LICENSE= BSD2CLAUSE
USE_ALEX= yes
diff --git a/devel/hs-bytestring-lexing/distinfo b/devel/hs-bytestring-lexing/distinfo
index fd3aa820504..5ad031818cf 100644
--- a/devel/hs-bytestring-lexing/distinfo
+++ b/devel/hs-bytestring-lexing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bytestring-lexing-0.4.3.2.tar.gz) = 05b0c59969e70b9e92bfcfaa0552fa0ea54f3103af670589e5c898206c78d527
-SIZE (cabal/bytestring-lexing-0.4.3.2.tar.gz) = 15975
+SHA256 (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73
+SIZE (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 13859
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
new file mode 100644
index 00000000000..c23b2e74085
--- /dev/null
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= bytestring-mmap
+PORTVERSION= 0.2.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Mmap support for strict ByteStrings
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-bytestring-mmap/distinfo b/devel/hs-bytestring-mmap/distinfo
new file mode 100644
index 00000000000..93a825b438c
--- /dev/null
+++ b/devel/hs-bytestring-mmap/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/bytestring-mmap-0.2.2.tar.gz) = 7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af
+SIZE (cabal/bytestring-mmap-0.2.2.tar.gz) = 7188
diff --git a/devel/hs-bytestring-mmap/pkg-descr b/devel/hs-bytestring-mmap/pkg-descr
new file mode 100644
index 00000000000..7d209482322
--- /dev/null
+++ b/devel/hs-bytestring-mmap/pkg-descr
@@ -0,0 +1,5 @@
+This library provides a wrapper to mmap(2), allowing files or devices to
+be lazily loaded into memory as strict or lazy ByteStrings, using the
+virtual memory subsystem to do on-demand loading.
+
+WWW: http://code.haskell.org/~dons/code/bytestring-mmap/
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index a9954ed90e9..0cb43c1f268 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index 3eb372057e8..ebb40e415b6 100644
--- a/devel/hs-bytestring-show/Makefile
+++ b/devel/hs-bytestring-show/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-show
PORTVERSION= 0.3.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 8fa69a87d18..96771a64507 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.17.2
-PORTREVISION= 1
+PORTVERSION= 0.26.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= C->Haskell FFI tool that gives some cross-language type safety
LICENSE= GPLv2
-USE_CABAL= language-c>=0.4.2
+USE_CABAL= dlist language-c>=0.4.7 shelly>=1.0 text yaml>=0.8
XMLDOCS= doc/users_guide:html
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index a1a3c78d390..9c6f117e398 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/c2hs-0.17.2.tar.gz) = b32ff232cf59d41ed875579400f95661bf5a194b94ccf4ea935315df7e0433f7
-SIZE (cabal/c2hs-0.17.2.tar.gz) = 167739
+SHA256 (cabal/c2hs-0.26.1.tar.gz) = f0c491cca64a9d5c14eb1ea926785642b2dbbaed03144ee2e1d8d47c60985c65
+SIZE (cabal/c2hs-0.26.1.tar.gz) = 203194
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index f30c7b85986..4b181195025 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.18.0.5
-PORTREVISION= 1
+PORTVERSION= 1.22.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD3CLAUSE
-USE_CABAL= network>=1 random>=1 HTTP>=4000.0.8 stm>=2.0 zlib>=0.5.3
+USE_CABAL= HTTP>=4000.2.5 mtl>=2.0 network>=2.6 network-uri>=2.6 \
+ random>=1 stm>=2.0 zlib>=0.5.3
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 00ea6a095c5..3194cae126e 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cabal-install-1.18.0.5.tar.gz) = 477df8ef73916e8bc23c727280a1700939131a3e2809a057668c883b0b521782
-SIZE (cabal/cabal-install-1.18.0.5.tar.gz) = 256777
+SHA256 (cabal/cabal-install-1.22.6.0.tar.gz) = 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4
+SIZE (cabal/cabal-install-1.22.6.0.tar.gz) = 302564
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 19587c3226a..89157835235 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index c4dd560509d..2853ab1df6d 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cereal-0.4.0.1.tar.gz) = 5b0adf19d17c902ecd9e875587601294f9fb47027a43b37f1ff0f52e171be289
-SIZE (cabal/cereal-0.4.0.1.tar.gz) = 22305
+SHA256 (cabal/cereal-0.4.1.1.tar.gz) = df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097
+SIZE (cabal/cereal-0.4.1.1.tar.gz) = 22656
diff --git a/devel/hs-cereal/pkg-descr b/devel/hs-cereal/pkg-descr
index 9f81e45ddf2..99db36936ce 100644
--- a/devel/hs-cereal/pkg-descr
+++ b/devel/hs-cereal/pkg-descr
@@ -1,7 +1,5 @@
A binary serialization library, similar to binary, that introduces an
-isolate primitive for parser isolation, and replaces the asynchronous
-errors with a user-handleable Either type. Similar to binary in
-performance, but uses a strict ByteString instead of a lazy
-ByteString, thus restricting it to operating on finite inputs.
+isolate primitive for parser isolation, and labeled blocks for better
+error messages.
WWW: http://hackage.haskell.org/package/cereal
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 125c0f4f6f2..76af9e653c1 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index f9b2cfd2a3c..8f64068af05 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/checkers-0.3.2.tar.gz) = 239bae1d36304d0e95d52dbe7340ca6a723d644910375cae80727b4dca31116d
-SIZE (cabal/checkers-0.3.2.tar.gz) = 14895
+SHA256 (cabal/checkers-0.4.3.tar.gz) = c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567
+SIZE (cabal/checkers-0.4.3.tar.gz) = 15022
diff --git a/devel/hs-checkers/pkg-descr b/devel/hs-checkers/pkg-descr
index aa9255c7c28..70242e61f84 100644
--- a/devel/hs-checkers/pkg-descr
+++ b/devel/hs-checkers/pkg-descr
@@ -1,6 +1,6 @@
-Checkers wraps up the expected properties associated with various
-standard Haskell type classes as QuickCheck properties. Also some
-morphism properties. It also provides arbitrary instances and
-generator combinators for common data types.
+'Checkers' wraps up the expected properties associated with various
+standard type classes as QuickCheck properties. Also some morphism
+properties. It also provides arbitrary instances and generator
+combinators for common data types.
WWW: http://hackage.haskell.org/package/checkers
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index fbfe4b57ee0..e320c81b7e4 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= chunked-data
-PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ 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
+USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups 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
index e606f0a72b5..3f032bab4c1 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/chunked-data-0.1.0.1.tar.gz) = f9702c5ec695178a0de18e25dcb2e33d93ee5c7103098edbf0d0a6d86b3ab84d
-SIZE (cabal/chunked-data-0.1.0.1.tar.gz) = 4815
+SHA256 (cabal/chunked-data-0.2.0.tar.gz) = 9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272
+SIZE (cabal/chunked-data-0.2.0.tar.gz) = 4923
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 0ddd5e340d8..116e25f33b2 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.9.3
-PORTREVISION= 1
+PORTVERSION= 0.12.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Conduit instances for classy-prelude
LICENSE= MIT
-USE_CABAL= classy-prelude>=0.9.3 conduit>=1.0 conduit-combinators>=0.2.8 \
- monad-control resourcet system-fileio void
+USE_CABAL= classy-prelude>=0.12.0 conduit>=1.0 \
+ conduit-combinators>=0.2.8 monad-control resourcet 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 745e0a30d05..02e71d9dca3 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.9.3.tar.gz) = f9377aeb359bfaf6ef1374102cc907e4ac160028fb3624a3a1ddc6cf601d5473
-SIZE (cabal/classy-prelude-conduit-0.9.3.tar.gz) = 1607
+SHA256 (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7
+SIZE (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = 1598
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index f0751ad0fb5..5f910e7e2fb 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.12.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,10 @@ COMMENT= Typeclass-based Prelude
LICENSE= MIT
-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 \
+USE_CABAL= basic-prelude>=0.4 bifunctors chunked-data dlist>=0.7 \
+ enclosed-exceptions exceptions>=0.5 hashable lifted-base>=0.2 \
+ mono-traversable>=0.9.1 mtl mutable-containers>=0.3 primitive \
+ semigroups stm text time-locale-compat unordered-containers \
vector vector-instances
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index f15efdc9f28..166c94d5dd3 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.9.3.tar.gz) = 3bea9e24259a7c7e40ac4bf066673832ae73eca7ebf8738b8256e25a47ffc61b
-SIZE (cabal/classy-prelude-0.9.3.tar.gz) = 9343
+SHA256 (cabal/classy-prelude-0.12.1.1.tar.gz) = 670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13
+SIZE (cabal/classy-prelude-0.12.1.1.tar.gz) = 10273
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index dfa6aae4958..901c6e0a425 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.9
-PORTREVISION= 1
+PORTVERSION= 0.10.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index f4415ad60b2..13b88cc1930 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.10.9.tar.gz) = bea251c0e5e12017062b566ad2792e40ce192b4085febe5e315bc41c85b0f08a
-SIZE (cabal/cmdargs-0.10.9.tar.gz) = 63624
+SHA256 (cabal/cmdargs-0.10.13.tar.gz) = 66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e
+SIZE (cabal/cmdargs-0.10.13.tar.gz) = 64008
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index 0cb31d30406..c5f79cb5619 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-combinators
-PORTVERSION= 0.2.8.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,9 @@ 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 \
+ conduit>=1.2.2 conduit-extra>=1.1.1 monad-control \
mono-traversable>=0.4 mwc-random primitive resourcet \
- streaming-commons system-fileio system-filepath text \
- transformers-base unix-compat vector void
+ 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
index 752e302cdc6..b8915bbc420 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-combinators-0.2.8.2.tar.gz) = 0a06ff14ebad9778c1fe0f3bcc00aae587ce673a8553d2f99664c7e7c7184ff4
-SIZE (cabal/conduit-combinators-0.2.8.2.tar.gz) = 28058
+SHA256 (cabal/conduit-combinators-1.0.3.tar.gz) = 29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf
+SIZE (cabal/conduit-combinators-1.0.3.tar.gz) = 38172
diff --git a/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs b/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
deleted file mode 100644
index 460fc8fb343..00000000000
--- a/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./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
deleted file mode 100644
index 2e01c966d5a..00000000000
--- a/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./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-extra/Makefile b/devel/hs-conduit-extra/Makefile
index 94a201c2fb9..12683b586da 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-extra
-PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTVERSION= 1.1.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \
monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \
- streaming-commons>=0.1.4 text transformers-base
+ stm streaming-commons>=0.1.11 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
index 3c6d10869ed..50bdc241aee 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-extra-1.1.3.tar.gz) = 3d3ea5b83e913c8166eb94a4f2fd181e840fb8201f51f3865011d3db15bdfbbf
-SIZE (cabal/conduit-extra-1.1.3.tar.gz) = 25753
+SHA256 (cabal/conduit-extra-1.1.9.1.tar.gz) = 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3
+SIZE (cabal/conduit-extra-1.1.9.1.tar.gz) = 29571
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index 5a75a338ec1..b3376359f2a 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.1.7
-PORTREVISION= 1
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Streaming data processing library
LICENSE= MIT
-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
+USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph 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 5123f21b357..dcde7641cbd 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-1.1.7.tar.gz) = e6d7df3ac473dabfb66bc86372a0ad15db75a3b48f7553f4b72d2e7c74846276
-SIZE (cabal/conduit-1.1.7.tar.gz) = 30175
+SHA256 (cabal/conduit-1.2.5.tar.gz) = b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46
+SIZE (cabal/conduit-1.2.5.tar.gz) = 46805
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 7ec4ca5f971..e121c375bb3 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
new file mode 100644
index 00000000000..aa95bda4cf6
--- /dev/null
+++ b/devel/hs-constraints/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= constraints
+PORTVERSION= 0.4.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Constraint manipulation
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= newtype>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
new file mode 100644
index 00000000000..1bb8e26226e
--- /dev/null
+++ b/devel/hs-constraints/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/constraints-0.4.1.3.tar.gz) = dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0
+SIZE (cabal/constraints-0.4.1.3.tar.gz) = 7311
diff --git a/devel/hs-constraints/pkg-descr b/devel/hs-constraints/pkg-descr
new file mode 100644
index 00000000000..307e5d32226
--- /dev/null
+++ b/devel/hs-constraints/pkg-descr
@@ -0,0 +1,5 @@
+GHC 7.4 gave us the ability to talk about ConstraintKinds. They stopped
+crashing the compiler in GHC 7.6. This package provides a vocabulary for
+working with them.
+
+WWW: http://github.com/ekmett/constraints/
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index d6b3391be31..737bdfbc5b9 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= convertible
-PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Typeclasses and instances for converting between types
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl text>=0.7
+USE_CABAL= mtl old-locale old-time text>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 7d4c407567b..76a4901de85 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/convertible-1.1.0.0.tar.gz) = 13c4943c302700a207426aabcd6dab5a5de85de2353acacbcf4159e924f9835d
-SIZE (cabal/convertible-1.1.0.0.tar.gz) = 14087
+SHA256 (cabal/convertible-1.1.1.0.tar.gz) = e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c
+SIZE (cabal/convertible-1.1.1.0.tar.gz) = 14354
diff --git a/devel/hs-convertible/pkg-descr b/devel/hs-convertible/pkg-descr
index cf89aba1b1f..f6bfd61bdfe 100644
--- a/devel/hs-convertible/pkg-descr
+++ b/devel/hs-convertible/pkg-descr
@@ -11,4 +11,4 @@ described above. Convertible is also used by HDBC 2.0 for handling
marshalling of data to and from databases. Convertible is backed by an
extensive test suite and passes tests on GHC and Hugs.
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible
+WWW: http://hackage.haskell.org/package/convertible
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 8b84227b48b..c27affa50ef 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.18.5
-PORTREVISION= 1
+PORTVERSION= 1.19
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Liberalised re-implementation of cpp, the C pre-processor
LICENSE= LGPL21
-USE_CABAL= polyparse>=1.9
+USE_CABAL= old-locale old-time polyparse>=1.9
EXECUTABLE= cpphs
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 1c291b9728a..e79d6bde247 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpphs-1.18.5.tar.gz) = e71d9ea2c4999905f9910bbb1b947dcef1950dacb03e17c2d9bb5b3739f80e2f
-SIZE (cabal/cpphs-1.18.5.tar.gz) = 72221
+SHA256 (cabal/cpphs-1.19.tar.gz) = e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a
+SIZE (cabal/cpphs-1.19.tar.gz) = 44056
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 8f2c115a429..65fc81cd2dc 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.8.5
+PORTVERSION= 2.10.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +10,18 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
-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
+USE_CABAL= attoparsec>=0.11 base16-bytestring>=0.1 cryptohash>=0.4 \
+ data-ordlist>=0.4 dataenc>=0.11 hashable>=1.0 html \
+ mmap>=0.5 mtl>=2.1 parsec>=3.1 random>=1.0 \
+ regex-applicative>=0.2 regex-compat-tdfa>=0.95.1 tar>=0.4 \
+ text>=0.11.2.0 transformers-compat>=0.4 unix-compat>=0.1.2 \
+ utf8-string>=0.3.6 vector>=0.7 zip-archive>=0.2.3 zlib>=0.5.3.0
EXECUTABLE= darcs
MAN1PAGES= darcs.1
-FLAGS_DEFINE= STATIC TERMINFO THREADED COLOR MMAP
+FLAGS_DEFINE= STATIC TERMINFO THREADED
FLAGS_MULTI= WEB
FLAGS_MULTI_WEB= CURL HTTP
WEB_DESC= HTTP backend
@@ -33,7 +35,7 @@ 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
+HTTP_FLAG_CABAL= HTTP>=4000.2.3 network>=2.6 network-uri>=2.6
STATIC_DESC= Build static binary
STATIC_FLAG_ENABLE= static
@@ -44,13 +46,6 @@ TERMINFO_FLAG_ENABLE= terminfo
THREADED_DESC= Use threading and SMP support
THREADED_FLAG_ENABLE= threaded
-COLOR_DESC= Use ANSI color escapes
-COLOR_FLAG_ENABLE= color
-
-MMAP_DESC= Compile with mmap support
-MMAP_FLAG_ENABLE= mmap
-MMAP_FLAG_CABAL= mmap>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MCURL}
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index bee49c60c76..674b3132fd2 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.5.tar.gz) = 064310ed589c89500e224ad5254ab88de815c349f14f9aef9513720eb857e399
-SIZE (cabal/darcs-2.8.5.tar.gz) = 1306525
+SHA256 (cabal/darcs-2.10.1.tar.gz) = f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
+SIZE (cabal/darcs-2.10.1.tar.gz) = 1509208
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index 887d406087d..ff032871af2 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-class
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index 54aef638b83..bec4750fbc4 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 9d6ce12b8d0..70d45256768 100644
--- a/devel/hs-data-default-instances-containers/Makefile
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index 045be78e6cf..f86cd460422 100644
--- a/devel/hs-data-default-instances-dlist/Makefile
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 7afb745ac08..9da6291cfec 100644
--- a/devel/hs-data-default-instances-old-locale/Makefile
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Default instances for types in old-locale
LICENSE= BSD3CLAUSE
-USE_CABAL= data-default-class
+USE_CABAL= data-default-class old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 72bd215dcef..5266420f2c6 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default
PORTVERSION= 0.5.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index a7764e5a750..7ebe7dedcbe 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-hash
-PORTVERSION= 0.2.0.0
-PORTREVISION= 1
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
index 773c4a4cdad..9f44700516f 100644
--- a/devel/hs-data-hash/distinfo
+++ b/devel/hs-data-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-hash-0.2.0.0.tar.gz) = 35b39a4ec9efaad0c1fac2c1d5f7b6fe4717a67935a8f9d6c372bce9085bdaad
-SIZE (cabal/data-hash-0.2.0.0.tar.gz) = 8486
+SHA256 (cabal/data-hash-0.2.0.1.tar.gz) = 9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe
+SIZE (cabal/data-hash-0.2.0.1.tar.gz) = 8504
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
new file mode 100644
index 00000000000..3d7e5e71c19
--- /dev/null
+++ b/devel/hs-data-ordlist/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-ordlist
+PORTVERSION= 0.4.7.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Set and bag operations on ordered lists
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-ordlist/distinfo b/devel/hs-data-ordlist/distinfo
new file mode 100644
index 00000000000..84fbd37ceec
--- /dev/null
+++ b/devel/hs-data-ordlist/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-ordlist-0.4.7.0.tar.gz) = 6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d
+SIZE (cabal/data-ordlist-0.4.7.0.tar.gz) = 8906
diff --git a/devel/hs-data-ordlist/pkg-descr b/devel/hs-data-ordlist/pkg-descr
new file mode 100644
index 00000000000..846de9871ea
--- /dev/null
+++ b/devel/hs-data-ordlist/pkg-descr
@@ -0,0 +1,3 @@
+This module provides set and multiset operations on ordered lists.
+
+WWW: http://hackage.haskell.org/package/data-ordlist
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index c059d758408..5935bd59851 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-pprint
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index 8867030ad1b..cc583500b7e 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-pprint-0.2.3.tar.gz) = deb8f5b176409a7a7606486173d159cd4f55f2eaefbc2a5ba690b4948685ebf9
-SIZE (cabal/data-pprint-0.2.3.tar.gz) = 10099
+SHA256 (cabal/data-pprint-0.2.4.tar.gz) = 659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864
+SIZE (cabal/data-pprint-0.2.4.tar.gz) = 10112
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
deleted file mode 100644
index 4354dd16493..00000000000
--- a/devel/hs-data-pprint/files/patch-data-pprint.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 38425c335a5..1dda19d3ff0 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 53a7bd6eb33..583939a50a2 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= datetime
-PORTVERSION= 0.2.1
-PORTREVISION= 12
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Utilities to make Data.Time.* easier to use in Haskell
+COMMENT= Utilities to make Data.Time.* easier to use
LICENSE= GPLv3
-USE_CABAL= QuickCheck>=2
+USE_CABAL= old-locale>=1.0.0.1 old-time>=1.0.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index 6d65c5dd31c..67c44c65626 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/datetime-0.2.1.tar.gz) = ef67dac4cc8c2c84c164b2acec95a08f0d6d096fac6a075b11278f10371fcff9
-SIZE (cabal/datetime-0.2.1.tar.gz) = 14498
+SHA256 (cabal/datetime-0.3.1.tar.gz) = 333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a
+SIZE (cabal/datetime-0.3.1.tar.gz) = 15071
diff --git a/devel/hs-datetime/pkg-descr b/devel/hs-datetime/pkg-descr
index 22749c3378d..5f8166f15dc 100644
--- a/devel/hs-datetime/pkg-descr
+++ b/devel/hs-datetime/pkg-descr
@@ -1,5 +1,5 @@
-This Haskell library provides several utilities for easily converting
-among the various standard library Date and Time types, and for
-converting between these and standard external representations.
+Provides several utilities for easily converting among the various
+standard library Date and Time types, and for converting between these
+and standard external representations.
WWW: http://hackage.haskell.org/package/datetime
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index 1cdedb44e54..c7ef01f2624 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= deepseq-generics
-PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
index 87caaf7cfeb..5359067853f 100644
--- a/devel/hs-deepseq-generics/distinfo
+++ b/devel/hs-deepseq-generics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/deepseq-generics-0.1.1.1.tar.gz) = 08e8438de375a822f38fa33ea1cd9a24e494b7f6deea0a4aa052daa5fb138cc5
-SIZE (cabal/deepseq-generics-0.1.1.1.tar.gz) = 5061
+SHA256 (cabal/deepseq-generics-0.1.1.2.tar.gz) = 839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06
+SIZE (cabal/deepseq-generics-0.1.1.2.tar.gz) = 5304
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
new file mode 100644
index 00000000000..0245d538653
--- /dev/null
+++ b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
@@ -0,0 +1,11 @@
+--- deepseq-generics.cabal.orig 2014-12-17 12:16:47 UTC
++++ deepseq-generics.cabal
+@@ -42,7 +42,7 @@ source-repository head
+ library
+ default-language: Haskell2010
+ exposed-modules: Control.DeepSeq.Generics
+- build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.4, deepseq >= 1.2.0.1 && < 1.5
++ build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.5, deepseq >= 1.2.0.1 && < 1.5
+ other-extensions: BangPatterns, FlexibleContexts, TypeOperators
+ ghc-options: -Wall
+
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index f01cfbf7c66..e9d095a1397 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -2,7 +2,7 @@
PORTNAME= directory-tree
PORTVERSION= 0.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index 9f0aa9433ca..fd05f71049e 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dlist-instances
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index bbaf84b002c..6288b352168 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTVERSION= 0.7.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index 82ec5786293..a41378fd333 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dlist-0.7.1.tar.gz) = d9f5609dc1aa9756372a43f8f8414be6380e778754c8e7986a54906317186a8e
-SIZE (cabal/dlist-0.7.1.tar.gz) = 6137
+SHA256 (cabal/dlist-0.7.1.1.tar.gz) = 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd
+SIZE (cabal/dlist-0.7.1.1.tar.gz) = 6161
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
new file mode 100644
index 00000000000..1c0a16c6afc
--- /dev/null
+++ b/devel/hs-easy-file/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= easy-file
+PORTVERSION= 0.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cross-platform File handling
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-easy-file/distinfo b/devel/hs-easy-file/distinfo
new file mode 100644
index 00000000000..442be3eb075
--- /dev/null
+++ b/devel/hs-easy-file/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/easy-file-0.2.1.tar.gz) = ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c
+SIZE (cabal/easy-file-0.2.1.tar.gz) = 12610
diff --git a/devel/hs-easy-file/pkg-descr b/devel/hs-easy-file/pkg-descr
new file mode 100644
index 00000000000..acf3df2872f
--- /dev/null
+++ b/devel/hs-easy-file/pkg-descr
@@ -0,0 +1,3 @@
+Cross-platform file handling for Unix/Mac/Windows.
+
+WWW: http://github.com/kazu-yamamoto/easy-file
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 20eb0681d20..e383af325ba 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= edit-distance
-PORTVERSION= 0.2.1.2
-PORTREVISION= 7
+PORTVERSION= 0.2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index 6a1292d246f..85c64552e7f 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/edit-distance-0.2.1.2.tar.gz) = 84bcc319f4b7dc48994de082819bc656e6a001fdf40c2f7327b9a2acc2d5bd21
-SIZE (cabal/edit-distance-0.2.1.2.tar.gz) = 11335
+SHA256 (cabal/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a
+SIZE (cabal/edit-distance-0.2.2.1.tar.gz) = 13228
diff --git a/devel/hs-edit-distance/pkg-descr b/devel/hs-edit-distance/pkg-descr
index 6db6f7ace4e..48cad5b4772 100644
--- a/devel/hs-edit-distance/pkg-descr
+++ b/devel/hs-edit-distance/pkg-descr
@@ -1,4 +1,4 @@
Optimized edit distances for fuzzy matching, including Levenshtein and
restricted Damerau-Levenshtein algorithms.
-WWW: http://github.com/batterseapower/edit-distance
+WWW: http://github.com/phadej/edit-distance
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index bc68e7ebc77..95f7c319a0b 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 4.3.0.1
-PORTREVISION= 1
+PORTVERSION= 4.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Either monad transformer
LICENSE= BSD3CLAUSE
-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
+USE_CABAL= exceptions>=0.5 free>=4.9 mmorph>=1.0.0 monad-control>=0.3.2 \
+ MonadRandom>=0.1 mtl>=2.0 profunctors>=4 semigroupoids>=4 \
+ semigroups>=0.8.3.1 transformers-base>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index b4f4f679250..84bef272773 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/either-4.3.0.1.tar.gz) = 2e60523cabe1190389ccec1e503be6b422543084bfa114bca80efffe101266c5
-SIZE (cabal/either-4.3.0.1.tar.gz) = 7420
+SHA256 (cabal/either-4.4.1.tar.gz) = 91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb
+SIZE (cabal/either-4.4.1.tar.gz) = 9243
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index 5a23ed084bf..d2306d4a23e 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= enclosed-exceptions
-PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
index e2eb5044773..bd569bcf8f0 100644
--- a/devel/hs-enclosed-exceptions/distinfo
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 90002c271fe779ffe054f4f65ad489beb27cc2866d9d9057e9e2c3b915c66fc9
-SIZE (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 3635
+SHA256 (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99
+SIZE (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = 4566
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index fbe905330c1..78876b4978e 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index ddff0edf385..eaa20d8e958 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= equivalence
-PORTVERSION= 0.2.5
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Maintaining an equivalence relation implemented as union-find using STT
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl STMonadTrans
+USE_CABAL= mtl STMonadTrans transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 43736c030af..9349edba452 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/equivalence-0.2.5.tar.gz) = 03969a9a89bc90a4d282b33f37442060425229517c4c67fd2dd29e1cd04e9904
-SIZE (cabal/equivalence-0.2.5.tar.gz) = 8013
+SHA256 (cabal/equivalence-0.3.1.tar.gz) = 7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e
+SIZE (cabal/equivalence-0.3.1.tar.gz) = 8350
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index 316eb444a3c..a5029c30995 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simplified error-handling
LICENSE= BSD3CLAUSE
-USE_CABAL= either>=3.1 safe>=0.3.3
+USE_CABAL= 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 2d963a2d5ee..f846ddacfef 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/errors-1.4.7.tar.gz) = 8732ebeae477feeb5b669532bc6ffc985f7b115e13fe823bbc816b4e7d1be525
-SIZE (cabal/errors-1.4.7.tar.gz) = 7922
+SHA256 (cabal/errors-2.0.0.tar.gz) = 4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703
+SIZE (cabal/errors-2.0.0.tar.gz) = 8051
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index fe570c9f866..383bf7f826b 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= exceptions
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.8.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Extensible optionally-pure exceptions
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0
+USE_CABAL= mtl>=2.0 stm>=2.2 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index 6b64d996d48..7e311699bb6 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/exceptions-0.6.1.tar.gz) = f56b3f97f5ad49c6e7efde386683ec52c8c4b853bbdda068690e913db52c5b26
-SIZE (cabal/exceptions-0.6.1.tar.gz) = 11392
+SHA256 (cabal/exceptions-0.8.0.2.tar.gz) = 070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4
+SIZE (cabal/exceptions-0.8.0.2.tar.gz) = 12241
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 3bfecb7345a..43687062a78 100644
--- a/devel/hs-extensible-exceptions/Makefile
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
new file mode 100644
index 00000000000..848f063aec9
--- /dev/null
+++ b/devel/hs-extra/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= extra
+PORTVERSION= 1.4.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Extra functions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
new file mode 100644
index 00000000000..10c9ac0cd14
--- /dev/null
+++ b/devel/hs-extra/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/extra-1.4.1.tar.gz) = e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001
+SIZE (cabal/extra-1.4.1.tar.gz) = 31235
diff --git a/devel/hs-extra/pkg-descr b/devel/hs-extra/pkg-descr
new file mode 100644
index 00000000000..9507a27bdcb
--- /dev/null
+++ b/devel/hs-extra/pkg-descr
@@ -0,0 +1,10 @@
+A library of extra functions for the standard Haskell libraries. Most
+functions are simple additions, filling out missing functionality. A few
+functions are available in later versions of GHC, but this package makes
+them available back to GHC 7.2. The module "Extra" documents all functions
+provided by this library. Modules such as "Data.List.Extra" provide extra
+functions over "Data.List" and also reexport "Data.List". Users are
+recommended to replace "Data.List" imports with "Data.List.Extra" if they
+need the extra functionality.
+
+WWW: https://github.com/ndmitchell/extra#readme
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index e90b97d5336..41139b293b1 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTVERSION= 2.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fast logging system
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update blaze-builder text
+USE_CABAL= auto-update>=0.1.2 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 5e8025b5cf6..1e2a7ada305 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fast-logger-2.2.0.tar.gz) = 3973fbc26e028e5547c5c4405e006d8b8e4173ef244eae1ca4cdf1b78f2bec09
-SIZE (cabal/fast-logger-2.2.0.tar.gz) = 6205
+SHA256 (cabal/fast-logger-2.4.1.tar.gz) = e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e
+SIZE (cabal/fast-logger-2.4.1.tar.gz) = 6211
diff --git a/devel/hs-fast-logger/files/patch-fast-logger.cabal b/devel/hs-fast-logger/files/patch-fast-logger.cabal
new file mode 100644
index 00000000000..3f9ce7c18d0
--- /dev/null
+++ b/devel/hs-fast-logger/files/patch-fast-logger.cabal
@@ -0,0 +1,10 @@
+--- fast-logger.cabal.orig 2015-07-06 02:52:26 UTC
++++ fast-logger.cabal
+@@ -23,7 +23,6 @@ Library
+ , array
+ , auto-update >= 0.1.2
+ , bytestring
+- , bytestring-builder
+ , directory
+ , filepath
+ , text
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 90e4c616018..937cd5b6a9c 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.5.0.1
-PORTREVISION= 1
+PORTVERSION= 5.5.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,5 @@ COMMENT= Martin Erwig Functional Graph Library
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index f26e2d68263..42f437b83f8 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fgl-5.5.0.1.tar.gz) = aa61664ba38db3e54124b702b1ee92a72a569c981b759e48cfb567078b038763
-SIZE (cabal/fgl-5.5.0.1.tar.gz) = 35963
+SHA256 (cabal/fgl-5.5.2.1.tar.gz) = 0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9
+SIZE (cabal/fgl-5.5.2.1.tar.gz) = 51963
diff --git a/devel/hs-fgl/pkg-descr b/devel/hs-fgl/pkg-descr
index 9b3f068aae3..d07d29bb786 100644
--- a/devel/hs-fgl/pkg-descr
+++ b/devel/hs-fgl/pkg-descr
@@ -1,3 +1,3 @@
-Martin Erwig's Functional Graph Library.
+An inductive representation of manipulating graph data structures.
-WWW: http://web.engr.oregonstate.edu/~erwig/fgl/haskell
+WWW: http://hackage.haskell.org/package/fgl
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 3faf165879a..ccc2968879e 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTVERSION= 0.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 7f3d2f6fe01..1f6cd82e6ac 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/file-embed-0.0.7.tar.gz) = 4f4489207dcfeb5eafd699e51442ad4e49f535323c95cebee4e8cce4c0714856
-SIZE (cabal/file-embed-0.0.7.tar.gz) = 4283
+SHA256 (cabal/file-embed-0.0.9.tar.gz) = 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005
+SIZE (cabal/file-embed-0.0.9.tar.gz) = 5624
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 25a16c854d5..5b1dd783e57 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= filemanip
-PORTVERSION= 0.3.6.2
-PORTREVISION= 8
+PORTVERSION= 0.3.6.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 0d2855ef0d4..6ea50035080 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filemanip-0.3.6.2.tar.gz) = 3f93da5faa33d675b1a64a90a262c2decfd3d28924f0a4bfb7c691053309810e
-SIZE (cabal/filemanip-0.3.6.2.tar.gz) = 10192
+SHA256 (cabal/filemanip-0.3.6.3.tar.gz) = 8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846
+SIZE (cabal/filemanip-0.3.6.3.tar.gz) = 10369
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index f549ddaee4c..6fcbe68cd90 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.0.3
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD3CLAUSE
-USE_CABAL= Diff>=0.2 parsec>=2 split>=0.1 utf8-string>=0.3 xml>=1.3
+USE_CABAL= Diff>=0.2 old-locale>=1.0 parsec>=2 split>=0.1 \
+ utf8-string>=0.3 xml>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 82ab6707690..df9d1c96775 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.6.0.3.tar.gz) = 0006c8d3e43821ece6661336c9f9926e1db19808bdc976cf3adb858bd9d8150f
-SIZE (cabal/filestore-0.6.0.3.tar.gz) = 29910
+SHA256 (cabal/filestore-0.6.1.tar.gz) = 0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455
+SIZE (cabal/filestore-0.6.1.tar.gz) = 31837
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index 87b3e84e673..86194dcc6b5 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= free
-PORTVERSION= 4.9
-PORTREVISION= 1
+PORTVERSION= 4.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ 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
+USE_CABAL= bifunctors>=4 comonad>=4 distributive>=0.2.1 exceptions>=0.6 \
+ mtl>=2.0.1.0 prelude-extras>=0.4 profunctors>=4 \
+ semigroupoids>=4 semigroups>=0.8.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index 2c157b78691..e523078645d 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/free-4.9.tar.gz) = dd3292f587e96cf5337aa7d46ca685bbeba34b6f1632555482f39298ba4aea06
-SIZE (cabal/free-4.9.tar.gz) = 43414
+SHA256 (cabal/free-4.12.1.tar.gz) = 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b
+SIZE (cabal/free-4.12.1.tar.gz) = 49736
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 9e91dfe58fe..72bad04d3bd 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.1.0.3
-PORTREVISION= 1
+PORTVERSION= 0.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Cross-platform library for file system notifications
LICENSE= BSD3CLAUSE
-USE_CABAL= async>=2.0.1 hinotify>=0.3.7 system-fileio>=0.3.8 \
- system-filepath>=0.4.6 text>=0.11.0
+USE_CABAL= async>=2.0.1 hinotify>=0.3.7 text>=0.11.0 unix-compat>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 05cdbe745c4..1dc69d4078a 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fsnotify-0.1.0.3.tar.gz) = 1f15cc1380d3feaf12f4d7fed23a2327e0927ac69e3f3ae539637e55c8f3d254
-SIZE (cabal/fsnotify-0.1.0.3.tar.gz) = 14116
+SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
+SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
diff --git a/devel/hs-fsnotify/pkg-descr b/devel/hs-fsnotify/pkg-descr
index 55616f3cdca..ed087a7e157 100644
--- a/devel/hs-fsnotify/pkg-descr
+++ b/devel/hs-fsnotify/pkg-descr
@@ -2,4 +2,4 @@ Cross-platform library for file creation, modification, and deletion
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
+WWW: https://github.com/haskell-fswatch/hfsnotify
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 20896d42312..365f10509d3 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gconf
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
+PORTVERSION= 0.13.0.2
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.5.0 gtk2hs-buildtools
+USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools text>=0.11.0.6
USE_GNOME= gconf2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index 6e3486ac942..bccf100b122 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gconf-0.12.5.0.tar.gz) = 075b4cbd9797dcf555b24bc1f3310ebddabd60eb096b996a5104dda0afdbed34
-SIZE (cabal/gconf-0.12.5.0.tar.gz) = 34938
+SHA256 (cabal/gconf-0.13.0.2.tar.gz) = 930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77
+SIZE (cabal/gconf-0.13.0.2.tar.gz) = 35926
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 11a64608986..380256201b9 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 90e9abb1653..4cfb6fb27f0 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/generic-deriving-1.6.3.tar.gz) = c738b1947aa2cc86a8baf68b7f0e73a10489738bb51cbb1636c3c1ab0af59211
-SIZE (cabal/generic-deriving-1.6.3.tar.gz) = 25268
+SHA256 (cabal/generic-deriving-1.8.0.tar.gz) = 26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd
+SIZE (cabal/generic-deriving-1.8.0.tar.gz) = 29935
diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate-mirror/Makefile
index 5cb3a38a3d1..4ff286881e5 100644
--- a/devel/hs-geniplate/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
-PORTNAME= geniplate
-PORTVERSION= 0.6.0.4
-PORTREVISION= 1
+PORTNAME= geniplate-mirror
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Use template Haskell to generate Uniplate-like functions
+COMMENT= Use Template Haskell to generate Uniplate-like functions
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
new file mode 100644
index 00000000000..4cf96ad95c0
--- /dev/null
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/geniplate-mirror-0.7.1.tar.gz) = 60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773
+SIZE (cabal/geniplate-mirror-0.7.1.tar.gz) = 9259
diff --git a/devel/hs-geniplate-mirror/pkg-descr b/devel/hs-geniplate-mirror/pkg-descr
new file mode 100644
index 00000000000..33fcbd4d869
--- /dev/null
+++ b/devel/hs-geniplate-mirror/pkg-descr
@@ -0,0 +1,3 @@
+Use Template Haskell to generate Uniplate-like functions.
+
+WWW: https://github.com/danr/geniplate
diff --git a/devel/hs-geniplate/distinfo b/devel/hs-geniplate/distinfo
deleted file mode 100644
index ec4ecabef47..00000000000
--- a/devel/hs-geniplate/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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-geniplate/pkg-descr b/devel/hs-geniplate/pkg-descr
deleted file mode 100644
index 32cc193147f..00000000000
--- a/devel/hs-geniplate/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Use template Haskell to generate Uniplate-like functions.
-
-WWW: http://hackage.haskell.org/package/geniplate
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index d8ee111cd40..e3bc987a88b 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.4.3.0
-PORTREVISION= 1
+PORTVERSION= 0.4.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Library and tool for parsing .eventlog files from GHC
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=1.1
+USE_CABAL= mtl>=2.2.1
EXECUTABLE= ghc-events
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index b10cacdac26..49f97900fc3 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-events-0.4.3.0.tar.gz) = f94743d5b5ef86a347414bc2d87e66525173d580ae32a6228861a30b43311789
-SIZE (cabal/ghc-events-0.4.3.0.tar.gz) = 69875
+SHA256 (cabal/ghc-events-0.4.4.0.tar.gz) = ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d
+SIZE (cabal/ghc-events-0.4.4.0.tar.gz) = 102944
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index d6f1fb836df..826d267f8f6 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index b69e7cded6b..0bcd5f8de78 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 4d463c27c18..5c4930c2727 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gio
-PORTVERSION= 0.12.5.3
-PORTREVISION= 1
+PORTVERSION= 0.13.1.0
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.5.3 mtl
+USE_CABAL= glib>=0.13.0.0 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 02f158eac3c..67620fc1577 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gio-0.12.5.3.tar.gz) = 8cfbfe99d3c019d8f804717ebaefdbe6bccc95238b83e9ea0a1c8c0a548d3ad9
-SIZE (cabal/gio-0.12.5.3.tar.gz) = 79099
+SHA256 (cabal/gio-0.13.1.0.tar.gz) = b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3
+SIZE (cabal/gio-0.13.1.0.tar.gz) = 79367
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 2b43917369b..41bcba9f686 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 5.20140817
-PORTREVISION= 1
+PORTVERSION= 5.20150727
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,12 +10,12 @@ COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-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
+USE_CABAL= optparse-applicative>=0.10 cryptohash>=0.11.0 exceptions>=0.6 \
+ QuickCheck>=2.1 stm>=2.3 mtl>=2 data-default case-insensitive \
+ uuid random dlist unix-compat SafeSemaphore async IfElse \
+ MissingH hslogger monad-logger utf8-string text sandi json \
+ monad-control bloomfilter edit-distance resourcet aws>=0.9.2 \
+ http-conduit http-types network>=2.6 network-uri>=2.6
USES= gmake perl5
USE_PERL5= build
@@ -35,9 +34,10 @@ EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
FLAGS_DEFINE= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH EKG
+ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DESKTOPNOTIFY \
+ TORRENTPARSER EKG DATABASE
FLAGS_DEFAULT= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH
+ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DATABASE
S3_DESC= S3 support
S3_FLAG_ENABLE= S3
@@ -45,19 +45,18 @@ 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
+INOTIFY_FLAG_CABAL= hinotify
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_FLAG_CABAL= yesod>=1.2.6 yesod-static>=1.2.4 yesod-form>=1.3.15 \
+ yesod-core>=1.2.19 path-pieces>=0.1.4 warp>=3.0.05 \
+ warp-tls wai wai-extra blaze-builder crypto-api \
+ clientsession aeson shakespeare>=2.0.0
WEBAPP_SECURE_DESC= Secure webapp (requires webbapp)
WEBAPP_SECURE_FLAG_DEPENDS= WEBAPP
@@ -98,17 +97,25 @@ 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
+TAHOE_DESC= Tahoe special remote
+TAHOE_FLAG_ENABLE= Tahoe
+TAHOE_FLAG_CABAL= aeson
+
+DESKTOPNOTIFY_DESC= Desktop environment notifications
+DESKTOPNOTIFY_FLAG_ENABLE= DesktopNotify
+
+TORRENTPARSER_DESC= Use haskell torrent library to parse torrent files
+TORRENTPARSER_FLAG_ENABLE= TorrentParser
+TORRENTPARSER_FLAG_CABAL= torrent>=10000.0.0
EKG_DESC= EKG for run-time monitoring
EKG_FLAG_ENABLE= EKG
EKG_FLAG_CABAL= ekg
-TAHOE_DESC= Enable the tahoe special remote
-TAHOE_FLAG_ENABLE= Tahoe
-TAHOE_FLAG_CABAL= aeson
+DATABASE_DESC= Build with persistent for database use
+DATABASE_FLAG_ENABLE= Database
+DATABASE_FLAG_CABAL= esqueleto persistent-sqlite persistent \
+ persistent-template
.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 b7e575cf3d8..1cc0fbc15a2 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-5.20140817.tar.gz) = acc3c1ef2875b16864448b6d00f204a7fc5eb268ea7dfd678c1814d1720a9e32
-SIZE (cabal/git-annex-5.20140817.tar.gz) = 4464505
+SHA256 (cabal/git-annex-5.20150727.tar.gz) = 9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f
+SIZE (cabal/git-annex-5.20150727.tar.gz) = 5095110
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index e08c40a737d..9691658ad45 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,14 +1,14 @@
---- ./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
+--- Setup.hs.orig 2015-07-27 16:25:52 UTC
++++ Setup.hs
+@@ -23,6 +23,7 @@ main = defaultMainWithHooks simpleUserHo
+ Configure.run Configure.tests
+ return (Nothing, [])
, postInst = myPostInst
+ , postCopy = myPostCopy
}
- configure _ _ = do
-@@ -34,6 +35,15 @@
+ myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+@@ -34,6 +35,15 @@ myPostInst _ (InstallFlags { installVerb
dest = NoCopyDest
verbosity = fromFlag installVerbosity
@@ -24,17 +24,21 @@
installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installGitAnnexShell copyDest verbosity pkg lbi =
rawSystemExit verbosity "ln"
-@@ -50,7 +60,7 @@
+@@ -50,14 +60,14 @@ installManpages :: CopyDest -> Verbosity
installManpages copyDest verbosity pkg lbi =
installOrdinaryFiles verbosity dstManDir =<< srcManpages
where
- dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
+ dstManDir = prefix (absoluteInstallDirs pkg lbi copyDest) </> "man" </> "man1"
srcManpages = zip (repeat srcManDir)
- <$> filterM doesFileExist manpages
- srcManDir = ""
-@@ -60,4 +70,4 @@
- installDesktopFile copyDest verbosity pkg lbi =
+- <$> filterM doesFileExist manpages
+- srcManDir = ""
++ <$> filterM (doesFileExist . (srcManDir </>)) manpages
++ srcManDir = "man"
+ manpages = ["git-annex.1", "git-annex-shell.1"]
+
+ installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+ installDesktopFile copyDest _verbosity pkg lbi =
DesktopFile.install $ dstBinDir </> "git-annex"
where
- dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
diff --git a/devel/hs-git-annex/files/patch-Utility__Yesod.hs b/devel/hs-git-annex/files/patch-Utility__Yesod.hs
deleted file mode 100644
index 2dd51c659a7..00000000000
--- a/devel/hs-git-annex/files/patch-Utility__Yesod.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
index b9fb9769e8b..fb102a057ff 100644
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -1,16 +1,13 @@
---- ./git-annex.cabal.orig 2014-08-17 16:50:18.000000000 +0200
-+++ ./git-annex.cabal 2014-08-25 13:15:46.000000000 +0200
-@@ -185,10 +185,11 @@
+--- git-annex.cabal.orig 2015-07-27 16:25:52 UTC
++++ git-annex.cabal
+@@ -218,9 +218,9 @@ Executable git-annex
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,
- 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
+ yesod (>= 1.2.6),
+- yesod-default (>= 1.2.0),
+ yesod-static (>= 1.2.4),
+ yesod-form (>= 1.3.15),
+ yesod-core (>= 1.2.19),
diff --git a/devel/hs-git-annex/pkg-descr b/devel/hs-git-annex/pkg-descr
index 177cad81ff0..90cb5019be8 100644
--- a/devel/hs-git-annex/pkg-descr
+++ b/devel/hs-git-annex/pkg-descr
@@ -1,12 +1,19 @@
-git-annex allows managing files with git, without checking the file contents
-into git. While that may seem paradoxical, it is useful when dealing with
-files larger than git can currently easily handle, whether due to limitations
-in memory, time, or disk space. Even without file content tracking, being
-able to manage files with git, move files around and delete files with
-versioned directory trees, and use branches and distributed clones, are
-all very handy reasons to use git. And annexed files can co-exist in the
-same git repository with regularly versioned files, which is convenient
-for maintaining documents, Makefiles, etc that are associated with annexed
-files but that benefit from full revision control.
+git-annex allows managing files with git, without checking the file
+contents into git. While that may seem paradoxical, it is useful when
+dealing with files larger than git can currently easily handle, whether
+due to limitations in memory, time, or disk space.
+
+It can store large files in many places, from local hard drives, to a
+large number of cloud storage services, including S3, WebDAV, and rsync,
+with a dozen cloud storage providers usable via plugins. Files can be
+stored encrypted with gpg, so that the cloud storage provider cannot see
+your data. git-annex keeps track of where each file is stored, so it
+knows how many copies are available, and has many facilities to ensure
+your data is preserved.
+
+git-annex can also be used to keep a folder in sync between computers,
+noticing when files are changed, and automatically committing them to
+git and transferring them to other computers. The git-annex webapp
+makes it easy to set up and use git-annex this way.
WWW: http://git-annex.branchable.com/
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
deleted file mode 100644
index 90b322f898e..00000000000
--- a/devel/hs-glade/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= glade
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binding to the glade library
-
-LICENSE= LGPL21
-
-USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0
-USE_GNOME= libglade2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-glade/distinfo b/devel/hs-glade/distinfo
deleted file mode 100644
index ca737bc048e..00000000000
--- a/devel/hs-glade/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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-glade/pkg-descr b/devel/hs-glade/pkg-descr
deleted file mode 100644
index 17cbfe665eb..00000000000
--- a/devel/hs-glade/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This library allows to load externally stored user interfaces into programs.
-This allows alteration of the interface without recompilation of the program.
-
-WWW: http://www.haskell.org/gtk2hs/
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index b24cf9a3259..ee5031ec132 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.12.5.4
-PORTREVISION= 1
+PORTVERSION= 0.13.1.1
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= utf8-string>=0.2 gtk2hs-buildtools
+USE_CABAL= gtk2hs-buildtools text>=1.0.0.0 utf8-string>=0.2
USE_GNOME= glib20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 004653def22..6d08348ce0c 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/glib-0.12.5.4.tar.gz) = e63346df27cb45aa7c76bfffe5ba81bb5332b48bde4ccbe931183e5d357378c9
-SIZE (cabal/glib-0.12.5.4.tar.gz) = 46080
+SHA256 (cabal/glib-0.13.1.1.tar.gz) = e494b416ee7b80743af586edf5f7f497b4ce5eae6c070ec12b0e9ec5b99b43f1
+SIZE (cabal/glib-0.13.1.1.tar.gz) = 48228
diff --git a/devel/hs-glib/pkg-descr b/devel/hs-glib/pkg-descr
index eae843ac2f1..70de5d08406 100644
--- a/devel/hs-glib/pkg-descr
+++ b/devel/hs-glib/pkg-descr
@@ -1,6 +1,7 @@
-The GNU Library is a collection of C data structures and utility function
-for dealing with Unicode. This package only binds as much functionality
-as required to support the packages that wrap libraries that are themselves
-based on GLib.
+GLib is a collection of C data structures and utility functions for the
+GObject system, main loop implementation, for strings and common data
+structures dealing with Unicode. This package only binds as much
+functionality as required to support the packages that wrap libraries
+that are themselves based on GLib.
WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index a4e8ac684d7..55b8bd13e7d 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.12.5.2
-PORTREVISION= 2
+PORTVERSION= 0.13.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= hashtables random
USE_ALEX= yes
USE_HAPPY= yes
-EXECUTABLE= gtk2hsTypeGen gtk2hsHookGenerator gtk2hsC2hs
+EXECUTABLE= gtk2hsC2hs gtk2hsHookGenerator gtk2hsTypeGen
STANDALONE= yes
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 6a0c90a018b..02392bc1743 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 3c7a0c106acaad01b9816c13755687c650bbcdaa1112da43eb89461c277795f0
-SIZE (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 169072
+SHA256 (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510
+SIZE (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 169272
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
deleted file mode 100644
index 8892f375553..00000000000
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- c2hs/toplevel/C2HSConfig.hs.orig 2014-04-13 05:14:06 UTC
-+++ c2hs/toplevel/C2HSConfig.hs
-@@ -70,7 +70,7 @@ cpp = case os of
- cppopts :: [String]
- cppopts = case (os,cpp) of
- ("openbsd","cpp") -> ["-xc", "-w"]
-- (_,"cpp") -> ["-x", "c", "-w"]
-+ (_,"cpp") -> ["-x", "c", "-P", "-w"]
- (_,"gcc") -> ["-E", "-x", "c", "-w"]
- _ -> []
-
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
new file mode 100644
index 00000000000..2ec7d93b245
--- /dev/null
+++ b/devel/hs-haddock-api/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= haddock-api
+PORTVERSION= 2.16.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Documentation-generation tool for Haskell libraries
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= ghc-paths haddock-library>=1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
new file mode 100644
index 00000000000..1d7a4bb3e6f
--- /dev/null
+++ b/devel/hs-haddock-api/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/haddock-api-2.16.1.tar.gz) = e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea
+SIZE (cabal/haddock-api-2.16.1.tar.gz) = 125372
diff --git a/devel/hs-haddock-api/pkg-descr b/devel/hs-haddock-api/pkg-descr
new file mode 100644
index 00000000000..17176ab296b
--- /dev/null
+++ b/devel/hs-haddock-api/pkg-descr
@@ -0,0 +1,3 @@
+Haddock is a documentation-generation tool for Haskell libraries.
+
+WWW: http://www.haskell.org/haddock/
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index b406fe1ed7a..49e1f3adf54 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 88c543c12a6..63fd398d111 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-library-1.1.0.tar.gz) = cd26439dabfe98bc5888e0cbb64163811df3091ea946052fdb77f5d76daaf82a
-SIZE (cabal/haddock-library-1.1.0.tar.gz) = 33032
+SHA256 (cabal/haddock-library-1.2.1.tar.gz) = 0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056
+SIZE (cabal/haddock-library-1.2.1.tar.gz) = 38606
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 4e5f79e2ae1..97836694bc0 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.14.3
-PORTREVISION= 1
+PORTVERSION= 2.16.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,13 +10,15 @@ COMMENT= Documentation-generation tool for Haskell libraries
LICENSE= BSD3CLAUSE
-USE_CABAL= ghc-paths
+USE_CABAL= haddock-api>=2.16
USE_ALEX= true
USE_HAPPY= true
EXECUTABLE= haddock-${PORTVERSION}
+STANDALONE= yes
+
PLIST_SUB+= GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/haddock-${PORTVERSION}
CONFIGURE_ARGS+= --program-suffix=-${PORTVERSION}
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 631bfb17014..340a26fb4bb 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.14.3.tar.gz) = d454f64ed0ea79ec9a94d4d79c8635be74d752d028b737dbe3b5deb9749e310c
-SIZE (cabal/haddock-2.14.3.tar.gz) = 232158
+SHA256 (cabal/haddock-2.16.1.tar.gz) = 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6
+SIZE (cabal/haddock-2.16.1.tar.gz) = 216323
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 388c9f62343..06a878c83f0 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= happy
-PORTVERSION= 1.19.4
-PORTREVISION= 1
+PORTVERSION= 1.19.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index d8bed0a2932..aa017607273 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happy-1.19.4.tar.gz) = 6be499f66c61f8c48cbbbcb70515eb8e62c2bfa08adcc8c9474e7ae343a6936d
-SIZE (cabal/happy-1.19.4.tar.gz) = 160497
+SHA256 (cabal/happy-1.19.5.tar.gz) = 62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da
+SIZE (cabal/happy-1.19.5.tar.gz) = 159280
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 8b4f6fd9edb..8748ce48613 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.2.0
-PORTREVISION= 1
+PORTVERSION= 1.2.3.3
PORTEPOCH= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 734f99f3e5c..4afe612aab9 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.2.2.0.tar.gz) = 033a90b0369af59bf922d0c2af8d73a18432b46b0a47607f436d38f873a88e21
-SIZE (cabal/hashable-1.2.2.0.tar.gz) = 23456
+SHA256 (cabal/hashable-1.2.3.3.tar.gz) = fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e
+SIZE (cabal/hashable-1.2.3.3.tar.gz) = 23944
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index ce80dbc84a0..2613f4cd336 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs
new file mode 100644
index 00000000000..df8aba9439f
--- /dev/null
+++ b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs
@@ -0,0 +1,8 @@
+--- Storage/Hashed/Index.hs.orig 2014-04-07 13:32:06 UTC
++++ Storage/Hashed/Index.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE CPP, ScopedTypeVariables, MultiParamTypeClasses #-}
++{-# LANGUAGE CPP, ScopedTypeVariables, MultiParamTypeClasses, FlexibleContexts #-}
+
+ -- | This module contains plain tree indexing code. The index itself is a
+ -- CACHE: you should only ever use it as an optimisation and never as a primary
diff --git a/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs
new file mode 100644
index 00000000000..174237d0912
--- /dev/null
+++ b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs
@@ -0,0 +1,8 @@
+--- Storage/Hashed/Monad.hs.orig 2014-04-07 13:32:06 UTC
++++ Storage/Hashed/Monad.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances #-}
++{-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances, FlexibleContexts #-}
+
+ -- | An experimental monadic interface to Tree mutation. The main idea is to
+ -- simulate IO-ish manipulation of real filesystem (that's the state part of
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 74c244a4594..2a0461743df 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Mutable hash tables in the ST monad
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable primitive vector>=0.7
+USE_CABAL= hashable>=1.1 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 8921c6fa0c5..cb3331d3b89 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashtables-1.1.2.1.tar.gz) = c50d910fea2e81eca53d9a2dfbc925246be5b7cc2d0854c6d9e95eaab05ac684
-SIZE (cabal/hashtables-1.1.2.1.tar.gz) = 48553
+SHA256 (cabal/hashtables-1.2.0.2.tar.gz) = 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837
+SIZE (cabal/hashtables-1.2.0.2.tar.gz) = 54283
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
deleted file mode 100644
index 8064446ca01..00000000000
--- a/devel/hs-haskell-platform/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= haskell-platform
-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= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= The Haskell Platform
-
-LICENSE= BSD3CLAUSE
-
-METAPORT= yes
-
-USE_CABAL= async==2.0.1.5_1 \
- attoparsec==0.10.4.0_7 \
- case-insensitive==1.1.0.3_1 \
- fgl==5.5.0.1_1 \
- GLUT==2.5.1.1_1,1 \
- GLURaw==1.4.0.1_1 \
- haskell-src==1.0.1.6_1 \
- hashable==1.2.2.0_1,1 \
- html==1.0.1.2_13 \
- HTTP==4000.2.10_1 \
- HUnit==1.2.5.2_6 \
- mtl==2.1.3.1_1 \
- network==2.4.2.3_1 \
- OpenGL==2.9.2.0_1,1 \
- OpenGLRaw==1.5.0.0_1 \
- parallel==3.2.0.4_1 \
- parsec==3.1.5_1 \
- primitive==0.5.2.1_1 \
- QuickCheck==2.6_6 \
- random==1.0.1.1_10 \
- regex-base==0.93.2_13 \
- regex-compat==0.95.1_11 \
- regex-posix==0.95.2_8 \
- split==0.2.2_6 \
- stm==2.4.2_6 \
- syb==0.4.1_1 \
- text==1.1.0.0_1 \
- unordered-containers==0.2.4.0_1 \
- vector==0.10.9.1_1 \
- zlib==0.5.4.1_6 \
- cabal-install==1.18.0.5_1 \
- alex==3.1.3_1 \
- happy==1.19.4_1 \
- hscolour==1.20.3_8,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-platform/pkg-descr b/devel/hs-haskell-platform/pkg-descr
deleted file mode 100644
index 2f80071afcc..00000000000
--- a/devel/hs-haskell-platform/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The Haskell Platform (HP) is the blessed set of libraries and tools on which
-to build further Haskell libraries and applications. It is intended to
-provide a comprehensive, stable, and quality-tested base for Haskell projects
-to work from.
-
-This version specifies the following additional developer tools be installed,
-for a system to be in full compliance:
-
- * cabal-install
- * alex
- * happy
- * haddock
-
-
-WWW: http://haskell.org/platform/
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 17104af7d43..a92a23dbeb7 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.15.0.1
-PORTREVISION= 1
+PORTVERSION= 1.16.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index 53c47d63c43..e2d628abb83 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.15.0.1.tar.gz) = 85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576
-SIZE (cabal/haskell-src-exts-1.15.0.1.tar.gz) = 1605910
+SHA256 (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1
+SIZE (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 1410081
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index b524f80bf13..92047cb04bc 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haskell-src
-PORTVERSION= 1.0.1.6
-PORTREVISION= 1
+PORTVERSION= 1.0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 27d292c4338..2ed2cd3688a 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-1.0.1.6.tar.gz) = c7c556366025d9895d1110ecfa30a29e29d7d0a8cb447716fe601e4ff5da4cef
-SIZE (cabal/haskell-src-1.0.1.6.tar.gz) = 52967
+SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6
+SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 9070909e0d5..b05ca0f007a 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hasktags
-PORTVERSION= 0.69.0
-PORTREVISION= 1
+PORTVERSION= 0.69.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index 7acaf6d87f0..193a3cc0a9b 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hasktags-0.69.0.tar.gz) = 08e200e30929e4a950307e61464db40d47a83debb4b19410cbaea8020b376aad
-SIZE (cabal/hasktags-0.69.0.tar.gz) = 55885
+SHA256 (cabal/hasktags-0.69.1.tar.gz) = 243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6
+SIZE (cabal/hasktags-0.69.1.tar.gz) = 55906
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index 3f3088560b6..f9e004babaf 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hastache
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,9 @@ COMMENT= Haskell implementation of Mustache templates
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder ieee754 mtl syb text utf8-string
+USE_CABAL= blaze-builder ieee754 mtl syb text
+
+EXECUTABLE= mkReadme
INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR}
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 7a3ef324cb7..35d7df616e3 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hastache-0.6.0.tar.gz) = b033a0dd3a38e0ef0772562bb1d5ed8f535c2fa6955633875ae520a6614dc0fc
-SIZE (cabal/hastache-0.6.0.tar.gz) = 13195
+SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
+SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-hex/Makefile
index 1b79718e5c6..501e1fffe87 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-hex/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
-PORTNAME= MaybeT
+PORTNAME= hex
PORTVERSION= 0.1.2
-PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Support for computations with failures
+COMMENT= Convert strings into hexadecimal and back
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hex/distinfo b/devel/hs-hex/distinfo
new file mode 100644
index 00000000000..028bd5b9ff2
--- /dev/null
+++ b/devel/hs-hex/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hex-0.1.2.tar.gz) = 12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec
+SIZE (cabal/hex-0.1.2.tar.gz) = 1956
diff --git a/devel/hs-hex/pkg-descr b/devel/hs-hex/pkg-descr
new file mode 100644
index 00000000000..470b803bbe3
--- /dev/null
+++ b/devel/hs-hex/pkg-descr
@@ -0,0 +1,3 @@
+Convert strings into hexadecimal and back.
+
+WWW: http://hackage.haskell.org/package/hex
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 129da26db36..25f4c3f6882 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index d53c2ea68fc..0786180a052 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hinotify-0.3.7.tar.gz) = 0b702d104f35ca925c748deb9e2a1faaaf6b7b517e48a39a8c8f7d1ad3ebf544
-SIZE (cabal/hinotify-0.3.7.tar.gz) = 6760
+SHA256 (cabal/hinotify-0.3.8.1.tar.gz) = 37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d
+SIZE (cabal/hinotify-0.3.8.1.tar.gz) = 8344
diff --git a/devel/hs-hinotify/files/patch-hinotify.cabal b/devel/hs-hinotify/files/patch-hinotify.cabal
new file mode 100644
index 00000000000..b2a293f1068
--- /dev/null
+++ b/devel/hs-hinotify/files/patch-hinotify.cabal
@@ -0,0 +1,12 @@
+--- hinotify.cabal.orig 2015-08-08 07:35:44 UTC
++++ hinotify.cabal
+@@ -32,6 +32,9 @@ library
+ includes: sys/inotify.h
+ hs-source-dirs: src
+
++ if os(freebsd)
++ extra-libraries: inotify
++
+ test-suite test001
+ type: exitcode-stdio-1.0
+ build-depends: base, directory, hinotify
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 964400523a1..8718f718927 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.4.2.0
-PORTREVISION= 1
+PORTVERSION= 0.4.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 50473e463e5..0705311b269 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hint-0.4.2.0.tar.gz) = add643926ef91cb886968cb36efb92621bbe6d7e4d570906ebecf8ecfd4f9821
-SIZE (cabal/hint-0.4.2.0.tar.gz) = 29449
+SHA256 (cabal/hint-0.4.2.3.tar.gz) = cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7
+SIZE (cabal/hint-0.4.2.3.tar.gz) = 30117
diff --git a/devel/hs-hint/pkg-descr b/devel/hs-hint/pkg-descr
index 50dc7bbe9ff..3d4c8816ed2 100644
--- a/devel/hs-hint/pkg-descr
+++ b/devel/hs-hint/pkg-descr
@@ -1,6 +1,8 @@
-This library defines an Interpreter monad. It allows to load Haskell
+This library defines an Interpreter monad. It allows to load Haskell
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).
+expressions and even coerce them into values. The library is
+thread-safe and type-safe (even the coercion of expressions to values).
+It is, essentially, a huge subset of the GHC API wrapped in a simpler
+API.
WWW: http://hub.darcs.net/jcpetruzza/hint
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 7bda4b2ca5e..6a05960f629 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index b42c582eaf5..c1d1ecd22b4 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.9.3
-PORTREVISION= 1
+PORTVERSION= 1.9.21
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Source code suggestions
LICENSE= BSD3CLAUSE
-USE_CABAL= cmdargs>=0.10 cpphs>=1.18.1 haskell-src-exts>=1.14 \
- hscolour>=1.17 uniplate>=1.5
+USE_CABAL= ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \
+ haskell-src-exts>=1.16 hscolour>=1.21 uniplate>=1.5
EXECUTABLE= hlint
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index f0331999dee..797190e1439 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.9.3.tar.gz) = 2b017bc6bcf02ef2dfb0439f734b57d92bd02656a0438313d75501ec034abfe9
-SIZE (cabal/hlint-1.9.3.tar.gz) = 86068
+SHA256 (cabal/hlint-1.9.21.tar.gz) = 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393
+SIZE (cabal/hlint-1.9.21.tar.gz) = 88802
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 098b3418595..b4e7d34b284 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.34
-PORTREVISION= 1
+PORTVERSION= 4.2.41
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +11,10 @@ COMMENT= Haskell API Search
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.6.1 blaze-builder>=0.2 case-insensitive>=0.2 \
- cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.14 \
+ cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.16 \
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
+ safe shake>=0.14 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
+ vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=2.1
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index 310494b7a06..ad1f0b7d752 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.34.tar.gz) = 4f960af1947a0a49e7288dd18029e0fd82c76976f4b76e6b97e0603bf4618d6e
-SIZE (cabal/hoogle-4.2.34.tar.gz) = 131854
+SHA256 (cabal/hoogle-4.2.41.tar.gz) = a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be
+SIZE (cabal/hoogle-4.2.41.tar.gz) = 135709
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
new file mode 100644
index 00000000000..d262dac03a4
--- /dev/null
+++ b/devel/hs-hourglass/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= hourglass
+PORTVERSION= 0.2.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple performant time related library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
new file mode 100644
index 00000000000..84a2f947bcd
--- /dev/null
+++ b/devel/hs-hourglass/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hourglass-0.2.9.tar.gz) = 9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6
+SIZE (cabal/hourglass-0.2.9.tar.gz) = 24919
diff --git a/devel/hs-hourglass/pkg-descr b/devel/hs-hourglass/pkg-descr
new file mode 100644
index 00000000000..f889cef83c9
--- /dev/null
+++ b/devel/hs-hourglass/pkg-descr
@@ -0,0 +1,6 @@
+Simple time library focusing on simple but powerful and performant API
+The backbone of the library are the Timeable and Time type classes.
+Each Timeable instances can be converted to type that has a Time
+instances, and thus are different representations of current time.
+
+WWW: https://github.com/vincenthz/hs-hourglass
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
new file mode 100644
index 00000000000..62692b468a3
--- /dev/null
+++ b/devel/hs-hsb2hs/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= hsb2hs
+PORTVERSION= 0.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Preprocesses a file, adding blobs from files as string literals
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= preprocessor-tools>1.0
+
+EXECUTABLE= hsb2hs
+STANDALONE= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hsb2hs/distinfo b/devel/hs-hsb2hs/distinfo
new file mode 100644
index 00000000000..dfc1480a378
--- /dev/null
+++ b/devel/hs-hsb2hs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hsb2hs-0.3.1.tar.gz) = 8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8
+SIZE (cabal/hsb2hs-0.3.1.tar.gz) = 2387
diff --git a/devel/hs-hsb2hs/pkg-descr b/devel/hs-hsb2hs/pkg-descr
new file mode 100644
index 00000000000..60ea929041e
--- /dev/null
+++ b/devel/hs-hsb2hs/pkg-descr
@@ -0,0 +1,6 @@
+Hsb2hs is a preprocessor that allows you to include the contents of
+files as string literals in your Haskell programs and libraries. It is
+an alternative to file-embed for those who do not want to rely on
+Template Haskell.
+
+WWW: http://hackage.haskell.org/package/hsb2hs
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 873a871da20..fba6efa5702 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTVERSION= 1.2.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Versatile logging framework
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl network
+USE_CABAL= mtl network old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index a86565507bf..a3c3b8cfa6d 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslogger-1.2.4.tar.gz) = 8c0fa8051efb693e398eddeece3486dfdb5eb9357c4ea5cfeb9f26f2313f0c64
-SIZE (cabal/hslogger-1.2.4.tar.gz) = 35794
+SHA256 (cabal/hslogger-1.2.9.tar.gz) = be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476
+SIZE (cabal/hslogger-1.2.9.tar.gz) = 35576
diff --git a/devel/hs-hslogger/pkg-descr b/devel/hs-hslogger/pkg-descr
index 3b616f2f672..290e1708d55 100644
--- a/devel/hs-hslogger/pkg-descr
+++ b/devel/hs-hslogger/pkg-descr
@@ -1,7 +1,9 @@
-Package hslogger is a logging framework for Haskell, roughly similar to
-Python's logging module, and lets each log message have a priority and
-source be associated with it. The programmer can then define global
-handlers that route or filter messages based on the priority and source.
-hslogger also has a syslog handler built in.
+hslogger is a logging framework for Haskell, roughly similar to Python's
+logging module.
+
+hslogger lets each log message have a priority and source be associated
+with it. The programmer can then define global handlers that route or
+filter messages based on the priority and source. hslogger also has a
+syslog handler built in.
WWW: http://software.complete.org/hslogger
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index eb8a51ba1af..226fa652639 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.3.13
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ 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
index f767b1adbd5..2bd503366a2 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslua-0.3.13.tar.gz) = e95774d21ac4378e799af4b8dce9068bfedd3109bf13b717d9ecb5817f86430a
-SIZE (cabal/hslua-0.3.13.tar.gz) = 128230
+SHA256 (cabal/hslua-0.4.0.tar.gz) = 77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050
+SIZE (cabal/hslua-0.4.0.tar.gz) = 129883
diff --git a/devel/hs-hslua/pkg-descr b/devel/hs-hslua/pkg-descr
index c4496cb8548..f2dc2410232 100644
--- a/devel/hs-hslua/pkg-descr
+++ b/devel/hs-hslua/pkg-descr
@@ -1,4 +1,4 @@
The Scripting.Lua module is a wrapper of Lua language interpreter. This
-package contains full Lua interpreter version 5.1.4.
+package contains full Lua interpreter version 5.1.5.
WWW: http://hackage.haskell.org/package/hslua
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
new file mode 100644
index 00000000000..f295c7b4e74
--- /dev/null
+++ b/devel/hs-hspec-core/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= hspec-core
+PORTVERSION= 2.1.10
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Testing Framework for Haskell
+
+LICENSE= MIT
+
+USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.7.1 \
+ HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random setenv \
+ tf-random
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
new file mode 100644
index 00000000000..b61d2cfa973
--- /dev/null
+++ b/devel/hs-hspec-core/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hspec-core-2.1.10.tar.gz) = 682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0
+SIZE (cabal/hspec-core-2.1.10.tar.gz) = 31124
diff --git a/devel/hs-hspec-core/pkg-descr b/devel/hs-hspec-core/pkg-descr
new file mode 100644
index 00000000000..5ba9ca9805e
--- /dev/null
+++ b/devel/hs-hspec-core/pkg-descr
@@ -0,0 +1,4 @@
+This package exposes internal types and functions that can be used to
+extend Hspec's functionality.
+
+WWW: http://hspec.github.io/
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
new file mode 100644
index 00000000000..93d2f36a834
--- /dev/null
+++ b/devel/hs-hspec-discover/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= hspec-discover
+PORTVERSION= 2.1.10
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Automatically discover and run Hspec tests
+
+LICENSE= MIT
+
+EXECUTABLE= hspec-discover
+
+OPTIONS_EXCLUDE= DOCS
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
new file mode 100644
index 00000000000..d7e8b095808
--- /dev/null
+++ b/devel/hs-hspec-discover/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hspec-discover-2.1.10.tar.gz) = efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b
+SIZE (cabal/hspec-discover-2.1.10.tar.gz) = 5646
diff --git a/devel/hs-hspec-discover/pkg-descr b/devel/hs-hspec-discover/pkg-descr
new file mode 100644
index 00000000000..ff34278c196
--- /dev/null
+++ b/devel/hs-hspec-discover/pkg-descr
@@ -0,0 +1,3 @@
+Automatically discover and run Hspec tests.
+
+WWW: http://hspec.github.io/
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 8c240571737..51fff1e3322 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.6.0.1
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index f32a4a72dfe..8a324976d0a 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-expectations-0.6.0.1.tar.gz) = 941f27d0fa358889ac43496a49570a4baea93fcd59fdab03249e7eb34f1f0198
-SIZE (cabal/hspec-expectations-0.6.0.1.tar.gz) = 4212
+SHA256 (cabal/hspec-expectations-0.7.1.tar.gz) = afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258
+SIZE (cabal/hspec-expectations-0.7.1.tar.gz) = 4005
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 99b6ab21f46..e59cfd8da70 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,20 +1,16 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.11.0
-PORTREVISION= 1
+PORTVERSION= 2.1.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Behavior-Driven Development for Haskell
+COMMENT= Testing Framework for Haskell
LICENSE= MIT
-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
+USE_CABAL= hspec-core>=2.1.10 hspec-discover>=2.1.10 \
+ hspec-expectations>=0.7.1 HUnit>=1.2.5 QuickCheck>=2.5.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 9c734f63255..f5e185fd06c 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.11.0.tar.gz) = 4eff14713863b2b882d1e28eaf8fb8b6007c0bcd03d7c0c2023ff153b5a26ec2
-SIZE (cabal/hspec-1.11.0.tar.gz) = 32083
+SHA256 (cabal/hspec-2.1.10.tar.gz) = f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154
+SIZE (cabal/hspec-2.1.10.tar.gz) = 5382
diff --git a/devel/hs-hspec/pkg-descr b/devel/hs-hspec/pkg-descr
index d0dedf68e90..7a2d95826c1 100644
--- a/devel/hs-hspec/pkg-descr
+++ b/devel/hs-hspec/pkg-descr
@@ -1,6 +1,9 @@
-Behavior Driven Development for Haskell. Hspec is roughly based on the
-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.
+Hspec is a testing framework for Haskell. It is inspired by the Ruby
+library RSpec. Some of Hspec's distinctive features are:
+
+ * a friendly DSL for defining tests
+ * integration with QuickCheck, SmallCheck, and HUnit
+ * parallel test execution
+ * automatic discovery of test files
WWW: http://hspec.github.io/
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
new file mode 100644
index 00000000000..afe5f5cb483
--- /dev/null
+++ b/devel/hs-js-flot/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= js-flot
+PORTVERSION= 0.8.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Obtain minified flot code
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-js-flot/distinfo b/devel/hs-js-flot/distinfo
new file mode 100644
index 00000000000..18722774346
--- /dev/null
+++ b/devel/hs-js-flot/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a
+SIZE (cabal/js-flot-0.8.3.tar.gz) = 662691
diff --git a/devel/hs-js-flot/pkg-descr b/devel/hs-js-flot/pkg-descr
new file mode 100644
index 00000000000..3caa8ddb471
--- /dev/null
+++ b/devel/hs-js-flot/pkg-descr
@@ -0,0 +1,7 @@
+This package bundles the minified Flot code (a jQuery plotting library)
+into a Haskell package, so it can be depended upon by Cabal packages.
+The first three components of the version number match the upstream flot
+version. The package is designed to meet the redistribution
+requirements of downstream users (e.g. Debian).
+
+WWW: https://github.com/ndmitchell/js-flot#readme
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
new file mode 100644
index 00000000000..02093d645f4
--- /dev/null
+++ b/devel/hs-js-jquery/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= js-jquery
+PORTVERSION= 1.11.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Obtain minified jQuery code
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-js-jquery/distinfo b/devel/hs-js-jquery/distinfo
new file mode 100644
index 00000000000..acae74b0abc
--- /dev/null
+++ b/devel/hs-js-jquery/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/js-jquery-1.11.3.tar.gz) = 3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257
+SIZE (cabal/js-jquery-1.11.3.tar.gz) = 120919
diff --git a/devel/hs-js-jquery/pkg-descr b/devel/hs-js-jquery/pkg-descr
new file mode 100644
index 00000000000..18c4f144482
--- /dev/null
+++ b/devel/hs-js-jquery/pkg-descr
@@ -0,0 +1,7 @@
+This package bundles the minified jQuery code into a Haskell package, so
+it can be depended upon by Cabal packages. The first three components
+of the version number match the upstream jQuery version. The package is
+designed to meet the redistribution requirements of downstream users
+(e.g. Debian).
+
+WWW: https://github.com/ndmitchell/js-jquery#readme
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index 5908eef7eb2..f221c325728 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.10.1
-PORTREVISION= 1
+PORTVERSION= 3.10.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Keyed functors and containers
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 free>=4 semigroupoids>=4 semigroups>=0.8.3.1
+USE_CABAL= comonad>=4 free>=4 hashable>=1.1.2.3 semigroupoids>=4 \
+ semigroups>=0.8.3.1 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 4ec78f7a844..4cf4edfc81f 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/keys-3.10.1.tar.gz) = 9644f4aeb3744cfe46c59712bb5396554eb06527ec67cdf563c116abdc5df400
-SIZE (cabal/keys-3.10.1.tar.gz) = 7702
+SHA256 (cabal/keys-3.10.2.tar.gz) = 425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6
+SIZE (cabal/keys-3.10.2.tar.gz) = 8635
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index 25ded125cdd..fd95a552348 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kqueue
PORTVERSION= 0.1.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
new file mode 100644
index 00000000000..a6145d68df9
--- /dev/null
+++ b/devel/hs-kqueue/files/patch-kqueue.cabal
@@ -0,0 +1,17 @@
+--- kqueue.cabal.orig 2014-05-08 16:35:57 UTC
++++ kqueue.cabal
+@@ -21,11 +21,11 @@ Library
+ Hs-Source-Dirs: src
+ Exposed-modules: System.KQueue
+ System.KQueue.HighLevel
+- Build-depends: base >= 4.0 && < 4.8
++ Build-depends: base >= 4.0 && < 4.9
+ , directory >= 1.0 && < 1.4
+- , filepath >= 1.1 && < 1.4
++ , filepath >= 1.1 && < 1.5
+ , mtl >= 1.1 && < 2.3
+- , time >= 1.1 && < 1.5
++ , time >= 1.1 && < 1.6
+ , unix >= 2.3 && < 2.8
+ Build-tools: c2hs
+ GHC-Options: -Wall
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 5eeb4c15afd..23de7718162 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTVERSION= 0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
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 c5a5d34fce0..81eceb27721 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-c-0.4.5.tar.gz) = 644a7f6657f0325149f16c755ba3e51353f0d18484282989cf473c726a0e1d60
-SIZE (cabal/language-c-0.4.5.tar.gz) = 168971
+SHA256 (cabal/language-c-0.4.7.tar.gz) = 5f6dc9d86b1f88dec1800e1a4fc43aa52f85fe4bb865ba268aca34b399a512e4
+SIZE (cabal/language-c-0.4.7.tar.gz) = 112569
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index aafd5c29678..0f8a5f55f39 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.5.13
-PORTREVISION= 1
+PORTVERSION= 0.5.14.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index 965cdf82631..c9de3973546 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-javascript-0.5.13.tar.gz) = 5cd824989ab56a87874dacc4335aa89cb97a649d71747a555c6fc45ea0e38640
-SIZE (cabal/language-javascript-0.5.13.tar.gz) = 48398
+SHA256 (cabal/language-javascript-0.5.14.2.tar.gz) = 2a86bd58b1821f1522be191c8d77a80e35550d43637a37644cbb15caac37d546
+SIZE (cabal/language-javascript-0.5.14.2.tar.gz) = 48466
diff --git a/devel/hs-language-javascript/pkg-descr b/devel/hs-language-javascript/pkg-descr
index b7da79b659f..1974076d58f 100644
--- a/devel/hs-language-javascript/pkg-descr
+++ b/devel/hs-language-javascript/pkg-descr
@@ -1,4 +1,4 @@
Parses Javascript into an Abstract Syntax Tree (AST). Initially intended
as frontend to hjsmin.
-WWW: http://github.com/alanz/language-javascript
+WWW: http://github.com/erikd/language-javascript
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 3be3ee3cbea..19f9cd74813 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -2,7 +2,7 @@
PORTNAME= largeword
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 94eb783c95f..561edf5c1f8 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index f639451e78f..9f8cb01a052 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.3.3
-PORTREVISION= 1
+PORTVERSION= 4.12.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,15 @@ COMMENT= Lenses, Folds and Traversals
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.7.0.5 attoparsec>=0.10 bifunctors>=4 comonad>=4 \
+USE_CABAL= base-orphans>=0.3 bifunctors>=5 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
+ free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \
+ parallel>=3.1.0.1 profunctors>=5 reflection>=2 \
+ semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \
+ transformers-compat>=0.4 unordered-containers>=0.2.4 \
+ vector>=0.9 void>=0.5
+
+FLAGS_DISABLE= test-hlint test-doctests test-hunit test-properties test-templates
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index ff8c3ae1099..90b626c4342 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lens-4.3.3.tar.gz) = 2e6449fb0a4a93b7779dbd8147541d663cf3770557736e90ccb697002dd5f84c
-SIZE (cabal/lens-4.3.3.tar.gz) = 767895
+SHA256 (cabal/lens-4.12.3.tar.gz) = 48fa9d46b37ff4f650204f82df7d40f7ae78418badf40d9d3fc7eba479f82821
+SIZE (cabal/lens-4.12.3.tar.gz) = 967851
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
new file mode 100644
index 00000000000..a8e0776feb6
--- /dev/null
+++ b/devel/hs-lifted-async/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= lifted-async
+PORTVERSION= 0.7.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Run lifted IO operations asynchronously and wait for their results
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async>=2.0.1 constraints>=0.2 lifted-base>=0.2 \
+ monad-control>=0.3.1 transformers-base>=0.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
new file mode 100644
index 00000000000..3e32b11d68d
--- /dev/null
+++ b/devel/hs-lifted-async/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/lifted-async-0.7.0.1.tar.gz) = c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a
+SIZE (cabal/lifted-async-0.7.0.1.tar.gz) = 9060
diff --git a/devel/hs-lifted-async/pkg-descr b/devel/hs-lifted-async/pkg-descr
new file mode 100644
index 00000000000..cd748ed0d7a
--- /dev/null
+++ b/devel/hs-lifted-async/pkg-descr
@@ -0,0 +1,4 @@
+This package provides IO operations from async package lifted to any
+instance of 'MonadBase' or 'MonadBaseControl'.
+
+WWW: https://github.com/maoe/lifted-async
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 060a5c29197..d4f9139ae4e 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.3.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index 6d5d9075105..a672801dc8a 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.2.3.0.tar.gz) = 365d6fbe9f87dfeaa89fda8ba6ff21811b6cd1babb2adfe975fb2d0d0f4d7071
-SIZE (cabal/lifted-base-0.2.3.0.tar.gz) = 11610
+SHA256 (cabal/lifted-base-0.2.3.6.tar.gz) = 57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb
+SIZE (cabal/lifted-base-0.2.3.6.tar.gz) = 11613
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 5aa2d1992a4..7cba0369a59 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile
new file mode 100644
index 00000000000..9b5211d495a
--- /dev/null
+++ b/devel/hs-map-syntax/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= map-syntax
+PORTVERSION= 0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Syntax sugar for defining maps
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl>=2.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo
new file mode 100644
index 00000000000..43334ad941e
--- /dev/null
+++ b/devel/hs-map-syntax/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/map-syntax-0.2.tar.gz) = 395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b
+SIZE (cabal/map-syntax-0.2.tar.gz) = 7129
diff --git a/devel/hs-map-syntax/pkg-descr b/devel/hs-map-syntax/pkg-descr
new file mode 100644
index 00000000000..9cdde850ea7
--- /dev/null
+++ b/devel/hs-map-syntax/pkg-descr
@@ -0,0 +1,6 @@
+Haskell's canonical list of tuples syntax for defining maps is not very
+convenient and also has ambiguous semantics. This package leverages do
+notation to create a lighter syntax that makes semantics explicit and
+also allows the option of fail-fast handling of duplicate keys.
+
+WWW: http://hackage.haskell.org/package/map-syntax
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
new file mode 100644
index 00000000000..5850cc37ff0
--- /dev/null
+++ b/devel/hs-memory/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= memory
+PORTVERSION= 0.8
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Memory and related abtraction stuff
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
new file mode 100644
index 00000000000..970dfe7c1e3
--- /dev/null
+++ b/devel/hs-memory/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/memory-0.8.tar.gz) = 7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de
+SIZE (cabal/memory-0.8.tar.gz) = 35030
diff --git a/devel/hs-memory/pkg-descr b/devel/hs-memory/pkg-descr
new file mode 100644
index 00000000000..5aa0cfe5692
--- /dev/null
+++ b/devel/hs-memory/pkg-descr
@@ -0,0 +1,9 @@
+Chunk of memory, polymorphic byte array management and manipulation:
+
+ * A polymorphic byte array abstraction and function similar to strict
+ ByteString.
+ * Different type of byte array abstraction.
+ * Raw memory IO operations (memory set, memory copy, ..).
+ * Aliasing with endianness support.
+
+WWW: https://github.com/vincenthz/hs-memory
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index c7a032ddeab..d7cbc667bef 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index c173deb3925..1cc5678b0db 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mmorph
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
index 9d29f3816de..0e1846b9399 100644
--- a/devel/hs-mmorph/distinfo
+++ b/devel/hs-mmorph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mmorph-1.0.3.tar.gz) = 151bd6a93bcaabbc7ad0b106fe286129568837d7e3488fb86483f73fccfa172d
-SIZE (cabal/mmorph-1.0.3.tar.gz) = 6023
+SHA256 (cabal/mmorph-1.0.4.tar.gz) = 22e3665b4c86bf28cb4e836da91f586294d74d1cf1c18db364dcf568eba7bf4c
+SIZE (cabal/mmorph-1.0.4.tar.gz) = 6100
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 751b48e4e6c..6c99ba9d3bf 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 0.3.3.0
-PORTREVISION= 1
+PORTVERSION= 1.0.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index 3237fa4a4e3..6f5a9de683f 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-control-0.3.3.0.tar.gz) = ef44c9943760f2120eb450182852d6150390daa2de4b87e9dda9591e89714e6e
-SIZE (cabal/monad-control-0.3.3.0.tar.gz) = 10518
+SHA256 (cabal/monad-control-1.0.0.4.tar.gz) = e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e
+SIZE (cabal/monad-control-1.0.0.4.tar.gz) = 10709
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index a40060f69a5..6400fc96030 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.7.1
-PORTREVISION= 1
+PORTVERSION= 0.3.13.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 389c81d5839..c6f87b261e5 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.3.7.1.tar.gz) = 31c1f7769652e40f0688b965a7fd399df97762a426921c924aa1bacbde0ab946
-SIZE (cabal/monad-logger-0.3.7.1.tar.gz) = 6185
+SHA256 (cabal/monad-logger-0.3.13.2.tar.gz) = c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2
+SIZE (cabal/monad-logger-0.3.13.2.tar.gz) = 7402
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index f4425f15136..b78cafd8880 100644
--- a/devel/hs-monad-loops/Makefile
+++ b/devel/hs-monad-loops/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-loops
-PORTVERSION= 0.4.2.1
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-loops/distinfo b/devel/hs-monad-loops/distinfo
index 5016f3397d6..49ee6342abf 100644
--- a/devel/hs-monad-loops/distinfo
+++ b/devel/hs-monad-loops/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-loops-0.4.2.1.tar.gz) = a6e888a462aff46297527e90a7bf0171bc2cff4cab073973bdbf2fc09ae5f9b6
-SIZE (cabal/monad-loops-0.4.2.1.tar.gz) = 4515
+SHA256 (cabal/monad-loops-0.4.3.tar.gz) = 7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18
+SIZE (cabal/monad-loops-0.4.3.tar.gz) = 4996
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index 4911fbe8a1e..bd3a91d3f20 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 21669eebfce..13f3ff3f39a 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.6
-PORTREVISION= 1
+PORTVERSION= 0.3.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,5 +12,7 @@ LICENSE= BSD3CLAUSE
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
+FLAGS_DISABLE= chaselev newgeneric
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index 863fa2c8169..c437a95a4c6 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-0.3.4.6.tar.gz) = fe9b0955a83e45b58f29f91573e96ea85ba6f90057a1e976054f8681af2b64cc
-SIZE (cabal/monad-par-0.3.4.6.tar.gz) = 30200
+SHA256 (cabal/monad-par-0.3.4.7.tar.gz) = 23b8a68719b4c5848ce9a3381ce9efdc1c96677ba043a3ee74d99223343cc28a
+SIZE (cabal/monad-par-0.3.4.7.tar.gz) = 30411
diff --git a/devel/hs-monad-par/pkg-descr b/devel/hs-monad-par/pkg-descr
index 0c9cedb71b1..5224858f9bd 100644
--- a/devel/hs-monad-par/pkg-descr
+++ b/devel/hs-monad-par/pkg-descr
@@ -1,5 +1,7 @@
The Par monad offers a simple API for parallel programming. The library
works for parallelising both pure and IO computations, although only the
-pure version is deterministic.
+pure version is deterministic. The default implementation provides a
+work-stealing scheduler and supports forking tasks that are much lighter
+weight than IO-threads.
WWW: http://github.com/simonmar/monad-par
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 77939b2a0f3..1f45127f504 100644
--- a/devel/hs-monads-tf/Makefile
+++ b/devel/hs-monads-tf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monads-tf
PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index ed40fa86a32..fbc0fd98ac5 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mono-traversable
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.9.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container
LICENSE= MIT
-USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances hashable \
+USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \
semigroupoids>=3.0 semigroups>=0.10 text>=0.11 \
unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \
vector-instances
diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo
index 5ef69f0776b..d8a1f0bd5c3 100644
--- a/devel/hs-mono-traversable/distinfo
+++ b/devel/hs-mono-traversable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mono-traversable-0.6.1.tar.gz) = ae4c578f73bb46aefcd2db27b510bdcff92a47d0f90f3f1e3419b4299d73de18
-SIZE (cabal/mono-traversable-0.6.1.tar.gz) = 23230
+SHA256 (cabal/mono-traversable-0.9.2.1.tar.gz) = 34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef
+SIZE (cabal/mono-traversable-0.9.2.1.tar.gz) = 36866
diff --git a/devel/hs-mono-traversable/pkg-descr b/devel/hs-mono-traversable/pkg-descr
index 8b4e27a4fbe..9784c3ec67d 100644
--- a/devel/hs-mono-traversable/pkg-descr
+++ b/devel/hs-mono-traversable/pkg-descr
@@ -1,5 +1,4 @@
Monomorphic variants of the Functor, Foldable, and Traversable
-typeclasses. Contains even more experimental code for abstracting
-containers and sequences.
+typeclasses.
WWW: https://github.com/snoyberg/mono-traversable
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index c6673ece8b9..def4bfd35a9 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mtl
-PORTVERSION= 2.1.3.1
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 902fb2a08ba..92566c3d820 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mtl-2.1.3.1.tar.gz) = 77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6
-SIZE (cabal/mtl-2.1.3.1.tar.gz) = 13955
+SHA256 (cabal/mtl-2.2.1.tar.gz) = cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5
+SIZE (cabal/mtl-2.2.1.tar.gz) = 15391
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 9c05e136143..3c393935661 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.9.1.1
-PORTREVISION= 1
+PORTVERSION= 0.9.1.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Safely evaluate pure Haskell expressions
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions hint>=0.3.1 mtl>2 show>=0.3 \
+USE_CABAL= extensible-exceptions hint>=0.3.1 mtl>2 QuickCheck show>=0.3 \
simple-reflect utf8-string
EXECUTABLE= mueval mueval-core
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index 003ebf5f660..652c106d617 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mueval-0.9.1.1.tar.gz) = ff8a460a09e3371cedb9e4393fb84b2bcb65b6b164257af1413eb0b12872385d
-SIZE (cabal/mueval-0.9.1.1.tar.gz) = 15346
+SHA256 (cabal/mueval-0.9.1.1.2.tar.gz) = e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1
+SIZE (cabal/mueval-0.9.1.1.2.tar.gz) = 15746
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index a1cb0b576fa..2d6bac570fc 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.7
-PORTREVISION= 1
+PORTVERSION= 0.1.0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 7eecfe66cbf..62562b5dff3 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/murmur-hash-0.1.0.7.tar.gz) = 775ef5836344f30c37a9f07b70553ade9bf4f33524fad03eaac2a21daf27bb88
-SIZE (cabal/murmur-hash-0.1.0.7.tar.gz) = 4073
+SHA256 (cabal/murmur-hash-0.1.0.8.tar.gz) = 6cb9f4dc4a7d5b35e843bb8767d2e2c9745bcfbdacb5daf4fce5f4e05f983a06
+SIZE (cabal/murmur-hash-0.1.0.8.tar.gz) = 4072
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
new file mode 100644
index 00000000000..32a465b32eb
--- /dev/null
+++ b/devel/hs-mutable-containers/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= mutable-containers
+PORTVERSION= 0.3.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Abstactions and concrete implementations of mutable containers
+
+LICENSE= MIT
+
+USE_CABAL= mono-traversable primitive>=0.5.2.1 vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mutable-containers/distinfo b/devel/hs-mutable-containers/distinfo
new file mode 100644
index 00000000000..aaa27aac7ba
--- /dev/null
+++ b/devel/hs-mutable-containers/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/mutable-containers-0.3.2.tar.gz) = 781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e
+SIZE (cabal/mutable-containers-0.3.2.tar.gz) = 11969
diff --git a/devel/hs-mutable-containers/pkg-descr b/devel/hs-mutable-containers/pkg-descr
new file mode 100644
index 00000000000..a204e34b67c
--- /dev/null
+++ b/devel/hs-mutable-containers/pkg-descr
@@ -0,0 +1,10 @@
+One of Haskell's strengths is immutable data structures. These
+structures make it easier to reason about code, simplify concurrency and
+parallelism, and in some cases can improve performance by allowing
+sharing. However, there are still classes of problems where mutable
+data structures can both be more convenient, and provide a performance
+boost. This library is meant to provide such structures in a
+performant, well tested way. It also provides a simple abstraction over
+such data structures via typeclasses.
+
+WWW: https://github.com/fpco/mutable-containers
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
new file mode 100644
index 00000000000..a914fee795d
--- /dev/null
+++ b/devel/hs-newtype/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= newtype
+PORTVERSION= 0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Typeclass and set of functions for working with newtypes
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-newtype/distinfo b/devel/hs-newtype/distinfo
new file mode 100644
index 00000000000..4e4d18370e6
--- /dev/null
+++ b/devel/hs-newtype/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/newtype-0.2.tar.gz) = b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459
+SIZE (cabal/newtype-0.2.tar.gz) = 3476
diff --git a/devel/hs-newtype/pkg-descr b/devel/hs-newtype/pkg-descr
new file mode 100644
index 00000000000..7138e74129f
--- /dev/null
+++ b/devel/hs-newtype/pkg-descr
@@ -0,0 +1,5 @@
+Per Conor McBride, the Newtype typeclass represents the packing and
+unpacking of a newtype, and allows you to operatate under that newtype
+with functions such as ala.
+
+WWW: http://hackage.haskell.org/package/newtype
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
new file mode 100644
index 00000000000..5f8ee8fc53e
--- /dev/null
+++ b/devel/hs-old-locale/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= old-locale
+PORTVERSION= 1.0.0.7
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Locale library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-old-locale/distinfo b/devel/hs-old-locale/distinfo
new file mode 100644
index 00000000000..538cc2730c3
--- /dev/null
+++ b/devel/hs-old-locale/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
+SIZE (cabal/old-locale-1.0.0.7.tar.gz) = 3384
diff --git a/devel/hs-old-locale/pkg-descr b/devel/hs-old-locale/pkg-descr
new file mode 100644
index 00000000000..a22d74894dd
--- /dev/null
+++ b/devel/hs-old-locale/pkg-descr
@@ -0,0 +1,4 @@
+This package provides the ability to adapt to locale conventions such as
+date and time formats.
+
+WWW: http://hackage.haskell.org/package/old-locale
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
new file mode 100644
index 00000000000..4fa6296b852
--- /dev/null
+++ b/devel/hs-old-time/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= old-time
+PORTVERSION= 1.1.0.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Time library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= old-locale>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-old-time/distinfo b/devel/hs-old-time/distinfo
new file mode 100644
index 00000000000..87139101e08
--- /dev/null
+++ b/devel/hs-old-time/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/old-time-1.1.0.3.tar.gz) = 1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1
+SIZE (cabal/old-time-1.1.0.3.tar.gz) = 74219
diff --git a/devel/hs-old-time/pkg-descr b/devel/hs-old-time/pkg-descr
new file mode 100644
index 00000000000..33a9f27223c
--- /dev/null
+++ b/devel/hs-old-time/pkg-descr
@@ -0,0 +1,3 @@
+This package provides the old time library.
+
+WWW: http://hackage.haskell.org/package/old-time
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 26983edd747..5359e2f18a0 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.9.1.1
-PORTREVISION= 1
+PORTVERSION= 0.11.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Utilities and combinators for parsing command line options
LICENSE= BSD3CLAUSE
-USE_CABAL= ansi-wl-pprint>=0.6 transformers-compat
+USE_CABAL= ansi-wl-pprint>=0.6 transformers-compat>=0.3
.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 c7b28de0419..a00ea9d3a1f 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/optparse-applicative-0.9.1.1.tar.gz) = e6093c36f9b996f8431f588c1b95439fe151278e72a9236f51e2b5e4d340c8bb
-SIZE (cabal/optparse-applicative-0.9.1.1.tar.gz) = 32757
+SHA256 (cabal/optparse-applicative-0.11.0.2.tar.gz) = 31c6923c01cfd6dce0cf83f3430c17d164169f0db6ff2de9b3b294926214255a
+SIZE (cabal/optparse-applicative-0.11.0.2.tar.gz) = 30425
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index d00a1bb291d..0efe30d5ca2 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.0.4
-PORTREVISION= 1
+PORTVERSION= 3.2.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index 7e67f42e767..cce1d45d616 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parallel-3.2.0.4.tar.gz) = 8cdb637fc04e4dd62f9deb0fe3c191b8068526009960f297f54dc9cf5616146d
-SIZE (cabal/parallel-3.2.0.4.tar.gz) = 12842
+SHA256 (cabal/parallel-3.2.0.6.tar.gz) = b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642
+SIZE (cabal/parallel-3.2.0.6.tar.gz) = 12990
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 674d517887a..10c0a3c5e1f 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pcre-light
-PORTVERSION= 0.4.0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index c153f1d756a..a670ce2345b 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pcre-light-0.4.0.2.tar.gz) = ddda356c3dc0075d7fa2740a56845a68360baf896e3e9420ace68c399a21582d
-SIZE (cabal/pcre-light-0.4.0.2.tar.gz) = 15355
+SHA256 (cabal/pcre-light-0.4.0.3.tar.gz) = 6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50
+SIZE (cabal/pcre-light-0.4.0.3.tar.gz) = 16574
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index dd3f42b26a8..b93e89fead2 100644
--- a/devel/hs-prelude-extras/Makefile
+++ b/devel/hs-prelude-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prelude-extras
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
new file mode 100644
index 00000000000..a158db528b4
--- /dev/null
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= preprocessor-tools
+PORTVERSION= 1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Framework for extending Haskell's syntax via quick-and-dirty preprocessors
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl>=1 parsec>=3 syb>=0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-preprocessor-tools/distinfo b/devel/hs-preprocessor-tools/distinfo
new file mode 100644
index 00000000000..3a00f578b08
--- /dev/null
+++ b/devel/hs-preprocessor-tools/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/preprocessor-tools-1.0.1.tar.gz) = c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59
+SIZE (cabal/preprocessor-tools-1.0.1.tar.gz) = 9895
diff --git a/devel/hs-preprocessor-tools/pkg-descr b/devel/hs-preprocessor-tools/pkg-descr
new file mode 100644
index 00000000000..6e05c41e35e
--- /dev/null
+++ b/devel/hs-preprocessor-tools/pkg-descr
@@ -0,0 +1,6 @@
+This library provides a quick-and-dirty (but often effective) method for
+extending Haskell's syntax using a custom preprocessor. It parses
+Haskell into a bare-bones AST with just enough knowledge of the syntax
+to preserve nesting, and then allows transformations on the AST.
+
+WWW: http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/
diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index cbdddd1a1d8..48c4e2de3ad 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 7f6d8859c15..c3674d03a4b 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.5.2.1
-PORTREVISION= 1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 1cb1df22712..91392bdabf9 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/primitive-0.5.2.1.tar.gz) = 0e516b81c2ef2c96d47dc40561663cc2cbfece0f135948e77e9b53025ff1c3ee
-SIZE (cabal/primitive-0.5.2.1.tar.gz) = 10923
+SHA256 (cabal/primitive-0.6.tar.gz) = 34a5f39213c68369e7edc2a3ea175d3f4edbf89e9f0777784710eff6f2d69722
+SIZE (cabal/primitive-0.6.tar.gz) = 12677
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 1e1e6b0f0a4..671a6c857d2 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 4.2.0.1
-PORTREVISION= 1
+PORTVERSION= 5.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Profunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 distributive>=0.4.4 semigroupoids>=4 \
- tagged>=0.4.4
+USE_CABAL= comonad>=4 distributive>=0.4.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 d90d35d340e..136ffac3293 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/profunctors-4.2.0.1.tar.gz) = 0cdb27e871e167e24935caee6435c08701227a116a8c526dea32ca3f54cc8e01
-SIZE (cabal/profunctors-4.2.0.1.tar.gz) = 15005
+SHA256 (cabal/profunctors-5.1.1.tar.gz) = 873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253
+SIZE (cabal/profunctors-5.1.1.tar.gz) = 17866
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index f7c0aa742d8..71e0917a97d 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.1.4.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Specify Haskell project templates and generate files
LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \
- resourcet>=0.4.3 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.11
+ resourcet>=0.4.3 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 52888d7e202..24f8fe521f7 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/project-template-0.1.4.1.tar.gz) = 8b16b378f3852d9ba8f2531a8c97515a2a2bc6e762c1437c5b9cb53f89425def
-SIZE (cabal/project-template-0.1.4.1.tar.gz) = 4483
+SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310
+SIZE (cabal/project-template-0.2.0.tar.gz) = 8251
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index 12e6fb4e19b..4ecbbef1f68 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -2,7 +2,7 @@
PORTNAME= quickcheck-io
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index c15408277cf..c0322ce466e 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= random
-PORTVERSION= 1.0.1.1
-PORTREVISION= 10
+PORTVERSION= 1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/distinfo b/devel/hs-random/distinfo
index 7ebef9ee047..aac052b8e65 100644
--- a/devel/hs-random/distinfo
+++ b/devel/hs-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/random-1.0.1.1.tar.gz) = df7c3b405de0ac27a2ee8fdc8dad87cb42e8eac01fef53861e43bc47c8111559
-SIZE (cabal/random-1.0.1.1.tar.gz) = 8699
+SHA256 (cabal/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
+SIZE (cabal/random-1.1.tar.gz) = 10870
diff --git a/devel/hs-ranges/distinfo b/devel/hs-ranges/distinfo
deleted file mode 100644
index 569c639f515..00000000000
--- a/devel/hs-ranges/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/ranges-0.2.4.tar.gz) = dbbba083fccdd7f27454db3f29d0f9f13e927cb1e985641e5dbdcdbfddaebbfa
-SIZE (cabal/ranges-0.2.4.tar.gz) = 2244
diff --git a/devel/hs-ranges/pkg-descr b/devel/hs-ranges/pkg-descr
deleted file mode 100644
index 80a74326a39..00000000000
--- a/devel/hs-ranges/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ranges and some functions allowing things like fast membership lookup on
-ranges with holes in them and so on.
-
-WWW: http://hackage.haskell.org/package/ranges
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 65a28e8950f..3e2e695f389 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index 534c7ed5549..b607c9ce280 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTVERSION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 7a21bf3a6d0..e025aa7d2b3 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/reflection-1.5.1.tar.gz) = 9d4ad85c11a4986c904629c226c2be56f129f7691ddefe9373b2e87ca4a151a1
-SIZE (cabal/reflection-1.5.1.tar.gz) = 9436
+SHA256 (cabal/reflection-2.tar.gz) = ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2
+SIZE (cabal/reflection-2.tar.gz) = 13194
diff --git a/devel/hs-reflection/pkg-descr b/devel/hs-reflection/pkg-descr
index b07f7d5c6bb..1bc2f4753da 100644
--- a/devel/hs-reflection/pkg-descr
+++ b/devel/hs-reflection/pkg-descr
@@ -1,5 +1,11 @@
-This package provides an implementation of the ideas presented in the
-paper "Functional Pearl: Implicit Configurations" by Oleg Kiselyov and
-Chung-chieh Shan.
+This package addresses the configuration problem which is propogating
+configurations that are available at run-time, allowing multible
+configurations to coexist without resorting to mutable global variables
+or System.IO.Unsafe.unsafePerformIO.
+
+That package is an implementation of the ideas presented in the paper
+"Functional Pearl: Implicit Configurations" by Oleg Kiselyov and
+Chung-chieh Shan (original paper). However, the API has been
+streamlined to improve performance.
WWW: http://github.com/ekmett/reflection
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 89e641aa427..2e854229745 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resource-pool
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= High-performance striped resource pooling implementation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable monad-control>=0.2.0.1 stm transformers-base>=0.4 \
- vector>=0.7
+USE_CABAL= hashable monad-control>=0.2.0.1 stm>=2.3 \
+ 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 001e24e4bef..6f889e525a4 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resource-pool-0.2.3.0.tar.gz) = b086b50dea777db4ab2eea3f5e4b98c72b60a27f560e0ac60c2f1a8ded5e2f96
-SIZE (cabal/resource-pool-0.2.3.0.tar.gz) = 6500
+SHA256 (cabal/resource-pool-0.2.3.2.tar.gz) = 8627eea2bea8824af2723646e74e2af0c73f583dd0c496c9fd242cd9d242bc12
+SIZE (cabal/resource-pool-0.2.3.2.tar.gz) = 6527
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index b85e83c1fad..aa6659e0d60 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 1.1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Deterministic allocation and freeing of scarce resources
LICENSE= BSD3CLAUSE
USE_CABAL= exceptions>=0.5 lifted-base>=0.1 mmorph monad-control>=0.3.1 \
- mtl>=2.0 transformers-base>=0.4.1
+ mtl>=2.0 transformers-base>=0.4.1 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index af2a3d04cc5..12e5783cf1a 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-1.1.2.3.tar.gz) = 351e9451b5d9001078084916385f403774ba6ba28ed53c1be6e35134070e3fd8
-SIZE (cabal/resourcet-1.1.2.3.tar.gz) = 10745
+SHA256 (cabal/resourcet-1.1.6.tar.gz) = 3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e
+SIZE (cabal/resourcet-1.1.6.tar.gz) = 11627
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index 264103edaad..d7cceeee09a 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= safe
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 839ff0dcd4e..1fa4b9d9830 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/safe-0.3.7.tar.gz) = c114c41e1403441e3f873c9c9943368bda7069ff007fe60ce3f9509e95ac8867
-SIZE (cabal/safe-0.3.7.tar.gz) = 6294
+SHA256 (cabal/safe-0.3.9.tar.gz) = d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9
+SIZE (cabal/safe-0.3.9.tar.gz) = 6931
diff --git a/devel/hs-safe/pkg-descr b/devel/hs-safe/pkg-descr
index 8e6aa56937f..7fdc399f0e6 100644
--- a/devel/hs-safe/pkg-descr
+++ b/devel/hs-safe/pkg-descr
@@ -1,6 +1,12 @@
-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. These functions can be used to
-reduce the number of unsafe pattern matches in your code.
+A library wrapping Prelude/Data.List functions that can throw exceptions,
+such as head and !!.
-WWW: http://community.haskell.org/~ndm/safe/
+This package is divided into three modules:
+
+ * Safe contains safe variants of Prelude and Data.List functions.
+ * Safe.Foldable contains safe variants of Foldable functions.
+ * Safe.Exact creates crashing versions of functions like zip (errors if the
+ lists are not equal) and take (errors if there are not enough elements),
+ then wraps them to provide safe variants.
+
+WWW: https://github.com/ndmitchell/safe#readme
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index c813c424b86..6f48878a10f 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= scientific
-PORTVERSION= 0.3.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.3.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
index 23832d6b488..f91c9de62e1 100644
--- a/devel/hs-scientific/distinfo
+++ b/devel/hs-scientific/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/scientific-0.3.3.0.tar.gz) = 3bab5bc2df22feac6b2e461daf3ececae2e5083569e09bb463a78e82574c44ce
-SIZE (cabal/scientific-0.3.3.0.tar.gz) = 17182
+SHA256 (cabal/scientific-0.3.3.8.tar.gz) = e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c
+SIZE (cabal/scientific-0.3.3.8.tar.gz) = 18543
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index 17129e8d1c7..b1a5d520fcf 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= securemem
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Abstraction to an auto scrubbing and const time eq, memory chunk
LICENSE= BSD3CLAUSE
-USE_CABAL= byteable>=0.1.1
+USE_CABAL= byteable>=0.1.1 memory>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
index c826a19bc91..ab0b798d33e 100644
--- a/devel/hs-securemem/distinfo
+++ b/devel/hs-securemem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/securemem-0.1.3.tar.gz) = 12a42caa7b09076197f14eb8511ec98969becdd81596617fe71cc13dcebccccf
-SIZE (cabal/securemem-0.1.3.tar.gz) = 4585
+SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036
+SIZE (cabal/securemem-0.1.9.tar.gz) = 4180
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index cb44647db08..97cf3c68515 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= setenv
-PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
index c0147ffa90e..dded823e77a 100644
--- a/devel/hs-setenv/distinfo
+++ b/devel/hs-setenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/setenv-0.1.1.1.tar.gz) = 230d87b0d04b2b05460ddf5a31569250ee1c3df6f91762733a29c434b7def32b
-SIZE (cabal/setenv-0.1.1.1.tar.gz) = 3019
+SHA256 (cabal/setenv-0.1.1.3.tar.gz) = e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32
+SIZE (cabal/setenv-0.1.1.3.tar.gz) = 2710
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index b141468f1b3..af2c6d8239c 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shake
-PORTVERSION= 0.13.2
-PORTREVISION= 1
+PORTVERSION= 0.15.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ 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
+USE_CABAL= extra>=1.3 hashable>=1.1.2.3 js-flot js-jquery old-time \
+ random unordered-containers>=0.2.1 utf8-string>=0.3
EXECUTABLE= shake
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index b151993e11e..66d22f9b1f3 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shake-0.13.2.tar.gz) = cafa769e1b04f989ab5bc87d9f8fac38d7421774b2aacd1e7750f5de80077845
-SIZE (cabal/shake-0.13.2.tar.gz) = 1235826
+SHA256 (cabal/shake-0.15.5.tar.gz) = 2c806824c9e8a619f364c3ec6bb910d7b1d0b0d3ba39ab472bffb60311f373a3
+SIZE (cabal/shake-0.15.5.tar.gz) = 507883
diff --git a/devel/hs-shake/pkg-descr b/devel/hs-shake/pkg-descr
index 1c1dd5c5b28..13ba3320d31 100644
--- a/devel/hs-shake/pkg-descr
+++ b/devel/hs-shake/pkg-descr
@@ -11,4 +11,4 @@ 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
+WWW: http://shakebuild.com/
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 3e2e1c6ea8e..aec1d07304f 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index e863c900997..3306d814d82 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= silently
-PORTVERSION= 1.2.4.1
-PORTREVISION= 7
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index e80b0761afe..c9b6aed74b4 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/silently-1.2.4.1.tar.gz) = a2b8f53e7e7bc0272852852c49d8b27ff250accc73e25cbe9f1e20f3fee0ad0c
-SIZE (cabal/silently-1.2.4.1.tar.gz) = 3199
+SHA256 (cabal/silently-1.2.5.tar.gz) = cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839
+SIZE (cabal/silently-1.2.5.tar.gz) = 3364
diff --git a/devel/hs-silently/pkg-descr b/devel/hs-silently/pkg-descr
index de5c2067971..d6c68b63d33 100644
--- a/devel/hs-silently/pkg-descr
+++ b/devel/hs-silently/pkg-descr
@@ -1,3 +1,3 @@
Prevent or capture writing to stdout and other handles.
-WWW: https://github.com/trystan/silently
+WWW: https://github.com/hspec/silently
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 601e95ae4ac..48ba1ad017f 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index d69a03f48ff..c3aec7b9c76 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index bc53c92f0c9..e3ba2116e00 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -3,7 +3,7 @@
PORTNAME= split
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/files/patch-split.cabal b/devel/hs-split/files/patch-split.cabal
new file mode 100644
index 00000000000..be8fe222fdd
--- /dev/null
+++ b/devel/hs-split/files/patch-split.cabal
@@ -0,0 +1,11 @@
+--- split.cabal.orig 2013-04-14 18:47:17 UTC
++++ split.cabal
+@@ -51,7 +51,7 @@ Source-repository head
+
+ Library
+ ghc-options: -Wall
+- build-depends: base <4.8
++ build-depends: base <4.9
+ exposed-modules: Data.List.Split, Data.List.Split.Internals
+ default-language: Haskell2010
+ Hs-source-dirs: src
diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile
index c81c93fc95f..6be17fe14f1 100644
--- a/devel/hs-stm-chans/Makefile
+++ b/devel/hs-stm-chans/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= stm-chans
-PORTVERSION= 3.0.0.2
-PORTREVISION= 1
+PORTVERSION= 3.0.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm-chans/distinfo b/devel/hs-stm-chans/distinfo
index 48eb7bb3c9a..e0fa2ef77f8 100644
--- a/devel/hs-stm-chans/distinfo
+++ b/devel/hs-stm-chans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-chans-3.0.0.2.tar.gz) = d07abf7a8bf9689b92f69bb73e9c1b71dc785d7b0a7b512dc24d77e945024aff
-SIZE (cabal/stm-chans-3.0.0.2.tar.gz) = 9401
+SHA256 (cabal/stm-chans-3.0.0.4.tar.gz) = 2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738
+SIZE (cabal/stm-chans-3.0.0.4.tar.gz) = 9673
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 6118a68c81d..e026222609f 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= stm
-PORTVERSION= 2.4.2
-PORTREVISION= 6
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 6216a1482c4..314276a4b6b 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-2.4.2.tar.gz) = c8ee3cd64c266133902619cfff2d04e5f66206f91dbce8dd1182037fbe4858db
-SIZE (cabal/stm-2.4.2.tar.gz) = 9635
+SHA256 (cabal/stm-2.4.4.tar.gz) = 5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d
+SIZE (cabal/stm-2.4.4.tar.gz) = 10349
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index 389166a446c..e7c7f805a95 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= streaming-commons
-PORTVERSION= 0.1.4.1
-PORTREVISION= 1
+PORTVERSION= 0.1.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo
index 7cc5d80a0e4..53346afce3b 100644
--- a/devel/hs-streaming-commons/distinfo
+++ b/devel/hs-streaming-commons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/streaming-commons-0.1.4.1.tar.gz) = 8caada6a54ec1e469510701426748af60e3633835679e05d5c107c58a4a8bd58
-SIZE (cabal/streaming-commons-0.1.4.1.tar.gz) = 77980
+SHA256 (cabal/streaming-commons-0.1.12.1.tar.gz) = d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7
+SIZE (cabal/streaming-commons-0.1.12.1.tar.gz) = 86864
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 39b4ee76fa0..0a03a25d57e 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 11
+PORTREVISION= 12
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 ac8e95e064e..404b77639c4 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index e4aa338fd7f..7189fde1278 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.5
-PORTREVISION= 1
+PORTVERSION= 0.6.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 0c6d837bf0b..41462786f91 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.5.tar.gz) = f617ee2dc6f2b0ad35e130c50500a2f67fe76b94df86b7ce5cfb2d2545bac4be
-SIZE (cabal/syb-with-class-0.6.1.5.tar.gz) = 12443
+SHA256 (cabal/syb-with-class-0.6.1.6.tar.gz) = 565c909dcf39c30c7fa2b5721e5d1049dbc9cdcd23e63645f69d8e245e84c1b0
+SIZE (cabal/syb-with-class-0.6.1.6.tar.gz) = 12515
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 6aaed661477..fbe3ba5857a 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index 31909939c6a..fa8be9c884b 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-0.4.1.tar.gz) = aa32cb3d9a0cbcfb24ac1c5d567886e8908dd017fd009ffd446bff86732670d2
-SIZE (cabal/syb-0.4.1.tar.gz) = 38699
+SHA256 (cabal/syb-0.5.1.tar.gz) = 81b05f0e78d03e1cabe9610a6045a5ae74d88eaed7e79464d436ccaa6af93846
+SIZE (cabal/syb-0.5.1.tar.gz) = 39469
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 9b1db5d8d09..c94909f154d 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-fileio
-PORTVERSION= 0.3.14
-PORTREVISION= 1
+PORTVERSION= 0.3.16.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index df65aaa3308..88c5f333f02 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-fileio-0.3.14.tar.gz) = 49c03f08ec03a0647392738e9d445048ac3734c22392a6dae63c58d159ccacf4
-SIZE (cabal/system-fileio-0.3.14.tar.gz) = 15390
+SHA256 (cabal/system-fileio-0.3.16.3.tar.gz) = 3175707cb322c65760fa2eb2ab17327f251c8294ad688efc6258e82328830491
+SIZE (cabal/system-fileio-0.3.16.3.tar.gz) = 15296
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index c2e3dc66ae9..4ac83df0132 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-filepath
-PORTVERSION= 0.4.12
-PORTREVISION= 1
+PORTVERSION= 0.4.13.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= High-level, byte-based file and directory path manipulations
LICENSE= MIT
-USE_CABAL= text>=0.7.1
+USE_CABAL= text>=0.11.0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index e7181fbe34e..10b75e63b87 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-filepath-0.4.12.tar.gz) = a2714835ac25263b64c340a497e4d9409b8475181b885bb1836995f63855d969
-SIZE (cabal/system-filepath-0.4.12.tar.gz) = 15860
+SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb
+SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590
diff --git a/devel/hs-system-filepath/pkg-descr b/devel/hs-system-filepath/pkg-descr
index c57f56163c6..059dae31f05 100644
--- a/devel/hs-system-filepath/pkg-descr
+++ b/devel/hs-system-filepath/pkg-descr
@@ -1,3 +1,3 @@
High-level, byte-based file and directory path manipulations.
-WWW: https://john-millikin.com/software/haskell-filesystem/
+WWW: https://github.com/fpco/haskell-filesystem
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 541ffe0a04b..38be9aefa82 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 0.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index 3fac8553644..14ddc6e32d0 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagged-0.7.2.tar.gz) = 055b2d9f7124176197f3564bcdbbb62374090c9e103819bff0d4e22db47e871b
-SIZE (cabal/tagged-0.7.2.tar.gz) = 5534
+SHA256 (cabal/tagged-0.8.1.tar.gz) = 5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1
+SIZE (cabal/tagged-0.8.1.tar.gz) = 8088
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index ba117b0216d..eb5fd35bb73 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,7 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 3386cc48e7b..28ee9401c11 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 0d0e239867b..bf848b7be01 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.3.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
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
new file mode 100644
index 00000000000..64f0f4a6757
--- /dev/null
+++ b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
@@ -0,0 +1,11 @@
+--- test-framework-quickcheck2.cabal.orig 2014-04-11 10:23:46 UTC
++++ test-framework-quickcheck2.cabal
+@@ -25,7 +25,7 @@ Library
+ Exposed-Modules: Test.Framework.Providers.QuickCheck2
+
+ Build-Depends: test-framework >= 0.7.1,
+- QuickCheck >= 2.4 && < 2.8,
++ QuickCheck >= 2.4 && < 2.9,
+ extensible-exceptions >= 0.1.1 && < 0.2.0
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4, random >= 1
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 931fb5541c4..8518670aea2 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework
-PORTVERSION= 0.8.0.3
-PORTREVISION= 1
+PORTVERSION= 0.8.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Framework for running and organising tests, with HUnit and QuickCheck s
LICENSE= BSD3CLAUSE
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
+ old-locale>=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 400287472d4..ac25d81801b 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-0.8.0.3.tar.gz) = 5915bebf20a36f524241d1b85c45be2f767a9f9caeddc06d96e3ebab5ae1d68c
-SIZE (cabal/test-framework-0.8.0.3.tar.gz) = 20777
+SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273
+SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900
diff --git a/devel/hs-test-framework/pkg-descr b/devel/hs-test-framework/pkg-descr
index fed515745e1..302c3ac2ef9 100644
--- a/devel/hs-test-framework/pkg-descr
+++ b/devel/hs-test-framework/pkg-descr
@@ -4,4 +4,4 @@ order, to aid diff interpretation) and filtered and controlled by command
line options. All of this comes with colored test output, progress reporting
and test statistics output.
-WWW: http://batterseapower.github.com/test-framework/
+WWW: http://batterseapower.github.io/test-framework/
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
deleted file mode 100644
index d0535fb6b5a..00000000000
--- a/devel/hs-testpack/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= testpack
-PORTVERSION= 2.1.2.1
-PORTREVISION= 7
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Test Utility Pack for HUnit and QuickCheck
-
-LICENSE= LGPL21
-
-USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-testpack/distinfo b/devel/hs-testpack/distinfo
deleted file mode 100644
index 6261b2adb87..00000000000
--- a/devel/hs-testpack/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/testpack-2.1.2.1.tar.gz) = 4096465f44f1add5a24134bebdcef5259bff31661680cc1061900bbd936fa4ba
-SIZE (cabal/testpack-2.1.2.1.tar.gz) = 14795
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
deleted file mode 100644
index c0bab41941e..00000000000
--- a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
+++ /dev/null
@@ -1,74 +0,0 @@
---- ./src/Test/HUnit/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./src/Test/HUnit/Tools.hs 2013-05-04 00:47:19.298796917 +0200
-@@ -22,7 +22,11 @@
- import Test.QuickCheck.Gen
- import Test.QuickCheck.State
- import qualified Test.QuickCheck.Property as P
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+import Test.QuickCheck.Property hiding (Result(reason), interrupted)
-+#else
- import Test.QuickCheck.Property hiding (Result(reason))
-+#endif
- import qualified Control.Exception
- import qualified Test.HUnit as HU
- import System.Random
-@@ -128,7 +132,11 @@
- > q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
- -}
- qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
-+#if MIN_VERSION_QuickCheck(2,5,0)
-+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscardRatio = 1000})
-+#else
- qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
-+#endif
-
- {- | Run verbose tests. Example:
-
-@@ -163,18 +171,26 @@
- -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
- localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
- localquickCheckWithResult args p =
-- do
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
-+#else
-+ do
- #if MIN_VERSION_QuickCheck(2,3,0)
- tm <- if chatty args then newStdioTerminal else newNullTerminal
- #else
- tm <- newTerminal
- #endif
-+#endif
- rnd <- case replay args of
- Nothing -> newStdGen
- Just (rnd,_) -> return rnd
- test MkState{ terminal = tm
- , maxSuccessTests = maxSuccess args
-+#if MIN_VERSION_QuickCheck(2,5,0)
-+ , maxDiscardedTests = maxDiscardRatio args
-+#else
- , maxDiscardedTests = maxDiscard args
-+#endif
- , computeSize = case replay args of
- Nothing -> \n d -> (n * maxSize args)
- `div` maxSuccess args
-@@ -190,6 +206,10 @@
- #endif
- , numSuccessShrinks = 0
- , numTryShrinks = 0
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ , numRecentlyDiscardedTests = 0
-+ , numTotTryShrinks = 0
-+#endif
- } (unGen (property p))
- where
- --------------------------------------------------------------------------
-@@ -288,5 +308,8 @@
- , numShrinks = numShrinks
- , output = theOutput
- #endif
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ , interrupted = False
-+#endif
- }
- where (rnd1,rnd2) = split (randomSeed st)
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
deleted file mode 100644
index 446d7dfc5e9..00000000000
--- a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/Test/QuickCheck/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./src/Test/QuickCheck/Tools.hs 2013-05-04 00:42:02.274698941 +0200
-@@ -23,14 +23,18 @@
-
- )
- where
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+import Test.QuickCheck hiding (Result, reason, interrupted)
-+#else
- import Test.QuickCheck hiding (Result, reason)
-+#endif
- import Test.QuickCheck.Property
-
- {- | Compare two values. If same, the test passes. If different, the result indicates
- what was expected and what was received as part of the error. -}
- (@=?) :: (Eq a, Show a) => a -> a -> Result
- expected @=? actual =
-- MkResult {ok = Just (expected == actual),
-+ result { ok = Just (expected == actual),
- expect = True, interrupted = False,
- reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
- stamp = [], callbacks = []}
diff --git a/devel/hs-testpack/files/patch-testpack.cabal b/devel/hs-testpack/files/patch-testpack.cabal
deleted file mode 100644
index ad3736aabe8..00000000000
--- a/devel/hs-testpack/files/patch-testpack.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./testpack.cabal.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./testpack.cabal 2013-05-04 00:08:00.417315359 +0200
-@@ -39,7 +39,7 @@
-
- Build-Depends: base >= 3 && < 5,
- mtl, HUnit,
-- QuickCheck >= 2.1.0.3 && < 2.5
-+ QuickCheck >= 2.1.0.3 && < 2.7
-
- If flag(splitBase)
- Build-Depends: base >= 3 && < 5, containers, random
diff --git a/devel/hs-testpack/pkg-descr b/devel/hs-testpack/pkg-descr
deleted file mode 100644
index b110688ae52..00000000000
--- a/devel/hs-testpack/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Haskell Test Utility Pack for HUnit and QuickCheck testpack provides
-utilities for both HUnit and QuickCheck. These include tools for running
-QuickCheck properties as HUnit test cases, allowing you to combine both
-approaches in a single program. It also includes tools for more helpful
-displays of running progress in both HUnit and QuickCheck, additional
-generators for other types for QuickCheck, and shortcuts for quickly
-defining new test cases.
-
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 3059400bc2a..1fd6fa86a60 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= text-icu
-PORTVERSION= 0.6.3.7
-PORTREVISION= 2
+PORTVERSION= 0.7.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-icu/distinfo b/devel/hs-text-icu/distinfo
index 5a68d6e191f..df0f0b18418 100644
--- a/devel/hs-text-icu/distinfo
+++ b/devel/hs-text-icu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-icu-0.6.3.7.tar.gz) = c4c13df96bb5c7fcd32f7ba08543ac6ffe0f121a9cb7c77b6a34bbceaa92ff57
-SIZE (cabal/text-icu-0.6.3.7.tar.gz) = 44748
+SHA256 (cabal/text-icu-0.7.0.1.tar.gz) = e2764c2749033706eed5b9fb3cda11177ad15cdf11912028f551eca39a2c7f78
+SIZE (cabal/text-icu-0.7.0.1.tar.gz) = 45533
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 275e4c73871..8cb68caa2ea 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.2.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 87f24e14565..21a9b6928f9 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-1.1.0.0.tar.gz) = 80f1ada824f0e3886bb49dc7fd128707ca1a34e06bbf4419873b1677c4d7ba92
-SIZE (cabal/text-1.1.0.0.tar.gz) = 136463
+SHA256 (cabal/text-1.2.1.3.tar.gz) = 98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f
+SIZE (cabal/text-1.2.1.3.tar.gz) = 145946
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 0d1aaabf52a..9e85e896b8c 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index 893ed8fe324..dbd33390567 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.1.2
-PORTREVISION= 1
+PORTVERSION= 0.5.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fork threads and wait for their result
LICENSE= BSD3CLAUSE
-USE_CABAL= base-unicode-symbols>=0.1.1 stm>=2.1
+USE_CABAL= stm>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index 3949eaac1f3..db08e1a6a00 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threads-0.5.1.2.tar.gz) = 49a4d776b9c8c8d11467a95bab500cca8a3921251db977dffca42a6dd45702af
-SIZE (cabal/threads-0.5.1.2.tar.gz) = 7418
+SHA256 (cabal/threads-0.5.1.3.tar.gz) = 02bd4c7597f77d0d5064db4031547cd7b4989f453c77d520223ba2b1b9846411
+SIZE (cabal/threads-0.5.1.3.tar.gz) = 7239
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index b6bfeb6bfd5..5fdd47934b9 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= threadscope
-PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTVERSION= 0.2.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Graphical tool for profiling parallel Haskell programs
LICENSE= BSD3CLAUSE
USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
- pango
+ pango text
EXECUTABLE= threadscope
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index 565e5568354..a93d17e8483 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threadscope-0.2.4.tar.gz) = 2915c8ba9a5bb249cc915860fe56402140e2cb9441664bd8b36dc80dd07d0888
-SIZE (cabal/threadscope-0.2.4.tar.gz) = 79582
+SHA256 (cabal/threadscope-0.2.7.tar.gz) = cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6
+SIZE (cabal/threadscope-0.2.7.tar.gz) = 79966
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 9c181de82b7..50cabf4e4a2 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +10,7 @@ COMMENT= Compatibility with old-time for the time package
LICENSE= BSD3CLAUSE
+USE_CABAL= old-time
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
new file mode 100644
index 00000000000..efae2d3a06d
--- /dev/null
+++ b/devel/hs-time-locale-compat/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= time-locale-compat
+PORTVERSION= 0.1.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compatibility of TimeLocale between old-locale and time-1.5
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-time-locale-compat/distinfo b/devel/hs-time-locale-compat/distinfo
new file mode 100644
index 00000000000..254aff6e4d7
--- /dev/null
+++ b/devel/hs-time-locale-compat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/time-locale-compat-0.1.1.0.tar.gz) = 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455
+SIZE (cabal/time-locale-compat-0.1.1.0.tar.gz) = 1933
diff --git a/devel/hs-time-locale-compat/pkg-descr b/devel/hs-time-locale-compat/pkg-descr
new file mode 100644
index 00000000000..52282288825
--- /dev/null
+++ b/devel/hs-time-locale-compat/pkg-descr
@@ -0,0 +1,3 @@
+This package contains wrapped name module for TimeLocale.
+
+WWW: http://twitter.com/khibino/
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index d01ea0c66ca..05ca18ba306 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index 5b49e5153f8..755daf31501 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-olson-0.1.4.tar.gz) = b38853e003bb8d8db927ba393a0d1c0aa64ffc1a7b1feba23e9dee14f133b2d0
-SIZE (cabal/timezone-olson-0.1.4.tar.gz) = 11639
+SHA256 (cabal/timezone-olson-0.1.7.tar.gz) = 232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa
+SIZE (cabal/timezone-olson-0.1.7.tar.gz) = 11313
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index 10c64bebdc6..f7b71b91614 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-series
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
index 1ead3afffaa..89961061e02 100644
--- a/devel/hs-timezone-series/distinfo
+++ b/devel/hs-timezone-series/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-series-0.1.3.tar.gz) = e37034f21c309b700fcb1a50527f325c25e47969e3faf954a0ee659e4452232c
-SIZE (cabal/timezone-series-0.1.3.tar.gz) = 5416
+SHA256 (cabal/timezone-series-0.1.5.1.tar.gz) = d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56
+SIZE (cabal/timezone-series-0.1.5.1.tar.gz) = 5330
diff --git a/devel/hs-timezone-series/pkg-descr b/devel/hs-timezone-series/pkg-descr
index e5828eff94c..75626f90e8d 100644
--- a/devel/hs-timezone-series/pkg-descr
+++ b/devel/hs-timezone-series/pkg-descr
@@ -1,5 +1,4 @@
This package endows Data.Time, from the time package, with several data
-types and functions for enhanced processing of timezones. For one way to
-create timezone series, see the timezone-olson package.
+types and functions for enhanced processing of timezones.
WWW: http://projects.haskell.org/time-ng/
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 3c25eea6c65..a0887bea8f4 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-base
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Lift computations from the bottom of a transformer stack
LICENSE= BSD3CLAUSE
+USE_CABAL= stm>=2.3 transformers-compat>=0.2
+
.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 81b1d7d7bd5..966b08ccdc3 100644
--- a/devel/hs-transformers-base/distinfo
+++ b/devel/hs-transformers-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/transformers-base-0.4.2.tar.gz) = 35258378843a77ab786119ded355b8916f8ed31106e767fe3955ad04c42d1c0c
-SIZE (cabal/transformers-base-0.4.2.tar.gz) = 2538
+SHA256 (cabal/transformers-base-0.4.4.tar.gz) = 6aa3494fc70659342fbbb163035d5827ecfd8079e3c929e2372adf771fd52387
+SIZE (cabal/transformers-base-0.4.4.tar.gz) = 2550
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
index 43aca6d252b..eb5636fbee8 100644
--- a/devel/hs-transformers-compat/Makefile
+++ b/devel/hs-transformers-compat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-compat
-PORTVERSION= 0.3.3.4
-PORTREVISION= 1
+PORTVERSION= 0.4.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ 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
index 79201bc19f9..14290a24ab7 100644
--- a/devel/hs-transformers-compat/distinfo
+++ b/devel/hs-transformers-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/transformers-compat-0.3.3.4.tar.gz) = 257712be0c2d5eedc6c835421751fce8daf45cf2687f2d6c27b92bff5e204bc1
-SIZE (cabal/transformers-compat-0.3.3.4.tar.gz) = 11143
+SHA256 (cabal/transformers-compat-0.4.0.4.tar.gz) = d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52
+SIZE (cabal/transformers-compat-0.4.0.4.tar.gz) = 12048
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index f6990a2fad2..3af42e625da 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index c966fde73a7..68d8c6fba98 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index bb49980f4c9..c61b6692e63 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.3
-PORTREVISION= 1
+PORTVERSION= 0.4.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index 63f8be2f5e5..b02b126258d 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.4.1.3.tar.gz) = ab930a71d3cd9884a6c2bf58f330fa13c68cecb26d5cff20d435cdf69d1bdced
-SIZE (cabal/unix-compat-0.4.1.3.tar.gz) = 12823
+SHA256 (cabal/unix-compat-0.4.1.4.tar.gz) = fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b
+SIZE (cabal/unix-compat-0.4.1.4.tar.gz) = 12830
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index ae4332369c4..d4cbd47db08 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,7 @@ COMMENT= Unix time parser/formatter and utilities
LICENSE= BSD3CLAUSE
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-
-.if ${OSVERSION} >= 901000 && ${OSVERSION} < 902001 && ${ARCH} == i386
-EXTRA_PATCHES+= ${PATCHDIR}/nopatch-unix-time.cabal
-.endif
+USE_CABAL= old-time
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index 35c54c6995a..a028d8ab3e9 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-time-0.3.3.tar.gz) = 1dc532d337484e957777b462804ed0fcec00b126c69c24bd465b4ed14abe1c05
-SIZE (cabal/unix-time-0.3.3.tar.gz) = 39845
+SHA256 (cabal/unix-time-0.3.5.tar.gz) = 7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e
+SIZE (cabal/unix-time-0.3.5.tar.gz) = 40201
diff --git a/devel/hs-unix-time/files/nopatch-unix-time.cabal b/devel/hs-unix-time/files/nopatch-unix-time.cabal
deleted file mode 100644
index 5b96f7aa063..00000000000
--- a/devel/hs-unix-time/files/nopatch-unix-time.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 99d0275b088..c8e0182ae72 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.4.0
-PORTREVISION= 1
+PORTVERSION= 0.2.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index 4965f5c2acf..dca2a234c77 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.4.0.tar.gz) = 34eaeb0c96d84169aca7085cf21f89bedb4bdb4de2ac78358a087faeea93cdf4
-SIZE (cabal/unordered-containers-0.2.4.0.tar.gz) = 25638
+SHA256 (cabal/unordered-containers-0.2.5.1.tar.gz) = 6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a
+SIZE (cabal/unordered-containers-0.2.5.1.tar.gz) = 26093
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index 7fc65187563..d974f5bc1d8 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index d2f5c634499..4f34953f6f9 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= utf8-string
-PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTVERSION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Support for reading/writing UTF-8 strings for Haskell programs
+COMMENT= Support for reading and writing UTF-8 strings
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index dba40c800e6..34d35826b42 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utf8-string-0.3.8.tar.gz) = 80757cbc00197ff71311dc8c1ca00284537442c2dc93f06685d369a6816d49c0
-SIZE (cabal/utf8-string-0.3.8.tar.gz) = 9129
+SHA256 (cabal/utf8-string-1.tar.gz) = 79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08
+SIZE (cabal/utf8-string-1.tar.gz) = 7707
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index affbe509145..1d8b3e5b028 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -3,7 +3,7 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 5a2d2118650..5ba6a77e9a5 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 1666d89dc8a..8cb9ec81b00 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uuagc-cabal
-PORTVERSION= 1.0.5.0
-PORTREVISION= 1
+PORTVERSION= 1.0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index 463c6513eec..de780e5ef4e 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 45f6c6038bc3f0d35e35ae6591fab58dd7268dac107cfc3fe7c2b4af5f60795c
-SIZE (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 14689
+SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b
+SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index b0ff66c00c6..56896be02d3 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uuagc
-PORTVERSION= 0.9.51
-PORTREVISION= 1
+PORTVERSION= 0.9.52.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,5 +15,7 @@ USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
EXECUTABLE= uuagc
+FLAGS_DISABLE= with-loag
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 30552b8eed7..0fb591a9110 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-0.9.51.tar.gz) = 5c084940d3246dfc5ed4ca818dea2cdf070852b2a091442ff281f422caabde1e
-SIZE (cabal/uuagc-0.9.51.tar.gz) = 791376
+SHA256 (cabal/uuagc-0.9.52.1.tar.gz) = 98092b13cb32e4493e877c3752deed471db762f04e7d979be4e6e89065502185
+SIZE (cabal/uuagc-0.9.52.1.tar.gz) = 795294
diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile
new file mode 100644
index 00000000000..170a0bba7bc
--- /dev/null
+++ b/devel/hs-uuid-types/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uuid-types
+PORTVERSION= 1.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Type definitions for Universally Unique Identifiers
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 text>=1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-uuid-types/distinfo b/devel/hs-uuid-types/distinfo
new file mode 100644
index 00000000000..576c52677e1
--- /dev/null
+++ b/devel/hs-uuid-types/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/uuid-types-1.0.2.tar.gz) = 56c6e9d6c05f30461419d2c3b90ef7e5f2fb8dd51c09846b5f4ce12d034f2e05
+SIZE (cabal/uuid-types-1.0.2.tar.gz) = 12142
diff --git a/devel/hs-uuid-types/pkg-descr b/devel/hs-uuid-types/pkg-descr
new file mode 100644
index 00000000000..144eda18d1d
--- /dev/null
+++ b/devel/hs-uuid-types/pkg-descr
@@ -0,0 +1,4 @@
+This library contains type definitions for Universally Unique Identifiers
+and basic conversion functions.
+
+WWW: https://github.com/aslatter/uuid
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 614cd647064..12dc1ca5438 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.3.3
-PORTREVISION= 1
+PORTVERSION= 1.3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
LICENSE= BSD3CLAUSE
-USE_CABAL= cryptohash>=0.7 hashable network-info random>=1.0.1
+USE_CABAL= cryptohash>=0.7 network-info>=0.2 random>=1.0.1 text>=1 \
+ uuid-types>=1.0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index 16d261a4da5..ad2711d9695 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuid-1.3.3.tar.gz) = 15204a7399ce8d06743c9e20a554f0dbad36e70d848fcd34e70b5f9bebd54e8b
-SIZE (cabal/uuid-1.3.3.tar.gz) = 17303
+SHA256 (cabal/uuid-1.3.11.tar.gz) = 671876d2f848c9155bfe661eb138d585897ab5b0a2f2e143ef85114d459814d5
+SIZE (cabal/uuid-1.3.11.tar.gz) = 8578
diff --git a/devel/hs-uuid/pkg-descr b/devel/hs-uuid/pkg-descr
index c30322f5bbe..c84a33ab4e6 100644
--- a/devel/hs-uuid/pkg-descr
+++ b/devel/hs-uuid/pkg-descr
@@ -1,4 +1,4 @@
This library is useful for creating, comparing, parsing and printing
Universally Unique Identifiers.
-WWW: http://projects.haskell.org/uuid/
+WWW: https://github.com/aslatter/uuid
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index b38673fabe6..64012ef9214 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.16
-PORTREVISION= 1
+PORTVERSION= 0.9.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 0d295c366ca..9b33d6df39a 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uulib-0.9.16.tar.gz) = 834a75fb88ce508350ae974fd5b66bb0c60e56f2bbb77ca430b25327c289a919
-SIZE (cabal/uulib-0.9.16.tar.gz) = 44333
+SHA256 (cabal/uulib-0.9.20.tar.gz) = e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3
+SIZE (cabal/uulib-0.9.20.tar.gz) = 45120
diff --git a/devel/hs-uulib/pkg-descr b/devel/hs-uulib/pkg-descr
index 85f1434c19f..613352329a0 100644
--- a/devel/hs-uulib/pkg-descr
+++ b/devel/hs-uulib/pkg-descr
@@ -1,3 +1,4 @@
Fast Parser Combinators and Pretty Printing Combinators.
-WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
+WWW: https://github.com/UU-ComputerScience/uulib
+
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 9e2e5921f42..528af8e5a1e 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.0.3
-PORTREVISION= 1
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 6bfd66f29e0..d98e273922d 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vault-0.3.0.3.tar.gz) = 056ad8ffe6059d005b12159cdf781cccd14193bb0b30e960509b3dbee438f272
-SIZE (cabal/vault-0.3.0.3.tar.gz) = 4906
+SHA256 (cabal/vault-0.3.0.4.tar.gz) = 561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a
+SIZE (cabal/vault-0.3.0.4.tar.gz) = 5009
diff --git a/devel/hs-vault/pkg-descr b/devel/hs-vault/pkg-descr
index 98063be518c..788711cc062 100644
--- a/devel/hs-vault/pkg-descr
+++ b/devel/hs-vault/pkg-descr
@@ -1,7 +1,7 @@
-A "vault" is a typed, persistent store for values of arbitrary types. It's
-like having first-class access to the storage space behind IORefs. The
-data structure is analogous to a bank vault, where you can access different
-bank boxes with different keys; hence the name. Also provided is a "locker"
-type, representing a store for a single element.
+A vault is a persistent store for values of arbitrary types. It's like
+having first-class access to the storage space behind IORefs. The data
+structure is analogous to a bank vault, where you can access different
+bank boxes with different keys; hence the name. Also provided is a
+locker type, representing a store for a single element.
WWW: https://github.com/HeinrichApfelmus/vault
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 827dc5b1ada..dcb27f8d9f5 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-algorithms
-PORTVERSION= 0.6.0.3
-PORTREVISION= 1
+PORTVERSION= 0.7.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index b7feb69cb68..a5c442db6d9 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-algorithms-0.6.0.3.tar.gz) = c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf
-SIZE (cabal/vector-algorithms-0.6.0.3.tar.gz) = 20273
+SHA256 (cabal/vector-algorithms-0.7.0.1.tar.gz) = ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070
+SIZE (cabal/vector-algorithms-0.7.0.1.tar.gz) = 25435
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
index f75fbc30a5a..8c78d2369fc 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-binary-instances
PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 86aa9721d83..6d3f1521538 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-instances
-PORTVERSION= 3.3
-PORTREVISION= 1
+PORTVERSION= 3.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/distinfo b/devel/hs-vector-instances/distinfo
index 8b3e7d141e5..3cd2700551e 100644
--- a/devel/hs-vector-instances/distinfo
+++ b/devel/hs-vector-instances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-instances-3.3.tar.gz) = bee0ea0636363ddd20324deb9929e3edc5058df5c4b71d10d4aeb11dc54d3c46
-SIZE (cabal/vector-instances-3.3.tar.gz) = 3596
+SHA256 (cabal/vector-instances-3.3.1.tar.gz) = 68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59
+SIZE (cabal/vector-instances-3.3.1.tar.gz) = 3726
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index 65d4b14b7a3..e578fee2326 100644
--- a/devel/hs-vector-th-unbox/Makefile
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-th-unbox
-PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTVERSION= 0.2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-th-unbox/distinfo b/devel/hs-vector-th-unbox/distinfo
index 5398d739fb3..6521be6e4e4 100644
--- a/devel/hs-vector-th-unbox/distinfo
+++ b/devel/hs-vector-th-unbox/distinfo
@@ -1,2 +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
+SHA256 (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05
+SIZE (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 4536
diff --git a/devel/hs-vector-th-unbox/pkg-descr b/devel/hs-vector-th-unbox/pkg-descr
index f94930ec58e..2f2917c0900 100644
--- a/devel/hs-vector-th-unbox/pkg-descr
+++ b/devel/hs-vector-th-unbox/pkg-descr
@@ -1,5 +1,4 @@
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.
+functions to and from some existing type with an Unbox instance.
WWW: http://hackage.haskell.org/package/vector-th-unbox
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 71bd8f5ccae..855b23e6d4e 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector
-PORTVERSION= 0.10.9.1
-PORTREVISION= 1
+PORTVERSION= 0.10.12.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index e0092611c1d..7ef33ea9218 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-0.10.9.1.tar.gz) = 205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5
-SIZE (cabal/vector-0.10.9.1.tar.gz) = 101693
+SHA256 (cabal/vector-0.10.12.3.tar.gz) = 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a
+SIZE (cabal/vector-0.10.12.3.tar.gz) = 103617
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 46b688f8e4f..7c610284fa0 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index 8026447e48e..daedb86f01c 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.6.1.tar.gz) = 82ec2a7edf3fa52eba2ed4821306859a75186e6df2a564943e9f9d758205ea26
-SIZE (cabal/void-0.6.1.tar.gz) = 3807
+SHA256 (cabal/void-0.7.tar.gz) = 981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47
+SIZE (cabal/void-0.7.tar.gz) = 3900
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 84815a45abd..5a6a632d752 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= word8
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 85a7f7b52a9..5f314321424 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/word8-0.1.1.tar.gz) = 398d201b9bfb839d55bbb72afc8b73e34dcbda2e76f4f13a5db946a61404eaf6
-SIZE (cabal/word8-0.1.1.tar.gz) = 5891
+SHA256 (cabal/word8-0.1.2.tar.gz) = 3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd
+SIZE (cabal/word8-0.1.2.tar.gz) = 6218