summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--MOVED1
-rw-r--r--UPDATING17
-rw-r--r--archivers/hs-tar/Makefile8
-rw-r--r--archivers/hs-tar/distinfo4
-rw-r--r--archivers/hs-tar/pkg-descr2
-rw-r--r--archivers/hs-zip-archive/Makefile10
-rw-r--r--archivers/hs-zip-archive/distinfo4
-rw-r--r--archivers/hs-zip-archive/pkg-descr2
-rw-r--r--archivers/hs-zlib-bindings/Makefile7
-rw-r--r--archivers/hs-zlib-bindings/distinfo4
-rw-r--r--archivers/hs-zlib-bindings/pkg-descr2
-rw-r--r--archivers/hs-zlib-conduit/Makefile8
-rw-r--r--archivers/hs-zlib-conduit/distinfo4
-rw-r--r--archivers/hs-zlib-conduit/pkg-descr2
-rw-r--r--archivers/hs-zlib-enum/Makefile7
-rw-r--r--archivers/hs-zlib-enum/distinfo4
-rw-r--r--archivers/hs-zlib-enum/pkg-descr2
-rw-r--r--archivers/hs-zlib/Makefile8
-rw-r--r--archivers/hs-zlib/distinfo4
-rw-r--r--archivers/hs-zlib/pkg-descr2
-rw-r--r--audio/hs-ALUT/Makefile8
-rw-r--r--audio/hs-OpenAL/Makefile8
-rw-r--r--audio/hs-OpenAL/pkg-descr2
-rw-r--r--audio/hs-libmpd/Makefile10
-rw-r--r--audio/hs-libmpd/distinfo4
-rw-r--r--audio/hs-libmpd/pkg-descr2
-rw-r--r--benchmarks/hs-criterion/Makefile13
-rw-r--r--benchmarks/hs-criterion/distinfo4
-rw-r--r--benchmarks/hs-criterion/pkg-descr2
-rw-r--r--converters/hs-aeson/Makefile7
-rw-r--r--converters/hs-aeson/pkg-descr2
-rw-r--r--converters/hs-dataenc/Makefile8
-rw-r--r--converters/hs-dataenc/distinfo4
-rw-r--r--converters/hs-json/Makefile11
-rw-r--r--converters/hs-json/distinfo4
-rw-r--r--converters/hs-json/pkg-descr2
-rw-r--r--databases/hs-mysql/Makefile8
-rw-r--r--databases/hs-mysql/pkg-descr2
-rw-r--r--databases/hs-persistent-sqlite/Makefile10
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-sqlite/pkg-descr2
-rw-r--r--databases/hs-persistent-template/Makefile10
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent-template/pkg-descr2
-rw-r--r--databases/hs-persistent/Makefile20
-rw-r--r--databases/hs-persistent/distinfo4
-rw-r--r--databases/hs-persistent/pkg-descr2
-rw-r--r--devel/Makefile23
-rw-r--r--devel/cvs2darcs/Makefile8
-rw-r--r--devel/hs-BNFC/Makefile7
-rw-r--r--devel/hs-BNFC/pkg-descr2
-rw-r--r--devel/hs-Boolean/Makefile8
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-ConfigFile/Makefile7
-rw-r--r--devel/hs-ConfigFile/pkg-descr2
-rw-r--r--devel/hs-DeepArrow/Makefile12
-rw-r--r--devel/hs-DeepArrow/distinfo4
-rw-r--r--devel/hs-DeepArrow/pkg-descr8
-rw-r--r--devel/hs-HUnit/Makefile8
-rw-r--r--devel/hs-HUnit/distinfo4
-rw-r--r--devel/hs-HUnit/pkg-descr2
-rw-r--r--devel/hs-IORefCAS/Makefile7
-rw-r--r--devel/hs-IORefCAS/pkg-descr2
-rw-r--r--devel/hs-IfElse/Makefile7
-rw-r--r--devel/hs-IfElse/pkg-descr2
-rw-r--r--devel/hs-List/Makefile17
-rw-r--r--devel/hs-List/distinfo2
-rw-r--r--devel/hs-List/pkg-descr4
-rw-r--r--devel/hs-MaybeT/Makefile7
-rw-r--r--devel/hs-MaybeT/pkg-descr2
-rw-r--r--devel/hs-MemoTrie/Makefile9
-rw-r--r--devel/hs-MemoTrie/distinfo4
-rw-r--r--devel/hs-MemoTrie/pkg-descr2
-rw-r--r--devel/hs-MissingH/Makefile9
-rw-r--r--devel/hs-MissingH/distinfo4
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile11
-rw-r--r--devel/hs-MonadCatchIO-mtl/distinfo4
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile7
-rw-r--r--devel/hs-MonadCatchIO-transformers/pkg-descr2
-rw-r--r--devel/hs-ObjectName/Makefile8
-rw-r--r--devel/hs-PSQueue/Makefile7
-rw-r--r--devel/hs-QuickCheck/Makefile10
-rw-r--r--devel/hs-QuickCheck/distinfo4
-rw-r--r--devel/hs-QuickCheck/pkg-descr2
-rw-r--r--devel/hs-ReadArgs/Makefile19
-rw-r--r--devel/hs-ReadArgs/distinfo2
-rw-r--r--devel/hs-ReadArgs/pkg-descr4
-rw-r--r--devel/hs-SafeSemaphore/Makefile17
-rw-r--r--devel/hs-SafeSemaphore/distinfo2
-rw-r--r--devel/hs-SafeSemaphore/pkg-descr5
-rw-r--r--devel/hs-StateVar/Makefile8
-rw-r--r--devel/hs-Stream/Makefile8
-rw-r--r--devel/hs-Stream/distinfo4
-rw-r--r--devel/hs-Stream/pkg-descr2
-rw-r--r--devel/hs-Tensor/Makefile8
-rw-r--r--devel/hs-TypeCompose/Makefile10
-rw-r--r--devel/hs-TypeCompose/distinfo4
-rw-r--r--devel/hs-TypeCompose/pkg-descr2
-rw-r--r--devel/hs-abstract-deque/Makefile8
-rw-r--r--devel/hs-abstract-deque/distinfo4
-rw-r--r--devel/hs-abstract-deque/pkg-descr2
-rw-r--r--devel/hs-abstract-par/Makefile7
-rw-r--r--devel/hs-abstract-par/pkg-descr2
-rw-r--r--devel/hs-activehs-base/Makefile17
-rw-r--r--devel/hs-activehs-base/distinfo2
-rw-r--r--devel/hs-activehs-base/pkg-descr5
-rw-r--r--devel/hs-alex/Makefile12
-rw-r--r--devel/hs-alex/distinfo4
-rw-r--r--devel/hs-alex/pkg-descr2
-rw-r--r--devel/hs-ansi-terminal/Makefile7
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile7
-rw-r--r--devel/hs-ansi-wl-pprint/pkg-descr2
-rw-r--r--devel/hs-arrows/Makefile9
-rw-r--r--devel/hs-arrows/distinfo4
-rw-r--r--devel/hs-asn1-data/Makefile13
-rw-r--r--devel/hs-asn1-data/distinfo4
-rw-r--r--devel/hs-asn1-data/pkg-descr4
-rw-r--r--devel/hs-async/Makefile17
-rw-r--r--devel/hs-async/distinfo2
-rw-r--r--devel/hs-async/pkg-descr15
-rw-r--r--devel/hs-attempt/Makefile7
-rw-r--r--devel/hs-attempt/pkg-descr2
-rw-r--r--devel/hs-base-unicode-symbols/Makefile8
-rw-r--r--devel/hs-base-unicode-symbols/distinfo4
-rw-r--r--devel/hs-base-unicode-symbols/pkg-descr2
-rw-r--r--devel/hs-base16-bytestring/Makefile6
-rw-r--r--devel/hs-base16-bytestring/pkg-descr2
-rw-r--r--devel/hs-base64-bytestring/Makefile7
-rw-r--r--devel/hs-base64-bytestring/distinfo4
-rw-r--r--devel/hs-base64-bytestring/pkg-descr2
-rw-r--r--devel/hs-basic-prelude/Makefile18
-rw-r--r--devel/hs-basic-prelude/distinfo2
-rw-r--r--devel/hs-basic-prelude/pkg-descr17
-rw-r--r--devel/hs-bits-atomic/Makefile7
-rw-r--r--devel/hs-bits-atomic/pkg-descr2
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile10
-rw-r--r--devel/hs-blaze-builder-conduit/distinfo4
-rw-r--r--devel/hs-blaze-builder-conduit/pkg-descr2
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile8
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo4
-rw-r--r--devel/hs-blaze-builder/Makefile7
-rw-r--r--devel/hs-blaze-builder/pkg-descr2
-rw-r--r--devel/hs-blaze-textual/Makefile10
-rw-r--r--devel/hs-blaze-textual/distinfo4
-rw-r--r--devel/hs-blaze-textual/pkg-descr5
-rw-r--r--devel/hs-bloomfilter/Makefile6
-rw-r--r--devel/hs-bloomfilter/pkg-descr2
-rw-r--r--devel/hs-bsd-sysctl/Makefile8
-rw-r--r--devel/hs-bsd-sysctl/pkg-descr2
-rw-r--r--devel/hs-byteorder/Makefile7
-rw-r--r--devel/hs-byteorder/pkg-descr2
-rw-r--r--devel/hs-bytestring-nums/Makefile8
-rw-r--r--devel/hs-bytestring-nums/distinfo4
-rw-r--r--devel/hs-c2hs/Makefile11
-rw-r--r--devel/hs-c2hs/distinfo4
-rw-r--r--devel/hs-c2hs/pkg-descr13
-rw-r--r--devel/hs-cabal-install/Makefile17
-rw-r--r--devel/hs-cabal-install/files/cabal.in11
-rw-r--r--devel/hs-cabal-install/files/patch-Main.hs24
-rw-r--r--devel/hs-cabal-install/pkg-descr2
-rw-r--r--devel/hs-cabal-install/pkg-plist2
-rw-r--r--devel/hs-cereal/Makefile6
-rw-r--r--devel/hs-cereal/pkg-descr2
-rw-r--r--devel/hs-checkers/Makefile8
-rw-r--r--devel/hs-checkers/pkg-descr2
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile17
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo2
-rw-r--r--devel/hs-classy-prelude-conduit/pkg-descr3
-rw-r--r--devel/hs-classy-prelude/Makefile18
-rw-r--r--devel/hs-classy-prelude/distinfo2
-rw-r--r--devel/hs-classy-prelude/pkg-descr6
-rw-r--r--devel/hs-cmdargs/Makefile10
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-cmdargs/pkg-descr14
-rw-r--r--devel/hs-conduit/Makefile8
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-conduit/pkg-descr11
-rw-r--r--devel/hs-configurator/Makefile8
-rw-r--r--devel/hs-configurator/distinfo4
-rw-r--r--devel/hs-configurator/pkg-descr2
-rw-r--r--devel/hs-convertible/Makefile8
-rw-r--r--devel/hs-convertible/pkg-descr2
-rw-r--r--devel/hs-cpphs/Makefile8
-rw-r--r--devel/hs-cpphs/distinfo4
-rw-r--r--devel/hs-cpphs/pkg-descr2
-rw-r--r--devel/hs-darcs/Makefile15
-rw-r--r--devel/hs-darcs/distinfo4
-rw-r--r--devel/hs-darcs/pkg-descr2
-rw-r--r--devel/hs-data-default/Makefile10
-rw-r--r--devel/hs-data-default/distinfo4
-rw-r--r--devel/hs-data-default/pkg-descr2
-rw-r--r--devel/hs-data-pprint/Makefile17
-rw-r--r--devel/hs-data-pprint/distinfo2
-rw-r--r--devel/hs-data-pprint/pkg-descr10
-rw-r--r--devel/hs-date-cache/Makefile15
-rw-r--r--devel/hs-date-cache/distinfo2
-rw-r--r--devel/hs-date-cache/pkg-descr4
-rw-r--r--devel/hs-datetime/Makefile8
-rw-r--r--devel/hs-directory-tree/Makefile7
-rw-r--r--devel/hs-directory-tree/distinfo4
-rw-r--r--devel/hs-directory-tree/pkg-descr13
-rw-r--r--devel/hs-dlist/Makefile7
-rw-r--r--devel/hs-drift/Makefile5
-rw-r--r--devel/hs-edit-distance/Makefile10
-rw-r--r--devel/hs-edit-distance/distinfo4
-rw-r--r--devel/hs-edit-distance/pkg-descr2
-rw-r--r--devel/hs-enumerator/Makefile7
-rw-r--r--devel/hs-enumerator/pkg-descr2
-rw-r--r--devel/hs-failure/Makefile7
-rw-r--r--devel/hs-failure/pkg-descr2
-rw-r--r--devel/hs-fast-logger/Makefile10
-rw-r--r--devel/hs-fast-logger/distinfo4
-rw-r--r--devel/hs-fast-logger/pkg-descr2
-rw-r--r--devel/hs-fgl/Makefile8
-rw-r--r--devel/hs-file-embed/Makefile8
-rw-r--r--devel/hs-file-embed/distinfo4
-rw-r--r--devel/hs-file-embed/pkg-descr5
-rw-r--r--devel/hs-filemanip/Makefile9
-rw-r--r--devel/hs-filemanip/distinfo4
-rw-r--r--devel/hs-filemanip/pkg-descr2
-rw-r--r--devel/hs-filestore/Makefile8
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-filestore/pkg-descr2
-rw-r--r--devel/hs-filesystem-conduit/Makefile10
-rw-r--r--devel/hs-filesystem-conduit/distinfo4
-rw-r--r--devel/hs-filesystem-conduit/pkg-descr2
-rw-r--r--devel/hs-fsnotify/Makefile18
-rw-r--r--devel/hs-fsnotify/distinfo2
-rw-r--r--devel/hs-fsnotify/pkg-descr5
-rw-r--r--devel/hs-gconf/Makefile11
-rw-r--r--devel/hs-gconf/distinfo4
-rw-r--r--devel/hs-gconf/pkg-descr2
-rw-r--r--devel/hs-ghc-events/Makefile8
-rw-r--r--devel/hs-ghc-events/distinfo4
-rw-r--r--devel/hs-ghc-events/files/patch-ghc-events.cabal20
-rw-r--r--devel/hs-ghc-events/pkg-descr2
-rw-r--r--devel/hs-ghc-mtl/Makefile12
-rw-r--r--devel/hs-ghc-mtl/distinfo4
-rw-r--r--devel/hs-ghc-mtl/pkg-descr2
-rw-r--r--devel/hs-ghc-paths/Makefile7
-rw-r--r--devel/hs-gio/Makefile8
-rw-r--r--devel/hs-gio/distinfo4
-rw-r--r--devel/hs-gio/pkg-descr2
-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-Build__InstallDesktopFile.hs20
-rw-r--r--devel/hs-git-annex/files/patch-Makefile11
-rw-r--r--devel/hs-git-annex/pkg-descr2
-rw-r--r--devel/hs-git-annex/pkg-plist6
-rw-r--r--devel/hs-glade/Makefile7
-rw-r--r--devel/hs-glib/Makefile9
-rw-r--r--devel/hs-glib/distinfo4
-rw-r--r--devel/hs-glib/pkg-descr2
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile12
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo4
-rw-r--r--devel/hs-gtk2hs-buildtools/pkg-descr2
-rw-r--r--devel/hs-haddock/Makefile8
-rw-r--r--devel/hs-haddock/distinfo4
-rw-r--r--devel/hs-haddock/pkg-descr2
-rw-r--r--devel/hs-happy/Makefile14
-rw-r--r--devel/hs-happy/distinfo4
-rw-r--r--devel/hs-happy/pkg-descr2
-rw-r--r--devel/hs-hashable/Makefile8
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashable/pkg-descr2
-rw-r--r--devel/hs-hashed-storage/Makefile8
-rw-r--r--devel/hs-hashed-storage/distinfo4
-rw-r--r--devel/hs-hashtables/Makefile10
-rw-r--r--devel/hs-hashtables/distinfo4
-rw-r--r--devel/hs-hashtables/pkg-descr2
-rw-r--r--devel/hs-haskeline/Makefile7
-rw-r--r--devel/hs-haskell-platform/Makefile65
-rw-r--r--devel/hs-haskell-platform/pkg-descr2
-rw-r--r--devel/hs-haskell-src-exts/Makefile9
-rw-r--r--devel/hs-haskell-src-exts/distinfo4
-rw-r--r--devel/hs-haskell-src-exts/pkg-descr2
-rw-r--r--devel/hs-haskell-src/Makefile7
-rw-r--r--devel/hs-haskell-src/pkg-descr2
-rw-r--r--devel/hs-hastache/Makefile7
-rw-r--r--devel/hs-hastache/distinfo4
-rw-r--r--devel/hs-hastache/pkg-descr2
-rw-r--r--devel/hs-hdoc/Makefile5
-rw-r--r--devel/hs-hinotify/Makefile15
-rw-r--r--devel/hs-hinotify/distinfo2
-rw-r--r--devel/hs-hinotify/pkg-descr5
-rw-r--r--devel/hs-hint/Makefile9
-rw-r--r--devel/hs-hint/distinfo4
-rw-r--r--devel/hs-hint/pkg-descr2
-rw-r--r--devel/hs-hlibev/Makefile7
-rw-r--r--devel/hs-hlint/Makefile9
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hlint/pkg-descr2
-rw-r--r--devel/hs-hoogle/Makefile9
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hoogle/pkg-descr2
-rw-r--r--devel/hs-hslogger/Makefile11
-rw-r--r--devel/hs-hslogger/distinfo4
-rw-r--r--devel/hs-hslogger/pkg-descr8
-rw-r--r--devel/hs-hspec-expectations/Makefile15
-rw-r--r--devel/hs-hspec-expectations/distinfo2
-rw-r--r--devel/hs-hspec-expectations/pkg-descr3
-rw-r--r--devel/hs-hspec/Makefile13
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-hspec/pkg-descr2
-rw-r--r--devel/hs-idoc/Makefile5
-rw-r--r--devel/hs-kqueue/Makefile18
-rw-r--r--devel/hs-kqueue/distinfo2
-rw-r--r--devel/hs-kqueue/files/patch-src__System__KQueue.chs41
-rw-r--r--devel/hs-kqueue/pkg-descr5
-rw-r--r--devel/hs-language-c/Makefile7
-rw-r--r--devel/hs-language-javascript/Makefile8
-rw-r--r--devel/hs-language-javascript/distinfo4
-rw-r--r--devel/hs-language-javascript/pkg-descr2
-rw-r--r--devel/hs-largeword/Makefile8
-rw-r--r--devel/hs-largeword/distinfo4
-rw-r--r--devel/hs-largeword/pkg-descr2
-rw-r--r--devel/hs-lazysmallcheck/Makefile7
-rw-r--r--devel/hs-lifted-base/Makefile8
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-lifted-base/pkg-descr2
-rw-r--r--devel/hs-logict/Makefile8
-rw-r--r--devel/hs-logict/distinfo4
-rw-r--r--devel/hs-logict/pkg-descr2
-rw-r--r--devel/hs-mmap/Makefile6
-rw-r--r--devel/hs-mmap/pkg-descr2
-rw-r--r--devel/hs-monad-control/Makefile8
-rw-r--r--devel/hs-monad-control/distinfo4
-rw-r--r--devel/hs-monad-control/pkg-descr2
-rw-r--r--devel/hs-monad-logger/Makefile18
-rw-r--r--devel/hs-monad-logger/distinfo2
-rw-r--r--devel/hs-monad-logger/pkg-descr4
-rw-r--r--devel/hs-monad-par-extras/Makefile7
-rw-r--r--devel/hs-monad-par-extras/pkg-descr2
-rw-r--r--devel/hs-monad-par/Makefile7
-rw-r--r--devel/hs-monad-par/pkg-descr2
-rw-r--r--devel/hs-mtl/Makefile10
-rw-r--r--devel/hs-mtl/distinfo4
-rw-r--r--devel/hs-mtl/pkg-descr2
-rw-r--r--devel/hs-mueval/Makefile8
-rw-r--r--devel/hs-mueval/pkg-descr2
-rw-r--r--devel/hs-murmur-hash/Makefile8
-rw-r--r--devel/hs-murmur-hash/distinfo4
-rw-r--r--devel/hs-murmur-hash/pkg-descr2
-rw-r--r--devel/hs-optparse-applicative/Makefile17
-rw-r--r--devel/hs-optparse-applicative/distinfo2
-rw-r--r--devel/hs-optparse-applicative/pkg-descr3
-rw-r--r--devel/hs-parallel/Makefile8
-rw-r--r--devel/hs-parallel/distinfo4
-rw-r--r--devel/hs-parallel/pkg-descr2
-rw-r--r--devel/hs-pcre-light/Makefile7
-rw-r--r--devel/hs-pool-conduit/Makefile10
-rw-r--r--devel/hs-pool-conduit/distinfo4
-rw-r--r--devel/hs-pool-conduit/pkg-descr2
-rw-r--r--devel/hs-primitive/Makefile10
-rw-r--r--devel/hs-primitive/distinfo4
-rw-r--r--devel/hs-primitive/pkg-descr3
-rw-r--r--devel/hs-project-template/Makefile19
-rw-r--r--devel/hs-project-template/distinfo2
-rw-r--r--devel/hs-project-template/pkg-descr3
-rw-r--r--devel/hs-random/Makefile7
-rw-r--r--devel/hs-random/pkg-descr2
-rw-r--r--devel/hs-ranges/Makefile7
-rw-r--r--devel/hs-ranges/pkg-descr2
-rw-r--r--devel/hs-reactive/Makefile8
-rw-r--r--devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Future.hs11
-rw-r--r--devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs21
-rw-r--r--devel/hs-readline/Makefile7
-rw-r--r--devel/hs-resource-pool/Makefile8
-rw-r--r--devel/hs-resource-pool/distinfo4
-rw-r--r--devel/hs-resource-pool/pkg-descr2
-rw-r--r--devel/hs-resourcet/Makefile7
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-resourcet/pkg-descr2
-rw-r--r--devel/hs-safe/Makefile8
-rw-r--r--devel/hs-setenv/Makefile13
-rw-r--r--devel/hs-setenv/distinfo2
-rw-r--r--devel/hs-setenv/pkg-descr3
-rw-r--r--devel/hs-show/Makefile8
-rw-r--r--devel/hs-silently/Makefile7
-rw-r--r--devel/hs-silently/distinfo4
-rw-r--r--devel/hs-silently/pkg-descr2
-rw-r--r--devel/hs-simple-reflect/Makefile15
-rw-r--r--devel/hs-simple-reflect/distinfo2
-rw-r--r--devel/hs-simple-reflect/pkg-descr6
-rw-r--r--devel/hs-smallcheck/Makefile8
-rw-r--r--devel/hs-smallcheck/pkg-descr2
-rw-r--r--devel/hs-split/Makefile8
-rw-r--r--devel/hs-split/distinfo4
-rw-r--r--devel/hs-split/pkg-descr18
-rw-r--r--devel/hs-stm/Makefile8
-rw-r--r--devel/hs-stm/distinfo4
-rw-r--r--devel/hs-strict/Makefile7
-rw-r--r--devel/hs-strict/pkg-descr2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile7
-rw-r--r--devel/hs-syb-with-class-instances-text/pkg-descr2
-rw-r--r--devel/hs-syb-with-class/Makefile8
-rw-r--r--devel/hs-syb-with-class/distinfo4
-rw-r--r--devel/hs-syb-with-class/pkg-descr2
-rw-r--r--devel/hs-syb/Makefile8
-rw-r--r--devel/hs-syb/distinfo4
-rw-r--r--devel/hs-syb/pkg-descr2
-rw-r--r--devel/hs-system-fileio/Makefile7
-rw-r--r--devel/hs-system-fileio/distinfo4
-rw-r--r--devel/hs-system-fileio/pkg-descr2
-rw-r--r--devel/hs-system-filepath/Makefile8
-rw-r--r--devel/hs-system-filepath/distinfo4
-rw-r--r--devel/hs-system-filepath/pkg-descr2
-rw-r--r--devel/hs-tagged/Makefile8
-rw-r--r--devel/hs-tagged/distinfo4
-rw-r--r--devel/hs-tagged/pkg-descr2
-rw-r--r--devel/hs-temporary/Makefile8
-rw-r--r--devel/hs-temporary/distinfo4
-rw-r--r--devel/hs-temporary/pkg-descr2
-rw-r--r--devel/hs-terminfo/Makefile7
-rw-r--r--devel/hs-terminfo/distinfo4
-rw-r--r--devel/hs-test-framework-hunit/Makefile8
-rw-r--r--devel/hs-test-framework-hunit/distinfo4
-rw-r--r--devel/hs-test-framework-hunit/pkg-descr2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile10
-rw-r--r--devel/hs-test-framework-quickcheck2/distinfo4
-rw-r--r--devel/hs-test-framework-quickcheck2/pkg-descr2
-rw-r--r--devel/hs-test-framework/Makefile8
-rw-r--r--devel/hs-test-framework/distinfo4
-rw-r--r--devel/hs-test-framework/pkg-descr2
-rw-r--r--devel/hs-testpack/Makefile8
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs26
-rw-r--r--devel/hs-testpack/pkg-descr2
-rw-r--r--devel/hs-text/Makefile8
-rw-r--r--devel/hs-text/distinfo4
-rw-r--r--devel/hs-text/pkg-descr2
-rw-r--r--devel/hs-threads/Makefile17
-rw-r--r--devel/hs-threads/distinfo2
-rw-r--r--devel/hs-threads/pkg-descr14
-rw-r--r--devel/hs-threadscope/Makefile10
-rw-r--r--devel/hs-threadscope/distinfo4
-rw-r--r--devel/hs-threadscope/pkg-descr2
-rw-r--r--devel/hs-time-compat/Makefile15
-rw-r--r--devel/hs-time-compat/distinfo2
-rw-r--r--devel/hs-time-compat/pkg-descr3
-rw-r--r--devel/hs-transformers-base/Makefile7
-rw-r--r--devel/hs-transformers-base/pkg-descr2
-rw-r--r--devel/hs-transformers/Makefile8
-rw-r--r--devel/hs-transformers/pkg-descr2
-rw-r--r--devel/hs-unamb/Makefile8
-rw-r--r--devel/hs-unamb/pkg-descr2
-rw-r--r--devel/hs-uniplate/Makefile11
-rw-r--r--devel/hs-uniplate/distinfo4
-rw-r--r--devel/hs-uniplate/pkg-descr2
-rw-r--r--devel/hs-unix-compat/Makefile9
-rw-r--r--devel/hs-unix-compat/distinfo4
-rw-r--r--devel/hs-unix-compat/pkg-descr2
-rw-r--r--devel/hs-unix-time/Makefile15
-rw-r--r--devel/hs-unix-time/distinfo2
-rw-r--r--devel/hs-unix-time/pkg-descr3
-rw-r--r--devel/hs-unordered-containers/Makefile8
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-unordered-containers/pkg-descr2
-rw-r--r--devel/hs-utf8-light/Makefile7
-rw-r--r--devel/hs-utf8-light/pkg-descr2
-rw-r--r--devel/hs-utf8-string/Makefile7
-rw-r--r--devel/hs-utility-ht/Makefile8
-rw-r--r--devel/hs-utility-ht/pkg-descr2
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile7
-rw-r--r--devel/hs-uuagc-bootstrap/pkg-descr2
-rw-r--r--devel/hs-uuagc-cabal/Makefile9
-rw-r--r--devel/hs-uuagc-cabal/distinfo4
-rw-r--r--devel/hs-uuagc-cabal/pkg-descr2
-rw-r--r--devel/hs-uuagc/Makefile13
-rw-r--r--devel/hs-uuagc/distinfo4
-rw-r--r--devel/hs-uuagc/pkg-descr2
-rw-r--r--devel/hs-uulib/Makefile8
-rw-r--r--devel/hs-vault/Makefile8
-rw-r--r--devel/hs-vault/distinfo4
-rw-r--r--devel/hs-vault/pkg-descr2
-rw-r--r--devel/hs-vector-algorithms/Makefile8
-rw-r--r--devel/hs-vector-algorithms/distinfo4
-rw-r--r--devel/hs-vector-algorithms/pkg-descr2
-rw-r--r--devel/hs-vector/Makefile11
-rw-r--r--devel/hs-vector/distinfo4
-rw-r--r--devel/hs-void/Makefile7
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-void/pkg-descr2
-rw-r--r--devel/hs-word8/Makefile15
-rw-r--r--devel/hs-word8/distinfo2
-rw-r--r--devel/hs-word8/pkg-descr3
-rw-r--r--ftp/hs-curl/Makefile8
-rw-r--r--ftp/hs-curl/distinfo4
-rw-r--r--ftp/hs-curl/pkg-descr5
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/hs-HGL/Makefile8
-rw-r--r--graphics/hs-cairo/Makefile10
-rw-r--r--graphics/hs-cairo/distinfo4
-rw-r--r--graphics/hs-cairo/pkg-descr2
-rw-r--r--graphics/hs-dia-base/Makefile15
-rw-r--r--graphics/hs-dia-base/distinfo2
-rw-r--r--graphics/hs-dia-base/pkg-descr4
-rw-r--r--graphics/hs-dia-functions/Makefile17
-rw-r--r--graphics/hs-dia-functions/distinfo2
-rw-r--r--graphics/hs-dia-functions/pkg-descr3
-rw-r--r--graphics/hs-soegtk/Makefile7
-rw-r--r--graphics/hs-svgcairo/Makefile7
-rw-r--r--lang/ghc/Makefile89
-rw-r--r--lang/ghc/bsd.cabal.mk70
-rw-r--r--lang/ghc/bsd.cabal.options.mk40
-rw-r--r--lang/ghc/bsd.hackage.mk35
-rw-r--r--lang/ghc/distinfo8
-rw-r--r--lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in (renamed from lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in)0
-rw-r--r--lang/ghc/files/patch-compiler_ghc.mk13
-rw-r--r--lang/ghc/files/patch-compiler_main_DriverPipeline.hs17
-rw-r--r--lang/ghc/files/patch-configure147
-rw-r--r--lang/ghc/files/patch-ghc.mk16
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs46
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs38
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs39
-rw-r--r--lang/ghc/files/patch-libraries_bin-package-db_LICENSE8
-rw-r--r--lang/ghc/files/patch-mk_config.mk.in12
-rw-r--r--lang/ghc/pkg-descr2
-rw-r--r--lang/hs-brainfuck/Makefile8
-rw-r--r--lang/hs-epic/Makefile7
-rw-r--r--lang/hs-epic/pkg-descr2
-rw-r--r--lang/hs-unlambda/Makefile11
-rw-r--r--lang/hs-unlambda/distinfo4
-rw-r--r--lang/hs-unlambda/pkg-descr4
-rw-r--r--mail/Makefile1
-rw-r--r--mail/hs-email-validate/Makefile8
-rw-r--r--mail/hs-email-validate/distinfo4
-rw-r--r--mail/hs-email-validate/pkg-descr2
-rw-r--r--mail/hs-mime-mail/Makefile8
-rw-r--r--mail/hs-mime-mail/distinfo4
-rw-r--r--mail/hs-mime-mail/pkg-descr2
-rw-r--r--mail/hs-mime-types/Makefile15
-rw-r--r--mail/hs-mime-types/distinfo2
-rw-r--r--mail/hs-mime-types/pkg-descr3
-rw-r--r--mail/hs-mime/Makefile8
-rw-r--r--mail/hs-mime/distinfo4
-rw-r--r--mail/hs-mime/pkg-descr2
-rw-r--r--math/hs-Agda-executable/Makefile8
-rw-r--r--math/hs-Agda-executable/pkg-descr2
-rw-r--r--math/hs-Agda/Makefile10
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal7
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs11
-rw-r--r--math/hs-Agda/pkg-descr2
-rw-r--r--math/hs-NumInstances/Makefile7
-rw-r--r--math/hs-NumInstances/pkg-descr2
-rw-r--r--math/hs-categories/Makefile10
-rw-r--r--math/hs-categories/distinfo4
-rw-r--r--math/hs-categories/pkg-descr2
-rw-r--r--math/hs-comonad-transformers/Makefile11
-rw-r--r--math/hs-comonad-transformers/distinfo4
-rw-r--r--math/hs-comonad-transformers/pkg-descr2
-rw-r--r--math/hs-comonad/Makefile12
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-comonad/pkg-descr2
-rw-r--r--math/hs-contravariant/Makefile7
-rw-r--r--math/hs-contravariant/pkg-descr2
-rw-r--r--math/hs-data-lens-template/Makefile8
-rw-r--r--math/hs-data-lens-template/distinfo4
-rw-r--r--math/hs-data-lens-template/pkg-descr2
-rw-r--r--math/hs-data-lens/Makefile8
-rw-r--r--math/hs-data-lens/distinfo4
-rw-r--r--math/hs-data-lens/pkg-descr2
-rw-r--r--math/hs-distributive/Makefile7
-rw-r--r--math/hs-distributive/pkg-descr2
-rw-r--r--math/hs-erf/Makefile8
-rw-r--r--math/hs-ieee754/Makefile7
-rw-r--r--math/hs-ieee754/pkg-descr2
-rw-r--r--math/hs-math-functions/Makefile11
-rw-r--r--math/hs-math-functions/distinfo4
-rw-r--r--math/hs-math-functions/pkg-descr2
-rw-r--r--math/hs-mwc-random/Makefile11
-rw-r--r--math/hs-mwc-random/distinfo4
-rw-r--r--math/hs-mwc-random/pkg-descr2
-rw-r--r--math/hs-pointed/Makefile12
-rw-r--r--math/hs-pointed/distinfo4
-rw-r--r--math/hs-pointed/pkg-descr2
-rw-r--r--math/hs-probability/Makefile8
-rw-r--r--math/hs-probability/pkg-descr2
-rw-r--r--math/hs-semigroupoids/Makefile9
-rw-r--r--math/hs-semigroupoids/distinfo4
-rw-r--r--math/hs-semigroupoids/pkg-descr2
-rw-r--r--math/hs-semigroups/Makefile8
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-semigroups/pkg-descr2
-rw-r--r--math/hs-statistics/Makefile9
-rw-r--r--math/hs-statistics/distinfo4
-rw-r--r--math/hs-statistics/pkg-descr27
-rw-r--r--math/hs-vector-space/Makefile12
-rw-r--r--math/hs-vector-space/distinfo4
-rw-r--r--math/hs-vector-space/pkg-descr2
-rw-r--r--multimedia/hs-gstreamer/Makefile9
-rw-r--r--multimedia/hs-gstreamer/distinfo4
-rw-r--r--net/Makefile2
-rw-r--r--net/hs-hostname/Makefile7
-rw-r--r--net/hs-network-conduit/Makefile10
-rw-r--r--net/hs-network-conduit/distinfo4
-rw-r--r--net/hs-network-conduit/pkg-descr2
-rw-r--r--net/hs-network-info/Makefile15
-rw-r--r--net/hs-network-info/distinfo2
-rw-r--r--net/hs-network-info/pkg-descr7
-rw-r--r--net/hs-network-multicast/Makefile13
-rw-r--r--net/hs-network-multicast/distinfo2
-rw-r--r--net/hs-network-multicast/pkg-descr4
-rw-r--r--net/hs-network/Makefile8
-rw-r--r--net/hs-network/distinfo4
-rw-r--r--net/hs-network/pkg-descr2
-rw-r--r--net/hs-pcap/Makefile10
-rw-r--r--net/hs-pcap/distinfo4
-rw-r--r--net/hs-pcap/pkg-descr2
-rw-r--r--net/hs-sendfile/Makefile8
-rw-r--r--net/hs-sendfile/distinfo4
-rw-r--r--net/hs-sendfile/pkg-descr2
-rw-r--r--net/hs-simple-sendfile/Makefile7
-rw-r--r--net/hs-simple-sendfile/distinfo4
-rw-r--r--net/hs-simple-sendfile/pkg-descr2
-rw-r--r--net/hs-socks/Makefile10
-rw-r--r--net/hs-socks/distinfo4
-rw-r--r--net/hs-socks/pkg-descr2
-rw-r--r--ports-mgmt/hs-porte/Makefile7
-rw-r--r--print/hs-hscolour/Makefile9
-rw-r--r--print/hs-hscolour/distinfo4
-rw-r--r--print/hs-hscolour/pkg-descr2
-rw-r--r--science/hs-bio/Makefile8
-rw-r--r--science/hs-bio/pkg-descr2
-rw-r--r--security/Makefile1
-rw-r--r--security/hs-Crypto/Makefile10
-rw-r--r--security/hs-Crypto/distinfo4
-rw-r--r--security/hs-Crypto/pkg-descr2
-rw-r--r--security/hs-HsOpenSSL/Makefile7
-rw-r--r--security/hs-HsOpenSSL/distinfo4
-rw-r--r--security/hs-HsOpenSSL/pkg-descr2
-rw-r--r--security/hs-RSA/Makefile12
-rw-r--r--security/hs-RSA/distinfo4
-rw-r--r--security/hs-RSA/pkg-descr2
-rw-r--r--security/hs-SHA/Makefile10
-rw-r--r--security/hs-SHA/distinfo4
-rw-r--r--security/hs-SHA/pkg-descr2
-rw-r--r--security/hs-certificate/Makefile16
-rw-r--r--security/hs-certificate/distinfo4
-rw-r--r--security/hs-certificate/pkg-descr2
-rw-r--r--security/hs-cipher-aes/Makefile15
-rw-r--r--security/hs-cipher-aes/distinfo2
-rw-r--r--security/hs-cipher-aes/pkg-descr13
-rw-r--r--security/hs-clientsession/Makefile8
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-clientsession/pkg-descr2
-rw-r--r--security/hs-cprng-aes/Makefile12
-rw-r--r--security/hs-cprng-aes/distinfo4
-rw-r--r--security/hs-cprng-aes/pkg-descr2
-rw-r--r--security/hs-crypto-api/Makefile7
-rw-r--r--security/hs-crypto-api/pkg-descr2
-rw-r--r--security/hs-crypto-conduit/Makefile10
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-conduit/pkg-descr2
-rw-r--r--security/hs-crypto-pubkey-types/Makefile10
-rw-r--r--security/hs-crypto-pubkey-types/distinfo4
-rw-r--r--security/hs-crypto-pubkey-types/pkg-descr2
-rw-r--r--security/hs-cryptocipher/Makefile9
-rw-r--r--security/hs-cryptocipher/distinfo4
-rw-r--r--security/hs-cryptocipher/pkg-descr2
-rw-r--r--security/hs-cryptohash/Makefile8
-rw-r--r--security/hs-cryptohash/distinfo4
-rw-r--r--security/hs-cryptohash/pkg-descr8
-rw-r--r--security/hs-digest/Makefile8
-rw-r--r--security/hs-digest/distinfo4
-rw-r--r--security/hs-digest/pkg-descr2
-rw-r--r--security/hs-entropy/Makefile7
-rw-r--r--security/hs-entropy/pkg-descr2
-rw-r--r--security/hs-monadcryptorandom/Makefile10
-rw-r--r--security/hs-monadcryptorandom/distinfo4
-rw-r--r--security/hs-monadcryptorandom/pkg-descr2
-rw-r--r--security/hs-pem/Makefile7
-rw-r--r--security/hs-pem/pkg-descr2
-rw-r--r--security/hs-pureMD5/Makefile10
-rw-r--r--security/hs-pureMD5/distinfo4
-rw-r--r--security/hs-pureMD5/pkg-descr5
-rw-r--r--security/hs-pwstore-fast/Makefile9
-rw-r--r--security/hs-pwstore-fast/distinfo4
-rw-r--r--security/hs-pwstore-fast/pkg-descr2
-rw-r--r--security/hs-skein/Makefile8
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-skein/pkg-descr2
-rw-r--r--security/hs-tls-extra/Makefile14
-rw-r--r--security/hs-tls-extra/distinfo4
-rw-r--r--security/hs-tls-extra/pkg-descr2
-rw-r--r--security/hs-tls/Makefile26
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--security/hs-tls/pkg-descr16
-rw-r--r--sysutils/hs-angel/Makefile8
-rw-r--r--sysutils/hs-angel/distinfo4
-rw-r--r--sysutils/hs-angel/pkg-descr2
-rw-r--r--sysutils/hs-cpu/Makefile6
-rw-r--r--sysutils/hs-cpu/pkg-descr2
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/hs-Diff/Makefile8
-rw-r--r--textproc/hs-HStringTemplate/Makefile10
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-HStringTemplate/pkg-descr2
-rw-r--r--textproc/hs-HaXml/Makefile6
-rw-r--r--textproc/hs-HaXml/pkg-descr2
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile12
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo4
-rw-r--r--textproc/hs-attoparsec-conduit/pkg-descr4
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile8
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/pkg-descr2
-rw-r--r--textproc/hs-attoparsec/Makefile7
-rw-r--r--textproc/hs-attoparsec/pkg-descr2
-rw-r--r--textproc/hs-blaze-html/Makefile7
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-html/pkg-descr2
-rw-r--r--textproc/hs-blaze-markup/Makefile8
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-blaze-markup/pkg-descr2
-rw-r--r--textproc/hs-bytestring-csv/Makefile7
-rw-r--r--textproc/hs-case-insensitive/Makefile8
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-case-insensitive/pkg-descr2
-rw-r--r--textproc/hs-citeproc-hs/Makefile24
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/pkg-descr2
-rw-r--r--textproc/hs-csv/Makefile8
-rw-r--r--textproc/hs-double-conversion/Makefile8
-rw-r--r--textproc/hs-double-conversion/distinfo4
-rw-r--r--textproc/hs-double-conversion/pkg-descr2
-rw-r--r--textproc/hs-feed/Makefile8
-rw-r--r--textproc/hs-hexpat/Makefile15
-rw-r--r--textproc/hs-hexpat/distinfo2
-rw-r--r--textproc/hs-hexpat/pkg-descr6
-rw-r--r--textproc/hs-highlighting-kate/Makefile10
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/pkg-descr6
-rw-r--r--textproc/hs-hs-bibutils/Makefile8
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/pkg-descr11
-rw-r--r--textproc/hs-html-conduit/Makefile14
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html-conduit/pkg-descr2
-rw-r--r--textproc/hs-html/Makefile7
-rw-r--r--textproc/hs-hxt-charproperties/Makefile7
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile7
-rw-r--r--textproc/hs-hxt-unicode/Makefile7
-rw-r--r--textproc/hs-hxt/Makefile8
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-hxt/files/patch-hxt.cabal11
-rw-r--r--textproc/hs-hxt/pkg-descr2
-rw-r--r--textproc/hs-lhs2tex/Makefile13
-rw-r--r--textproc/hs-lhs2tex/distinfo4
-rw-r--r--textproc/hs-lhs2tex/pkg-descr2
-rw-r--r--textproc/hs-libxml/Makefile7
-rw-r--r--textproc/hs-pandoc-types/Makefile7
-rw-r--r--textproc/hs-pandoc-types/pkg-descr2
-rw-r--r--textproc/hs-pandoc/Makefile20
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs20
-rw-r--r--textproc/hs-pandoc/pkg-descr2
-rw-r--r--textproc/hs-parsec/Makefile8
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr2
-rw-r--r--textproc/hs-polyparse/Makefile7
-rw-r--r--textproc/hs-polyparse/pkg-descr2
-rw-r--r--textproc/hs-regex-base/Makefile7
-rw-r--r--textproc/hs-regex-base/pkg-descr2
-rw-r--r--textproc/hs-regex-compat/Makefile7
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile11
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo4
-rw-r--r--textproc/hs-regex-pcre-builtin/pkg-descr5
-rw-r--r--textproc/hs-regex-posix/Makefile10
-rw-r--r--textproc/hs-regex-posix/distinfo4
-rw-r--r--textproc/hs-regex-posix/pkg-descr2
-rw-r--r--textproc/hs-stringsearch/Makefile10
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-stringsearch/pkg-descr11
-rw-r--r--textproc/hs-tagsoup/Makefile12
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagsoup/pkg-descr13
-rw-r--r--textproc/hs-tagstream-conduit/Makefile14
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/pkg-descr2
-rw-r--r--textproc/hs-texmath/Makefile11
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-texmath/pkg-descr2
-rw-r--r--textproc/hs-xhtml/Makefile7
-rw-r--r--textproc/hs-xhtml/pkg-descr2
-rw-r--r--textproc/hs-xml-conduit/Makefile18
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/pkg-descr2
-rw-r--r--textproc/hs-xml-types/Makefile7
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml-types/pkg-descr2
-rw-r--r--textproc/hs-xml/Makefile8
-rw-r--r--textproc/hs-xml2html/Makefile21
-rw-r--r--textproc/hs-xml2html/distinfo2
-rw-r--r--textproc/hs-xml2html/pkg-descr3
-rw-r--r--textproc/hs-xmlhtml/Makefile7
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/pkg-descr2
-rw-r--r--textproc/hs-yaml/Makefile9
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--textproc/hs-yaml/pkg-descr9
-rw-r--r--www/Makefile2
-rw-r--r--www/hs-HTTP/Makefile9
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-HTTP/pkg-descr2
-rw-r--r--www/hs-activehs/Makefile26
-rw-r--r--www/hs-activehs/distinfo2
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal10
-rw-r--r--www/hs-activehs/pkg-descr4
-rw-r--r--www/hs-authenticate/Makefile14
-rw-r--r--www/hs-authenticate/distinfo4
-rw-r--r--www/hs-authenticate/pkg-descr2
-rw-r--r--www/hs-cgi/Makefile8
-rw-r--r--www/hs-cookie/Makefile8
-rw-r--r--www/hs-cookie/distinfo4
-rw-r--r--www/hs-cookie/pkg-descr2
-rw-r--r--www/hs-css-text/Makefile7
-rw-r--r--www/hs-css-text/pkg-descr2
-rw-r--r--www/hs-fastcgi/Makefile8
-rw-r--r--www/hs-gitit/Makefile7
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-gitit/files/patch-gitit.cabal11
-rw-r--r--www/hs-gitit/pkg-descr2
-rw-r--r--www/hs-hS3/Makefile7
-rw-r--r--www/hs-hS3/pkg-descr2
-rw-r--r--www/hs-hamlet/Makefile9
-rw-r--r--www/hs-hamlet/distinfo4
-rw-r--r--www/hs-hamlet/pkg-descr2
-rw-r--r--www/hs-happstack-server/Makefile11
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack-server/pkg-descr2
-rw-r--r--www/hs-happstack/Makefile8
-rw-r--r--www/hs-happstack/distinfo4
-rw-r--r--www/hs-happstack/pkg-descr2
-rw-r--r--www/hs-heist/Makefile11
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-heist/pkg-descr2
-rw-r--r--www/hs-hjsmin/Makefile8
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-hjsmin/pkg-descr2
-rw-r--r--www/hs-http-conduit/Makefile23
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-conduit/pkg-descr2
-rw-r--r--www/hs-http-date/Makefile8
-rw-r--r--www/hs-http-date/distinfo4
-rw-r--r--www/hs-http-date/pkg-descr2
-rw-r--r--www/hs-http-reverse-proxy/Makefile21
-rw-r--r--www/hs-http-reverse-proxy/distinfo2
-rw-r--r--www/hs-http-reverse-proxy/pkg-descr5
-rw-r--r--www/hs-http-server/Makefile18
-rw-r--r--www/hs-http-server/distinfo4
-rw-r--r--www/hs-http-server/files/patch-Network__HTTP__Server.hs13
-rw-r--r--www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs18
-rw-r--r--www/hs-http-server/pkg-descr2
-rw-r--r--www/hs-http-types/Makefile8
-rw-r--r--www/hs-http-types/distinfo4
-rw-r--r--www/hs-http-types/pkg-descr2
-rw-r--r--www/hs-oeis/Makefile8
-rw-r--r--www/hs-path-pieces/Makefile8
-rw-r--r--www/hs-path-pieces/distinfo4
-rw-r--r--www/hs-path-pieces/pkg-descr2
-rw-r--r--www/hs-recaptcha/Makefile7
-rw-r--r--www/hs-recaptcha/pkg-descr2
-rw-r--r--www/hs-scgi/Makefile8
-rw-r--r--www/hs-shakespeare-css/Makefile10
-rw-r--r--www/hs-shakespeare-css/distinfo4
-rw-r--r--www/hs-shakespeare-css/pkg-descr2
-rw-r--r--www/hs-shakespeare-i18n/Makefile7
-rw-r--r--www/hs-shakespeare-i18n/pkg-descr2
-rw-r--r--www/hs-shakespeare-js/Makefile10
-rw-r--r--www/hs-shakespeare-js/distinfo4
-rw-r--r--www/hs-shakespeare-js/pkg-descr2
-rw-r--r--www/hs-shakespeare-text/Makefile8
-rw-r--r--www/hs-shakespeare-text/distinfo4
-rw-r--r--www/hs-shakespeare-text/pkg-descr2
-rw-r--r--www/hs-shakespeare/Makefile8
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-shakespeare/pkg-descr2
-rw-r--r--www/hs-snap-core/Makefile19
-rw-r--r--www/hs-snap-core/distinfo4
-rw-r--r--www/hs-snap-core/pkg-descr2
-rw-r--r--www/hs-snap-server/Makefile29
-rw-r--r--www/hs-snap-server/distinfo4
-rw-r--r--www/hs-snap-server/pkg-descr2
-rw-r--r--www/hs-snap/Makefile21
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-snap/pkg-descr9
-rw-r--r--www/hs-url/Makefile8
-rw-r--r--www/hs-url/pkg-descr2
-rw-r--r--www/hs-wai-app-static/Makefile15
-rw-r--r--www/hs-wai-app-static/distinfo4
-rw-r--r--www/hs-wai-app-static/pkg-descr2
-rw-r--r--www/hs-wai-extra/Makefile18
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-extra/pkg-descr2
-rw-r--r--www/hs-wai-logger/Makefile12
-rw-r--r--www/hs-wai-logger/distinfo4
-rw-r--r--www/hs-wai-logger/pkg-descr2
-rw-r--r--www/hs-wai-test/Makefile16
-rw-r--r--www/hs-wai-test/distinfo4
-rw-r--r--www/hs-wai-test/pkg-descr2
-rw-r--r--www/hs-wai/Makefile9
-rw-r--r--www/hs-wai/distinfo4
-rw-r--r--www/hs-wai/pkg-descr2
-rw-r--r--www/hs-warp/Makefile17
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-warp/pkg-descr2
-rw-r--r--www/hs-webkit/Makefile7
-rw-r--r--www/hs-xss-sanitize/Makefile7
-rw-r--r--www/hs-xss-sanitize/pkg-descr2
-rw-r--r--www/hs-yesod-auth/Makefile23
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-auth/pkg-descr2
-rw-r--r--www/hs-yesod-core/Makefile23
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-core/pkg-descr2
-rw-r--r--www/hs-yesod-default/Makefile15
-rw-r--r--www/hs-yesod-default/distinfo4
-rw-r--r--www/hs-yesod-default/pkg-descr2
-rw-r--r--www/hs-yesod-form/Makefile19
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-form/pkg-descr2
-rw-r--r--www/hs-yesod-json/Makefile16
-rw-r--r--www/hs-yesod-json/distinfo4
-rw-r--r--www/hs-yesod-json/pkg-descr2
-rw-r--r--www/hs-yesod-persistent/Makefile12
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-persistent/pkg-descr2
-rw-r--r--www/hs-yesod-platform/Makefile168
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal13
-rw-r--r--www/hs-yesod-platform/pkg-descr2
-rw-r--r--www/hs-yesod-routes/Makefile8
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-routes/pkg-descr2
-rw-r--r--www/hs-yesod-static/Makefile17
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-static/pkg-descr2
-rw-r--r--www/hs-yesod-test/Makefile18
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod-test/pkg-descr2
-rw-r--r--www/hs-yesod/Makefile33
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--www/hs-yesod/pkg-descr2
-rw-r--r--x11-toolkits/hs-GLUT/Makefile7
-rw-r--r--x11-toolkits/hs-GLUT/pkg-descr2
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile7
-rw-r--r--x11-toolkits/hs-OpenGL/pkg-descr2
-rw-r--r--x11-toolkits/hs-frantk/Makefile6
-rw-r--r--x11-toolkits/hs-gtk/Makefile7
-rw-r--r--x11-toolkits/hs-gtk/distinfo4
-rw-r--r--x11-toolkits/hs-gtk/pkg-descr2
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile11
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile7
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile7
-rw-r--r--x11-toolkits/hs-pango/Makefile11
-rw-r--r--x11-toolkits/hs-pango/distinfo4
-rw-r--r--x11-toolkits/hs-pango/pkg-descr2
-rw-r--r--x11-toolkits/hs-vte/Makefile7
-rw-r--r--x11-toolkits/hs-wx/Makefile7
-rw-r--r--x11-toolkits/hs-wx/pkg-descr2
-rw-r--r--x11-toolkits/hs-wxc/Makefile6
-rw-r--r--x11-toolkits/hs-wxc/pkg-descr2
-rw-r--r--x11-toolkits/hs-wxcore/Makefile6
-rw-r--r--x11-toolkits/hs-wxcore/pkg-descr2
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile7
-rw-r--r--x11-toolkits/hs-wxdirect/pkg-descr2
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile10
-rw-r--r--x11-wm/hs-xmonad-contrib/pkg-descr2
-rw-r--r--x11-wm/hs-xmonad/Makefile8
-rw-r--r--x11-wm/hs-xmonad/pkg-descr2
-rw-r--r--x11/hs-X11-xft/Makefile7
-rw-r--r--x11/hs-X11/Makefile9
-rw-r--r--x11/hs-xmobar/Makefile9
-rw-r--r--x11/hs-xmobar/pkg-descr2
973 files changed, 3047 insertions, 3714 deletions
diff --git a/MOVED b/MOVED
index a85c9aab491b..43dc1fc714f0 100644
--- a/MOVED
+++ b/MOVED
@@ -3994,3 +3994,4 @@ mail/horde4-imp|mail/horde-imp|2012-12-18|Move horde4-* apps to horde-*
mail/horde4-ingo|mail/horde-ingo|2012-12-18|Move horde4-* apps to horde-*
mail/horde4-turba|mail/horde-turba|2012-12-18|Move horde4-* apps to horde-*
mail/horde4-webmail|mail/horde-webmail|2012-12-18|Move horde4-* apps to horde-*
+textproc/hs-xml2html||2012-12-20|Removed: this package is obsolete.
diff --git a/UPDATING b/UPDATING
index e12e0b170840..2a3c071170b7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20121220:
+ AFFECTS: users of lang/ghc
+ AUTHOR: haskell@FreeBSD.org
+
+ Note that the Glorious Glasgow Haskell Compiler has been updated to
+ version 7.4.2.
+
+ Please rebuild or reinstall all dependent ports by issuing one of the
+ following commands, depending on the tool used:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+ or
+ # pkg install -fR lang/ghc
+
+
20121218:
AFFECTS: users of icu
AUTHOR bapt@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index 8449de0fa97e..f3964f4174b4 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tar
-# Date created: 2010-08-17
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tar
-PORTVERSION= 0.4.0.0
-PORTREVISION= 1
+PORTVERSION= 0.4.0.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo
index 05210d538613..1fc78b063dd7 100644
--- a/archivers/hs-tar/distinfo
+++ b/archivers/hs-tar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tar-0.4.0.0.tar.gz) = a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113
-SIZE (cabal/tar-0.4.0.0.tar.gz) = 17713
+SHA256 (cabal/tar-0.4.0.1.tar.gz) = a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d
+SIZE (cabal/tar-0.4.0.1.tar.gz) = 17875
diff --git a/archivers/hs-tar/pkg-descr b/archivers/hs-tar/pkg-descr
index ca3b943f2666..0af4d174b39e 100644
--- a/archivers/hs-tar/pkg-descr
+++ b/archivers/hs-tar/pkg-descr
@@ -5,4 +5,4 @@ unpacking portable archives. This makes it suitable for distribution
but not backup because details like file ownership and exact
permissions are not preserved.
-WWW: http://hackage.haskell.org/package/tar
+WWW: http://hackage.haskell.org/package/tar
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 92e78da810b6..bb3baf184d29 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: zip-archive
-# Date created: December 15, 2008
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= zip-archive
-PORTVERSION= 0.1.1.8
-PORTREVISION= 1
+PORTVERSION= 0.1.2.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -21,7 +15,7 @@ OPTIONS_DEFINE= EXECUTABLE
EXECUTABLE_DESC= Build the Zip executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="executable"
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 9fa6da952712..ce7ba3f13671 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.1.8.tar.gz) = c11333201fad7f1fb19d4f40977b77620f04290005ead30ecbd4c4aec3940467
-SIZE (cabal/zip-archive-0.1.1.8.tar.gz) = 17227
+SHA256 (cabal/zip-archive-0.1.2.1.tar.gz) = f0ce17e41b28889543a1dd4dda1546b3cdd53a616101f3efb2846c37f39217b0
+SIZE (cabal/zip-archive-0.1.2.1.tar.gz) = 11123
diff --git a/archivers/hs-zip-archive/pkg-descr b/archivers/hs-zip-archive/pkg-descr
index a19761826aeb..7d05274c2365 100644
--- a/archivers/hs-zip-archive/pkg-descr
+++ b/archivers/hs-zip-archive/pkg-descr
@@ -1,4 +1,4 @@
The zip-archive library provides functions for creating, modifying, and
extracting files from zip archives.
-WWW: http://github.com/jgm/zip-archive
+WWW: http://github.com/jgm/zip-archive
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 7c4e88d64368..8343242aa4ea 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-zlib-bindings
-# Date created: October 18, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
PORTNAME= zlib-bindings
-PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-bindings/distinfo b/archivers/hs-zlib-bindings/distinfo
index 6f18b623aaa6..5f411010cf39 100644
--- a/archivers/hs-zlib-bindings/distinfo
+++ b/archivers/hs-zlib-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-bindings-0.1.0.1.tar.gz) = 8c6e229709ba0c2cfd386be346fd3e68417b41937fcbecb62b7fa6d56b953064
-SIZE (cabal/zlib-bindings-0.1.0.1.tar.gz) = 54270
+SHA256 (cabal/zlib-bindings-0.1.1.2.tar.gz) = 9686b6cce62f4b874e3c453b6a17f32ee751f69f26e7e1fcdaa96095d908875c
+SIZE (cabal/zlib-bindings-0.1.1.2.tar.gz) = 55496
diff --git a/archivers/hs-zlib-bindings/pkg-descr b/archivers/hs-zlib-bindings/pkg-descr
index e82c56c4310d..845b00f6c4f6 100644
--- a/archivers/hs-zlib-bindings/pkg-descr
+++ b/archivers/hs-zlib-bindings/pkg-descr
@@ -1,4 +1,4 @@
Provides necessary functions for producing a streaming interface. This
is used for example by zlib-conduit and zlib-enum.
-WWW: http://github.com/snoyberg/zlib-bindings
+WWW: http://github.com/snoyberg/zlib-bindings
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
index 9abbb0b838ed..2f59960ea457 100644
--- a/archivers/hs-zlib-conduit/Makefile
+++ b/archivers/hs-zlib-conduit/Makefile
@@ -1,11 +1,7 @@
-# New ports collection makefile for: hs-zlib-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
PORTNAME= zlib-conduit
-PORTVERSION= 0.4.0.2
+PORTVERSION= 0.5.0.3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +9,7 @@ COMMENT= Streaming compression/decompression via conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.4 transformers>=0.2.2 zlib-bindings>=0.1
+USE_CABAL= conduit>=0.5 transformers>=0.2.2 void zlib-bindings>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/archivers/hs-zlib-conduit/distinfo b/archivers/hs-zlib-conduit/distinfo
index cbbcf25ccc84..a4999e2607dd 100644
--- a/archivers/hs-zlib-conduit/distinfo
+++ b/archivers/hs-zlib-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-conduit-0.4.0.2.tar.gz) = a7522c4670463af754a6c75b954e7fb686909549dffdcd7aa81981c1b8f28fdf
-SIZE (cabal/zlib-conduit-0.4.0.2.tar.gz) = 3419
+SHA256 (cabal/zlib-conduit-0.5.0.3.tar.gz) = 4bdb01fc548a5ad5f805a8ce199cef78a9e76b8e245db7f4152561ceba5f3417
+SIZE (cabal/zlib-conduit-0.5.0.3.tar.gz) = 3507
diff --git a/archivers/hs-zlib-conduit/pkg-descr b/archivers/hs-zlib-conduit/pkg-descr
index 75892eb6b92e..cac9da7c5919 100644
--- a/archivers/hs-zlib-conduit/pkg-descr
+++ b/archivers/hs-zlib-conduit/pkg-descr
@@ -1,3 +1,3 @@
Streaming compression/decompression via conduits.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index f68d6261e3ce..92d4493c6e3e 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-zlib-enum
-# Date created: October 18, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
PORTNAME= zlib-enum
-PORTVERSION= 0.2.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/distinfo b/archivers/hs-zlib-enum/distinfo
index 9ba23fe77bb8..9c44df60332f 100644
--- a/archivers/hs-zlib-enum/distinfo
+++ b/archivers/hs-zlib-enum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-enum-0.2.2.1.tar.gz) = a9cb17442a1fbff01f9ea6afed5eaeae70a755b7039931fcaa0e2f40a0515b09
-SIZE (cabal/zlib-enum-0.2.2.1.tar.gz) = 4648
+SHA256 (cabal/zlib-enum-0.2.3.tar.gz) = 21b644a72ae4b971d4a6229801f3e1f424ec62579c17092ed88a32ca09142753
+SIZE (cabal/zlib-enum-0.2.3.tar.gz) = 4652
diff --git a/archivers/hs-zlib-enum/pkg-descr b/archivers/hs-zlib-enum/pkg-descr
index 79f176424978..549a1803e296 100644
--- a/archivers/hs-zlib-enum/pkg-descr
+++ b/archivers/hs-zlib-enum/pkg-descr
@@ -1,4 +1,4 @@
zlib-enum is a stop-gap package to provide enumeratees for zlib
compression/decompression.
-WWW: http://github.com/maltem/zlib-enum
+WWW: http://github.com/maltem/zlib-enum
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 579dd703c9dd..edbc063dad4e 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: zlib
-# Date created: November 2, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= zlib
-PORTVERSION= 0.5.3.3
-PORTREVISION= 1
+PORTVERSION= 0.5.4.0
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index bae690077d65..0fa3502bec04 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-0.5.3.3.tar.gz) = e2adb6c55f5bc69eb1e931edcb2ef392ac96139cf6b6bca1b2a7229f381938c3
-SIZE (cabal/zlib-0.5.3.3.tar.gz) = 125636
+SHA256 (cabal/zlib-0.5.4.0.tar.gz) = 61771a451a23a26954d8f9f0d5c5b63f633fd3f272c9ab70a2ebe78532270ca2
+SIZE (cabal/zlib-0.5.4.0.tar.gz) = 127571
diff --git a/archivers/hs-zlib/pkg-descr b/archivers/hs-zlib/pkg-descr
index 64564dee7e60..67b4950c2d0b 100644
--- a/archivers/hs-zlib/pkg-descr
+++ b/archivers/hs-zlib/pkg-descr
@@ -7,4 +7,4 @@ It provides a convenient high level API suitable for most tasks and for
the few cases where more control is needed it provides access to the
full zlib feature set.
-WWW: http://code.haskell.org/zlib/
+WWW: http://hackage.haskell.org/package/zlib
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 31bb59456b04..792f3c3cf931 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-ALUT
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= ALUT
PORTVERSION= 2.2.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index fb60804e0471..e07e61117941 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-OpenAL
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= OpenAL
PORTVERSION= 1.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/pkg-descr b/audio/hs-OpenAL/pkg-descr
index c894ab6a9ac5..58835b85fd1e 100644
--- a/audio/hs-OpenAL/pkg-descr
+++ b/audio/hs-OpenAL/pkg-descr
@@ -2,4 +2,4 @@ A Haskell binding for the OpenAL cross-platform 3D audio API,
appropriate for use with gaming applications and many other
types of audio applications. For more information about OpenAL.
-WWW: http://connect.creativelabs.com/openal/
+WWW: http://connect.creativelabs.com/openal/
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index 523ab12afd47..0acf0cfd2d72 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-libmpd
-# Date created: May 16, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= libmpd
-PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTVERSION= 0.8.0.1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= An MPD client library
LICENSE= LGPL21
-USE_CABAL= mtl>=2.0 mtl network>=2.1 text utf8-string>=0.3.1
+USE_CABAL= mtl>=2.0 network>=2.1 text utf8-string>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index deeb639028b0..06b256727ab5 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/libmpd-0.8.0.tar.gz) = ca830604215ab16bc740eec30956b47b4e4e84ecc3017c167d21808c23f6c96a
-SIZE (cabal/libmpd-0.8.0.tar.gz) = 40127
+SHA256 (cabal/libmpd-0.8.0.1.tar.gz) = b5e31ad6a2c2384eee6d4d8c89246bf46eea0965c1e1974e5a9a526e1b60429a
+SIZE (cabal/libmpd-0.8.0.1.tar.gz) = 31861
diff --git a/audio/hs-libmpd/pkg-descr b/audio/hs-libmpd/pkg-descr
index d6c23a6c5fdc..3433bd44b567 100644
--- a/audio/hs-libmpd/pkg-descr
+++ b/audio/hs-libmpd/pkg-descr
@@ -1,3 +1,3 @@
A client library for MPD, the Music Player Daemon.
-WWW: http://github.com/joachifm/libmpd-haskell
+WWW: http://github.com/joachifm/libmpd-haskell
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 8cec0dcb5bf2..6d9490471b99 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-criterion
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= criterion
-PORTVERSION= 0.6.0.1
-PORTREVISION= 2
+PORTVERSION= 0.6.2.0
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,8 +11,8 @@ COMMENT= Robust, reliable performance measurement and analysis
LICENSE= BSD
USE_CABAL= aeson>=0.3.2.12 hastache>=0.1.5 mtl>=2 mwc-random>=0.8.0.3 \
- parsec>=3.1.0 statistics>=0.10.0.0 vector>=0.7.1 \
- vector-algorithms>=0.4
+ parsec>=3.1.0 statistics>=0.10.0.0 transformers \
+ vector>=0.7.1 vector-algorithms>=0.4
INSTALL_PORTEXAMPLES= \
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index 201d60a83406..756576caf06a 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/criterion-0.6.0.1.tar.gz) = 0af8b9817dd8a5ab7d336d07e809b3a5d5c1ccd21ba963e8433fc0c203b9d14c
-SIZE (cabal/criterion-0.6.0.1.tar.gz) = 152902
+SHA256 (cabal/criterion-0.6.2.0.tar.gz) = bd36ce9b3ff24ff3fe428645a54b1166b928925d48cf63b5c0d11a011606a9f5
+SIZE (cabal/criterion-0.6.2.0.tar.gz) = 153076
diff --git a/benchmarks/hs-criterion/pkg-descr b/benchmarks/hs-criterion/pkg-descr
index c642b0098ed6..a331977172f8 100644
--- a/benchmarks/hs-criterion/pkg-descr
+++ b/benchmarks/hs-criterion/pkg-descr
@@ -3,4 +3,4 @@ performance of Haskell code. It provides both a framework for executing
and analysing benchmarks and a set of driver functions that makes it
easy to build and run benchmarks, and to analyse their results.
-WWW: http://hackage.haskell.org/package/criterion
+WWW: http://hackage.haskell.org/package/criterion
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 17fc8df13027..ae3cd6f93e3e 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-aeson
-# Date created: July 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= aeson
PORTVERSION= 0.6.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/pkg-descr b/converters/hs-aeson/pkg-descr
index 6350ef5e7755..e7d553fc30ad 100644
--- a/converters/hs-aeson/pkg-descr
+++ b/converters/hs-aeson/pkg-descr
@@ -2,4 +2,4 @@ A JSON parsing and encoding library optimized for ease of use and high
performance. (A note on naming: in Greek mythology, Aeson was the
father of Jason.)
-WWW: https://github.com/bos/aeson
+WWW: https://github.com/bos/aeson
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 7baf8832d51d..05feac919193 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-dataenc
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= dataenc
-PORTVERSION= 0.14.0.3
-PORTREVISION= 2
+PORTVERSION= 0.14.0.4
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/distinfo b/converters/hs-dataenc/distinfo
index ff354f21c787..6dc1955ccbb1 100644
--- a/converters/hs-dataenc/distinfo
+++ b/converters/hs-dataenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dataenc-0.14.0.3.tar.gz) = ed029fb48284ce3f42c6e5a00495e3744537c95fad0af7f71343d5d22f4bd3cc
-SIZE (cabal/dataenc-0.14.0.3.tar.gz) = 12911
+SHA256 (cabal/dataenc-0.14.0.4.tar.gz) = 7c9540d746b578ff3d3eb2fce896c00d697044ba25cfe9ffcaa092ef2d48d676
+SIZE (cabal/dataenc-0.14.0.4.tar.gz) = 12911
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 9a1da303d89c..b09becccdcb2 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-json
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= json
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.7
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +12,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= mtl syb>=0.3.3
+USE_CABAL= mtl syb>=0.3.3 text
CONFIGURE_ARGS+= --flags="split-base generic -parsec -pretty -mapdict"
diff --git a/converters/hs-json/distinfo b/converters/hs-json/distinfo
index d19180368ef3..58b1f3d8a6f7 100644
--- a/converters/hs-json/distinfo
+++ b/converters/hs-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/json-0.5.tar.gz) = d419bf7d1dd07dcccdc9b40b98a077cdfb5248d1685f929ec1e59f4b01de4b8a
-SIZE (cabal/json-0.5.tar.gz) = 22724
+SHA256 (cabal/json-0.7.tar.gz) = d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3
+SIZE (cabal/json-0.7.tar.gz) = 22411
diff --git a/converters/hs-json/pkg-descr b/converters/hs-json/pkg-descr
index 9bcfc2691ce2..e24a828afc8e 100644
--- a/converters/hs-json/pkg-descr
+++ b/converters/hs-json/pkg-descr
@@ -5,4 +5,4 @@ Language, Standard ECMA-262 3rd Edition - December 1999. This library
provides a parser and pretty printer for converting between Haskell values
and JSON.
-WWW: http://hackage.haskell.org/package/json
+WWW: http://hackage.haskell.org/package/json
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index 10e40f79c59c..0576c0613715 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-mysql
-# Date created: 2011-05-23
-# Whom: jyyou@cs.nctu.edu.tw
-#
+# Created by: jyyou@cs.nctu.edu.tw
# $FreeBSD$
-#
PORTNAME= mysql
PORTVERSION= 0.1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/pkg-descr b/databases/hs-mysql/pkg-descr
index 9f59b1861d20..34558cf33d08 100644
--- a/databases/hs-mysql/pkg-descr
+++ b/databases/hs-mysql/pkg-descr
@@ -2,4 +2,4 @@ This library is a Haskell binding to the MySQL mysqlclient client library.
It is a fairly faithful, low level library that implements
most of the MySQL client API.
-WWW: https://github.com/bos/mysql
+WWW: https://github.com/bos/mysql
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index a6b88542aa11..b4e84385a2e4 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-persistent-sqlite
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= persistent-sqlite
-PORTVERSION= 0.9.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
-USE_CABAL= aeson>=0.5 conduit>=0.4 monad-control>=0.2 persistent>=0.9 \
+USE_CABAL= aeson>=0.5 conduit>=0.5 monad-control>=0.2 persistent>=1.0 \
text>=0.7 transformers>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 076d0c946a02..356b8fc53034 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-0.9.0.2.tar.gz) = eb8fa320475f28b48d1f3f9e4bb84744aac7d4fb6cfaa8455577e13147f895a7
-SIZE (cabal/persistent-sqlite-0.9.0.2.tar.gz) = 1108691
+SHA256 (cabal/persistent-sqlite-1.0.1.tar.gz) = f52c2117e0f55576c6840e707ae5cd42574827fbc3d7ec001e3e9ee1ebee7ee3
+SIZE (cabal/persistent-sqlite-1.0.1.tar.gz) = 1285112
diff --git a/databases/hs-persistent-sqlite/pkg-descr b/databases/hs-persistent-sqlite/pkg-descr
index 05b30f8ce623..aa47ae6bf968 100644
--- a/databases/hs-persistent-sqlite/pkg-descr
+++ b/databases/hs-persistent-sqlite/pkg-descr
@@ -2,4 +2,4 @@ This package includes a thin sqlite3 wrapper based on the direct-sqlite
package, as well as the entire C library, so there are no system
dependencies.
-WWW: http://www.yesodweb.com/book/persistent
+WWW: http://www.yesodweb.com/book/persistent
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 724ac37aeea8..dcafa19268e8 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-persistent-template
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= persistent-template
-PORTVERSION= 0.9.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.0.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson monad-control>=0.2 persistent>=0.9 text>=0.5 \
+USE_CABAL= aeson monad-control>=0.2 persistent>=1.0 text>=0.5 \
transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 95bca25a1100..5e580612997b 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-0.9.0.2.tar.gz) = 7c29ae335dfda30eccdcccbc4c209823336a08d03a66b09a5a3090dd5bb17df4
-SIZE (cabal/persistent-template-0.9.0.2.tar.gz) = 9595
+SHA256 (cabal/persistent-template-1.0.0.2.tar.gz) = e8c7c47482daccd38c93be37818b629ff03f90e56299f284ba15e19edd0b6d6a
+SIZE (cabal/persistent-template-1.0.0.2.tar.gz) = 10208
diff --git a/databases/hs-persistent-template/pkg-descr b/databases/hs-persistent-template/pkg-descr
index fe71a91f78e6..670d67a81ebd 100644
--- a/databases/hs-persistent-template/pkg-descr
+++ b/databases/hs-persistent-template/pkg-descr
@@ -1,4 +1,4 @@
This library provides just the general interface and helper functions.
You must use a specific backend in order to make this useful.
-WWW: http://www.yesodweb.com/book/persistent
+WWW: http://www.yesodweb.com/book/persistent
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 4435bbeb003a..e8f39f774b8b 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,25 +1,19 @@
-# New ports collection makefile for: hs-persistent
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= persistent
-PORTVERSION= 0.9.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.2.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type-safe, multi-backend data serialization
-LICENSE= BSD
+LICENSE= MIT
-USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.4 \
- blaze-markup>=0.5.1 conduit>=0.4 lifted-base>=0.1 \
- monad-control>=0.3 path-pieces>=0.1 pool-conduit>=0.1 \
- resourcet>=0.3 text>=0.8 transformers>=0.2.1 transformers-base \
- unordered-containers vector
+USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
+ blaze-markup>=0.5.1 conduit>=0.5 lifted-base>=0.1 \
+ monad-control>=0.3 monad-logger>=0.2.1 path-pieces>=0.1 \
+ pool-conduit>=0.1 resourcet>=0.3 text>=0.8 transformers>=0.2.1 \
+ transformers-base unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index 0f6217a963de..701618fa77fb 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-0.9.0.4.tar.gz) = 59a6c6f188ec883524229a0dfae8de6918bf71af04bb160e4aea2156a1a0f5c5
-SIZE (cabal/persistent-0.9.0.4.tar.gz) = 27921
+SHA256 (cabal/persistent-1.0.2.2.tar.gz) = d6a05aefa9ae1a3903009dd9ec89f8b249c7a4a2f7aa914ad7013000b64c5a69
+SIZE (cabal/persistent-1.0.2.2.tar.gz) = 29083
diff --git a/databases/hs-persistent/pkg-descr b/databases/hs-persistent/pkg-descr
index 2fb730da959e..8814d00f5b17 100644
--- a/databases/hs-persistent/pkg-descr
+++ b/databases/hs-persistent/pkg-descr
@@ -1,4 +1,4 @@
Type-safe, data serialization. You must use a specific backend in order
to make this useful.
-WWW: http://www.yesodweb.com/book/persistent
+WWW: http://www.yesodweb.com/book/persistent
diff --git a/devel/Makefile b/devel/Makefile
index 83ec6adf140c..013de4972aaa 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -638,6 +638,7 @@
SUBDIR += hs-HUnit
SUBDIR += hs-IORefCAS
SUBDIR += hs-IfElse
+ SUBDIR += hs-List
SUBDIR += hs-MaybeT
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
@@ -646,21 +647,26 @@
SUBDIR += hs-ObjectName
SUBDIR += hs-PSQueue
SUBDIR += hs-QuickCheck
+ SUBDIR += hs-ReadArgs
+ SUBDIR += hs-SafeSemaphore
SUBDIR += hs-StateVar
SUBDIR += hs-Stream
SUBDIR += hs-Tensor
SUBDIR += hs-TypeCompose
SUBDIR += hs-abstract-deque
SUBDIR += hs-abstract-par
+ SUBDIR += hs-activehs-base
SUBDIR += hs-alex
SUBDIR += hs-ansi-terminal
SUBDIR += hs-ansi-wl-pprint
SUBDIR += hs-arrows
SUBDIR += hs-asn1-data
+ SUBDIR += hs-async
SUBDIR += hs-attempt
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
+ SUBDIR += hs-basic-prelude
SUBDIR += hs-bits-atomic
SUBDIR += hs-blaze-builder
SUBDIR += hs-blaze-builder-conduit
@@ -672,6 +678,8 @@
SUBDIR += hs-bytestring-nums
SUBDIR += hs-c2hs
SUBDIR += hs-cabal-install
+ SUBDIR += hs-classy-prelude
+ SUBDIR += hs-classy-prelude-conduit
SUBDIR += hs-cereal
SUBDIR += hs-checkers
SUBDIR += hs-cmdargs
@@ -681,6 +689,8 @@
SUBDIR += hs-cpphs
SUBDIR += hs-darcs
SUBDIR += hs-data-default
+ SUBDIR += hs-data-pprint
+ SUBDIR += hs-date-cache
SUBDIR += hs-datetime
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
@@ -694,6 +704,7 @@
SUBDIR += hs-filemanip
SUBDIR += hs-filestore
SUBDIR += hs-filesystem-conduit
+ SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
SUBDIR += hs-ghc-events
SUBDIR += hs-ghc-mtl
@@ -715,13 +726,16 @@
SUBDIR += hs-hastache
SUBDIR += hs-hat
SUBDIR += hs-hdoc
+ SUBDIR += hs-hinotify
SUBDIR += hs-hint
SUBDIR += hs-hlibev
SUBDIR += hs-hlint
SUBDIR += hs-hoogle
SUBDIR += hs-hslogger
SUBDIR += hs-hspec
+ SUBDIR += hs-hspec-expectations
SUBDIR += hs-idoc
+ SUBDIR += hs-kqueue
SUBDIR += hs-language-c
SUBDIR += hs-language-javascript
SUBDIR += hs-largeword
@@ -730,15 +744,18 @@
SUBDIR += hs-logict
SUBDIR += hs-mmap
SUBDIR += hs-monad-control
+ SUBDIR += hs-monad-logger
SUBDIR += hs-monad-par
SUBDIR += hs-monad-par-extras
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
+ SUBDIR += hs-optparse-applicative
SUBDIR += hs-parallel
SUBDIR += hs-pcre-light
SUBDIR += hs-pool-conduit
SUBDIR += hs-primitive
+ SUBDIR += hs-project-template
SUBDIR += hs-random
SUBDIR += hs-ranges
SUBDIR += hs-reactive
@@ -746,8 +763,10 @@
SUBDIR += hs-resource-pool
SUBDIR += hs-resourcet
SUBDIR += hs-safe
+ SUBDIR += hs-setenv
SUBDIR += hs-show
SUBDIR += hs-silently
+ SUBDIR += hs-simple-reflect
SUBDIR += hs-smallcheck
SUBDIR += hs-split
SUBDIR += hs-stm
@@ -765,12 +784,15 @@
SUBDIR += hs-test-framework-quickcheck2
SUBDIR += hs-testpack
SUBDIR += hs-text
+ SUBDIR += hs-threads
SUBDIR += hs-threadscope
+ SUBDIR += hs-time-compat
SUBDIR += hs-transformers
SUBDIR += hs-transformers-base
SUBDIR += hs-unamb
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
+ SUBDIR += hs-unix-time
SUBDIR += hs-unordered-containers
SUBDIR += hs-utf8-light
SUBDIR += hs-utf8-string
@@ -783,6 +805,7 @@
SUBDIR += hs-vector
SUBDIR += hs-vector-algorithms
SUBDIR += hs-void
+ SUBDIR += hs-word8
SUBDIR += htable
SUBDIR += hub
SUBDIR += hwloc
diff --git a/devel/cvs2darcs/Makefile b/devel/cvs2darcs/Makefile
index 690b89e0ee71..e7d1722e2056 100644
--- a/devel/cvs2darcs/Makefile
+++ b/devel/cvs2darcs/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: cvs2darcs
-# Date created: 1 March 2007
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= cvs2darcs
PORTVERSION= 0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://ab-initio.mit.edu/${PORTNAME}/
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index ca61bc86414e..c4551fd1bbb4 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: bnfc
-# Date created: 2007-02-11
-# Whom: Kai Wang <kaiw27@gmail.com>
-#
+# Created by: Kai Wang <kaiw27@gmail.com>
# $FreeBSD$
-#
PORTNAME= BNFC
PORTVERSION= 2.4.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BNFC/pkg-descr b/devel/hs-BNFC/pkg-descr
index 6790411ab8fe..32f16a632efb 100644
--- a/devel/hs-BNFC/pkg-descr
+++ b/devel/hs-BNFC/pkg-descr
@@ -3,4 +3,4 @@ front-end from a Labeled BNF grammar. It was originally written to generate
Haskell, but starting from Version 2.0, it can also be used for generating
Java, C++, and C.
-WWW: http://www.cse.chalmers.se/research/group/Language-technology/BNFC/
+WWW: http://www.cse.chalmers.se/research/group/Language-technology/BNFC/
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 2fef53aea3d8..4ed17c400e0c 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-Boolean
-# Date created: June 5, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= Boolean
-PORTVERSION= 0.0.1
-PORTREVISION= 5
+PORTVERSION= 0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index 125dfbac8ffd..a46f5aeb5d9d 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.0.1.tar.gz) = dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765
-SIZE (cabal/Boolean-0.0.1.tar.gz) = 3174
+SHA256 (cabal/Boolean-0.1.1.tar.gz) = db2370df3810e62e7604666da9e44a25a690d9c9770b34f63be6bf4e7539a0c5
+SIZE (cabal/Boolean-0.1.1.tar.gz) = 4237
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 953f1e67d3d6..bc2ddf88ad61 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-ConfigFile
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= ConfigFile
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/pkg-descr b/devel/hs-ConfigFile/pkg-descr
index 73e7c733dc12..75ebcb995a29 100644
--- a/devel/hs-ConfigFile/pkg-descr
+++ b/devel/hs-ConfigFile/pkg-descr
@@ -9,4 +9,4 @@ ConfigFile provides simple calls to both read and write config files.
It is possible to make a config file parsable by this module, the Unix
shell, and make.
-WWW: http://software.complete.org/configfile
+WWW: http://software.complete.org/configfile
diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile
index 329b9373d13c..8440fe507d51 100644
--- a/devel/hs-DeepArrow/Makefile
+++ b/devel/hs-DeepArrow/Makefile
@@ -1,21 +1,17 @@
-# New ports collection makefile for: hs-DeepArrow
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= DeepArrow
-PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Arrows for "deep application"
LICENSE= BSD
+FILE_LICENSE= COPYING
-USE_CABAL= haskell-src mtl TypeCompose>=0.6.7
+USE_CABAL= haskell-src mtl TypeCompose>=0.9.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-DeepArrow/distinfo b/devel/hs-DeepArrow/distinfo
index f914215691fc..d5a7b3c43404 100644
--- a/devel/hs-DeepArrow/distinfo
+++ b/devel/hs-DeepArrow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/DeepArrow-0.3.5.tar.gz) = 75e8dd0ce60d8add1a17cc50a3cd12d3b36bdfa04a75f99f2e2d176083c66ece
-SIZE (cabal/DeepArrow-0.3.5.tar.gz) = 9040
+SHA256 (cabal/DeepArrow-0.3.7.tar.gz) = b43239d2626fed2bc44506375775c95408f85b717035653a296459d970275e8a
+SIZE (cabal/DeepArrow-0.3.7.tar.gz) = 9843
diff --git a/devel/hs-DeepArrow/pkg-descr b/devel/hs-DeepArrow/pkg-descr
index c59aa5090328..3679cac6f3f9 100644
--- a/devel/hs-DeepArrow/pkg-descr
+++ b/devel/hs-DeepArrow/pkg-descr
@@ -1,7 +1,7 @@
-This Haskell library provides a framework for type-directed composition
-of value editors (non-syntactic transformations). The tools enable "deep
+This library provides a framework for type-directed composition of value
+editors (non-syntactic transformations). The tools enable "deep
function application" in two senses: deep application of functions and
-application of deep functions. These tools generalize beyond values and
+application of deep functions. These tools generalize beyond values and
functions, via the DeepArrow subclass of the Arrow type class.
-WWW: http://haskell.org/haskellwiki/DeepArrow
+WWW: http://haskell.org/haskellwiki/DeepArrow
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index ccc7d2aa93fe..944dbcd21587 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-HUnit
-# Date created: 2010-08-10
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= HUnit
-PORTVERSION= 1.2.4.2
-PORTREVISION= 2
+PORTVERSION= 1.2.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-HUnit/distinfo b/devel/hs-HUnit/distinfo
index 49556d585dd0..2a17e4ba95c4 100644
--- a/devel/hs-HUnit/distinfo
+++ b/devel/hs-HUnit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HUnit-1.2.4.2.tar.gz) = fdbcbc28196d616b449bf3e46c30dcd5577dc92f290458e2dbdbfc5a65de327a
-SIZE (cabal/HUnit-1.2.4.2.tar.gz) = 23558
+SHA256 (cabal/HUnit-1.2.5.1.tar.gz) = bc0c15d20ee7cedf35fadcaf9cc15b5c2b4ce2df9d80e61bfcdd65ef1ef64471
+SIZE (cabal/HUnit-1.2.5.1.tar.gz) = 24221
diff --git a/devel/hs-HUnit/pkg-descr b/devel/hs-HUnit/pkg-descr
index fb6d374b6fb2..968cd50c76dc 100644
--- a/devel/hs-HUnit/pkg-descr
+++ b/devel/hs-HUnit/pkg-descr
@@ -1,4 +1,4 @@
HUnit is a unit testing framework for Haskell, inspired by the JUnit
tool for Java.
-WWW: http://hunit.sourceforge.net
+WWW: http://hunit.sourceforge.net
diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-IORefCAS/Makefile
index c6bd2a63c2e4..579971345e5d 100644
--- a/devel/hs-IORefCAS/Makefile
+++ b/devel/hs-IORefCAS/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-IORefCAS
-# Date created: May 12, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= IORefCAS
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IORefCAS/pkg-descr b/devel/hs-IORefCAS/pkg-descr
index 77fb90327f5e..75fa5fcff051 100644
--- a/devel/hs-IORefCAS/pkg-descr
+++ b/devel/hs-IORefCAS/pkg-descr
@@ -8,4 +8,4 @@ These alternatives are useful for debugging. Note that the foreign option
does not operate on IORefs and so is directly interchangeable with `Data.CAS`
and `Data.CAS.Fake` only if the interface in `Data.CAS.Class` is used.
-WWW: http://hackage.haskell.org/package/IORefCAS
+WWW: http://hackage.haskell.org/package/IORefCAS
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 442a009b7c3e..6086282a60e2 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-IfElse
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/pkg-descr b/devel/hs-IfElse/pkg-descr
index 1a2d3ebb2981..b880330f137a 100644
--- a/devel/hs-IfElse/pkg-descr
+++ b/devel/hs-IfElse/pkg-descr
@@ -1,3 +1,3 @@
Anaphoric and miscellaneous useful control-flow.
-WWW: http://hackage.haskell.org/package/IfElse
+WWW: http://hackage.haskell.org/package/IfElse
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
new file mode 100644
index 000000000000..b350e29fb6e5
--- /dev/null
+++ b/devel/hs-List/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= List
+PORTVERSION= 0.5.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= List monad transformer and class
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= transformers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
new file mode 100644
index 000000000000..3defb9015b04
--- /dev/null
+++ b/devel/hs-List/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/List-0.5.1.tar.gz) = 3778f7695dbd2b75840724a1dea0430801d65242117df3815e6500281155f3c1
+SIZE (cabal/List-0.5.1.tar.gz) = 6234
diff --git a/devel/hs-List/pkg-descr b/devel/hs-List/pkg-descr
new file mode 100644
index 000000000000..eced94de81ee
--- /dev/null
+++ b/devel/hs-List/pkg-descr
@@ -0,0 +1,4 @@
+A List monad transformer and a List class. With standard list operations for
+Lists.
+
+WWW: http://github.com/yairchu/generator/tree
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile
index 43b1fac85e36..fddef62f67bc 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-MaybeT/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-MaybeT
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= MaybeT
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MaybeT/pkg-descr b/devel/hs-MaybeT/pkg-descr
index 4c4c5208aee6..d608e29182ae 100644
--- a/devel/hs-MaybeT/pkg-descr
+++ b/devel/hs-MaybeT/pkg-descr
@@ -1,3 +1,3 @@
Support for computations with failures.
-WWW: http://hackage.haskell.org/package/MaybeT
+WWW: http://hackage.haskell.org/package/MaybeT
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 729273a8b21b..06f8643b9a82 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-MemoTrie
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= MemoTrie
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index 4be65ecd29e2..dab3c3941428 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MemoTrie-0.5.tar.gz) = 6ebd135c50999bb0cd5e1086c3a212bcbddcd45f741791b7fd2c7acd58c1761e
-SIZE (cabal/MemoTrie-0.5.tar.gz) = 6182
+SHA256 (cabal/MemoTrie-0.6.1.tar.gz) = a676cd2b02044e7a84f2477262c9c344b6dc36e839f28002ceb2e78844eba0af
+SIZE (cabal/MemoTrie-0.6.1.tar.gz) = 6227
diff --git a/devel/hs-MemoTrie/pkg-descr b/devel/hs-MemoTrie/pkg-descr
index 373ac53dbfe4..19955c854588 100644
--- a/devel/hs-MemoTrie/pkg-descr
+++ b/devel/hs-MemoTrie/pkg-descr
@@ -1,4 +1,4 @@
Haskell MemoTrie provides a basis for memoized functions over some
domains, using tries. It is based on some code got from Spencer Janssen.
-WWW: http://haskell.org/haskellwiki/MemoTrie
+WWW: http://haskell.org/haskellwiki/MemoTrie
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index b5404a84156b..8702948cac4f 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-MissingH
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= MissingH
-PORTVERSION= 1.1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index f6bc14a59e9e..1c173adc247f 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MissingH-1.1.1.0.tar.gz) = 3e87293e00c57f28e1df8425d7b6ddb92abd2063f2d962104fd64a704d6e4ec4
-SIZE (cabal/MissingH-1.1.1.0.tar.gz) = 115901
+SHA256 (cabal/MissingH-1.2.0.0.tar.gz) = a15a7c33ecea71c729de8ac11c430a77c115df2c39776d57ee11d47d850c0f2f
+SIZE (cabal/MissingH-1.2.0.0.tar.gz) = 115761
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 76044fbd7321..b95d72be6ba9 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for: hs-MonadCatchIO-mtl
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= MonadCatchIO-mtl
-PORTVERSION= 0.3.0.4
-PORTREVISION= 3
+PORTVERSION= 0.3.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad-transformer version of the Control.Exception Haskell module
+COMMENT= Monad-transformer version of the Control.Exception module
LICENSE= BSD
diff --git a/devel/hs-MonadCatchIO-mtl/distinfo b/devel/hs-MonadCatchIO-mtl/distinfo
index ebff986dbaf7..7152e6e17c2e 100644
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ b/devel/hs-MonadCatchIO-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadCatchIO-mtl-0.3.0.4.tar.gz) = a776798a1f07952a71b9edd22418bccfd0e3b61c2f23b4634d9b284eafcbed73
-SIZE (cabal/MonadCatchIO-mtl-0.3.0.4.tar.gz) = 2965
+SHA256 (cabal/MonadCatchIO-mtl-0.3.0.5.tar.gz) = 1737a10a7ca6366640456c75f2b0c803db17433a314f2c5ea5c253455cec8205
+SIZE (cabal/MonadCatchIO-mtl-0.3.0.5.tar.gz) = 2985
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index b147d1307e44..6fb1fcc51e02 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-MonadCatchIO-transformers
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= MonadCatchIO-transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-transformers/pkg-descr b/devel/hs-MonadCatchIO-transformers/pkg-descr
index 52df4a1e625e..500453cc9c70 100644
--- a/devel/hs-MonadCatchIO-transformers/pkg-descr
+++ b/devel/hs-MonadCatchIO-transformers/pkg-descr
@@ -4,4 +4,4 @@ transformers (from the 'transformers' package) with IO as the base monad.
You can extend this functionality to other monads, by creating an instance
of the MonadCatchIO class.
-WWW: http://hackage.haskell.org/package/MonadCatchIO-transformers
+WWW: http://hackage.haskell.org/package/MonadCatchIO-transformers
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 25ecd431dc56..3614bfddb0b2 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-ObjectName
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index 3ba39b338213..9d16db03258a 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-PSQueue
-# Date created: September 20, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 58b00beda61a..201e94369c4f 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: hs-QuickCheck
-# Date created: July 09 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.5.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Library for random testing in haskell
+COMMENT= Automatic testing of Haskell programs
LICENSE= BSD
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 31badbe4db68..196dc8dcbf91 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/QuickCheck-2.4.2.tar.gz) = 6f05c399ae7b70c09ab21337caf1211f43fd76d6ad9b3814a4009ddbf438179f
-SIZE (cabal/QuickCheck-2.4.2.tar.gz) = 25373
+SHA256 (cabal/QuickCheck-2.5.1.1.tar.gz) = 98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9
+SIZE (cabal/QuickCheck-2.5.1.1.tar.gz) = 26156
diff --git a/devel/hs-QuickCheck/pkg-descr b/devel/hs-QuickCheck/pkg-descr
index 11dab0c4ae90..ad7ef2bf4979 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: http://code.haskell.org/QuickCheck
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
new file mode 100644
index 000000000000..9582f3d33f5a
--- /dev/null
+++ b/devel/hs-ReadArgs/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= ReadArgs
+PORTVERSION= 1.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple command line argument parsing
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13
+
+EXECUTABLE= ReadArgsEx
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
new file mode 100644
index 000000000000..dd9187fefd39
--- /dev/null
+++ b/devel/hs-ReadArgs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/ReadArgs-1.2.1.tar.gz) = dbae7a2b77bc4d2acb159e946d99cda5234e07020e295fe815ce8383ad792f25
+SIZE (cabal/ReadArgs-1.2.1.tar.gz) = 5102
diff --git a/devel/hs-ReadArgs/pkg-descr b/devel/hs-ReadArgs/pkg-descr
new file mode 100644
index 000000000000..50624b52181e
--- /dev/null
+++ b/devel/hs-ReadArgs/pkg-descr
@@ -0,0 +1,4 @@
+ReadArgs provides the `readArgs` IO action, which lets you tell the compiler
+to parse the command line arguments to fit the type signature you give.
+
+WWW: http://github.com/rampion/ReadArgs
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
new file mode 100644
index 000000000000..eeb85faca1c5
--- /dev/null
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= SafeSemaphore
+PORTVERSION= 0.9.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Much safer replacement for QSemN, QSem, and SampleVar
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= stm
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-SafeSemaphore/distinfo b/devel/hs-SafeSemaphore/distinfo
new file mode 100644
index 000000000000..028e1791bb6c
--- /dev/null
+++ b/devel/hs-SafeSemaphore/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/SafeSemaphore-0.9.0.tar.gz) = e43f805c567a6bcc155cd4ff2b528199e3b22ef9bacd724ccc95231e190343f5
+SIZE (cabal/SafeSemaphore-0.9.0.tar.gz) = 23817
diff --git a/devel/hs-SafeSemaphore/pkg-descr b/devel/hs-SafeSemaphore/pkg-descr
new file mode 100644
index 000000000000..00a2566a1cd5
--- /dev/null
+++ b/devel/hs-SafeSemaphore/pkg-descr
@@ -0,0 +1,5 @@
+This provides a much safer semaphore than the QSem, QSemN, SampleVar in
+base. Those base modules are not exception safe and can be broken by
+killThread.
+
+WWW: https://github.com/ChrisKuklewicz/SafeSemaphore
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 8edfed2b907d..8ece2c0eba28 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-StateVar
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= StateVar
PORTVERSION= 1.0.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 6aa4482f4852..a22358ca48c2 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: Stream
-# Date created: November 26, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= Stream
-PORTVERSION= 0.4.6
-PORTREVISION= 2
+PORTVERSION= 0.4.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 0ea2d39e6dec..c582f49c8ff2 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Stream-0.4.6.tar.gz) = eb735016e0ad4547240e80546a8cbae4b92863cbdfea068c68bd37545b63f25e
-SIZE (cabal/Stream-0.4.6.tar.gz) = 5875
+SHA256 (cabal/Stream-0.4.6.1.tar.gz) = 97d2820308caccbcc49f2345f3f00464dd3537702002be58c1596dd0b228e0a7
+SIZE (cabal/Stream-0.4.6.1.tar.gz) = 6126
diff --git a/devel/hs-Stream/pkg-descr b/devel/hs-Stream/pkg-descr
index 4418b830261e..237780ce1725 100644
--- a/devel/hs-Stream/pkg-descr
+++ b/devel/hs-Stream/pkg-descr
@@ -3,4 +3,4 @@ create and manipulate infinite lists: data Stream a = Cons a (Stream a).
It provides alternative definitions for those Prelude functions that make
sense on such streams.
-WWW: http://www.cs.nott.ac.uk/~wss/repos/Stream/dist/doc/html/
+WWW: http://hackage.haskell.org/package/Stream
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index 374928f792ed..4a855d29e789 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-Tensor
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= Tensor
PORTVERSION= 1.0.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 873aad1f62b8..dcb2cfc76fc6 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for: hs-TypeCompose
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= TypeCompose
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.9.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type composition classes and instances
LICENSE= BSD
+FILE_LICENSE= COPYING
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index 14ec5d99ac24..b80eafdf1aa2 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/TypeCompose-0.9.1.tar.gz) = 98237cc60f70a0585b78e674bbf579b4062da13e737441d0f940deaab9a48d21
-SIZE (cabal/TypeCompose-0.9.1.tar.gz) = 16482
+SHA256 (cabal/TypeCompose-0.9.7.tar.gz) = 442692548862da0036cd03987d38404c4486773e1ae2e62bd99397542c1b7cd7
+SIZE (cabal/TypeCompose-0.9.7.tar.gz) = 17688
diff --git a/devel/hs-TypeCompose/pkg-descr b/devel/hs-TypeCompose/pkg-descr
index 93fcb37ca152..559e43e2d20d 100644
--- a/devel/hs-TypeCompose/pkg-descr
+++ b/devel/hs-TypeCompose/pkg-descr
@@ -1,4 +1,4 @@
TypeCompose provides some classes and instances for forms of type composition, as
well as some modules who have not yet found a home.
-WWW: http://haskell.org/haskellwiki/TypeCompose
+WWW: https://github.com/conal/TypeCompose
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 511d546cc47a..851a0569edb6 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-abstract-deque
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= abstract-deque
-PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTVERSION= 0.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 2d5ae1ef0f46..72d5fe6c1a69 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/abstract-deque-0.1.5.tar.gz) = 7858975cb9598359746984cfd4c95b8aa8c823c2de0390f3e9569c3af04ce1fe
-SIZE (cabal/abstract-deque-0.1.5.tar.gz) = 7676
+SHA256 (cabal/abstract-deque-0.1.6.tar.gz) = ea079d582fb93a990cc7eeba235478a5158e9d40b713b8864512eb30f2ea488f
+SIZE (cabal/abstract-deque-0.1.6.tar.gz) = 10104
diff --git a/devel/hs-abstract-deque/pkg-descr b/devel/hs-abstract-deque/pkg-descr
index 68cb892d6c65..1dc39d78ec79 100644
--- a/devel/hs-abstract-deque/pkg-descr
+++ b/devel/hs-abstract-deque/pkg-descr
@@ -11,4 +11,4 @@ using the type-system to select an efficient implementation given the
requirements (using type families). This package also includes a simple
reference implementation based on 'IORef' and "Data.Sequence".
-WWW: http://hackage.haskell.org/package/abstract-deque
+WWW: http://hackage.haskell.org/package/abstract-deque
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index c2e797a3a996..8ea194073364 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-abstract-par
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= abstract-par
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/pkg-descr b/devel/hs-abstract-par/pkg-descr
index b1685653b46c..c527079f0d7d 100644
--- a/devel/hs-abstract-par/pkg-descr
+++ b/devel/hs-abstract-par/pkg-descr
@@ -7,4 +7,4 @@ is an interface module only. It provides a number of type clasess, but
not an implementation. The type classes separate different levels of Par
functionality.
-WWW: https://github.com/simonmar/monad-par
+WWW: https://github.com/simonmar/monad-par
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
new file mode 100644
index 000000000000..b533a8300fc5
--- /dev/null
+++ b/devel/hs-activehs-base/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= activehs-base
+PORTVERSION= 0.3.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Basic definitions for activehs
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= QuickCheck>=2.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-activehs-base/distinfo b/devel/hs-activehs-base/distinfo
new file mode 100644
index 000000000000..c10fe3b3e237
--- /dev/null
+++ b/devel/hs-activehs-base/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/activehs-base-0.3.0.2.tar.gz) = bb65782c7c29a745c435e7857b5f466017c622a57a604ef8ee645fad5cd75973
+SIZE (cabal/activehs-base-0.3.0.2.tar.gz) = 1873
diff --git a/devel/hs-activehs-base/pkg-descr b/devel/hs-activehs-base/pkg-descr
new file mode 100644
index 000000000000..2c2e6353e6ce
--- /dev/null
+++ b/devel/hs-activehs-base/pkg-descr
@@ -0,0 +1,5 @@
+This library consists of one module with a few definitions. It is kept small
+because this module has to be loaded in the interpreter many times during the
+runtime of the Active.hs server.
+
+WWW: http://hackage.haskell.org/package/activehs-base
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 51d7cafad385..1bd775a1e81c 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: alex
-# Date created: 29 January 2003
-# Whom: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-#
+# Created by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTVERSION= 3.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -24,9 +20,5 @@ EXECUTABLE= alex
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-.if defined(SLAVE)
-GHC_CMD= ghc
-.endif
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 6a390f64ac0d..9554dee09961 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/alex-3.0.1.tar.gz) = 727235cee46396537c2b53b4a0fae0ec25cffb9e982ce899816e92fcfe4cfaf0
-SIZE (cabal/alex-3.0.1.tar.gz) = 100057
+SHA256 (cabal/alex-3.0.2.tar.gz) = 997e33342c3c6e0edfff862f051fc286bd661f442d09d1bc02cd6e9d22083164
+SIZE (cabal/alex-3.0.2.tar.gz) = 100396
diff --git a/devel/hs-alex/pkg-descr b/devel/hs-alex/pkg-descr
index cf921e53c07b..4fd601fad81f 100644
--- a/devel/hs-alex/pkg-descr
+++ b/devel/hs-alex/pkg-descr
@@ -1,3 +1,3 @@
Alex is a tool for generating lexical analysers in Haskell.
-WWW: http://www.haskell.org/alex/
+WWW: http://www.haskell.org/alex/
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index eb9008c3a59e..13b6c91c467b 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-ansi-terminal
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= ansi-terminal
PORTVERSION= 0.5.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 89ae5be821da..cce7f6017e69 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-ansi-wl-pprint
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/pkg-descr b/devel/hs-ansi-wl-pprint/pkg-descr
index ce61a83c3d80..d50b3ea2a6f1 100644
--- a/devel/hs-ansi-wl-pprint/pkg-descr
+++ b/devel/hs-ansi-wl-pprint/pkg-descr
@@ -2,4 +2,4 @@ This is a pretty printing library based on Wadler's paper "A Prettier
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
+WWW: http://github.com/batterseapower/ansi-wl-pprint
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 8858143a9840..37bfa4fe6cc3 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-arrows
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= arrows
-PORTVERSION= 0.4.4.0
-PORTREVISION= 4
+PORTVERSION= 0.4.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index 00a77563a982..84946a03c6fa 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/arrows-0.4.4.0.tar.gz) = 4999ba909061f5bede09e6116e2cac1cf89f04d3429a4a2be6ef79a677d89bb5
-SIZE (cabal/arrows-0.4.4.0.tar.gz) = 12393
+SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2
+SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index c7e94930c227..4916f3667f7d 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -1,24 +1,17 @@
-# New ports collection makefile for: hs-asn1-data
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= asn1-data
-PORTVERSION= 0.6.1.3
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= ASN1 data reader and writer in RAW, BER, DER, and CER forms
+COMMENT= ASN1 data reader and writer in RAW, BER, and DER forms
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= attoparsec>=0.8 attoparsec-enumerator>=0.2 enumerator>=0.4.5 \
- mtl text>=0.11
+USE_CABAL= cereal mtl text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-data/distinfo b/devel/hs-asn1-data/distinfo
index 2aaf1f0b8fdb..e9b1c130d835 100644
--- a/devel/hs-asn1-data/distinfo
+++ b/devel/hs-asn1-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-data-0.6.1.3.tar.gz) = 98bface77db252d737c601b5116d2c390b6783b2e25cafd0daa9667c5b299e6e
-SIZE (cabal/asn1-data-0.6.1.3.tar.gz) = 16226
+SHA256 (cabal/asn1-data-0.7.1.tar.gz) = f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783
+SIZE (cabal/asn1-data-0.7.1.tar.gz) = 17500
diff --git a/devel/hs-asn1-data/pkg-descr b/devel/hs-asn1-data/pkg-descr
index be5cd8747c58..886bc477e211 100644
--- a/devel/hs-asn1-data/pkg-descr
+++ b/devel/hs-asn1-data/pkg-descr
@@ -1,4 +1,4 @@
ASN1 data reader and writer in raw form with supports for high level forms
-of ASN1 (BER, CER and DER). All interfaces use the enumerator interface.
+of ASN1 (BER, and DER).
-WWW: http://github.com/vincenthz/hs-asn1-data
+WWW: http://github.com/vincenthz/hs-asn1-data
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
new file mode 100644
index 000000000000..c041e1cd8f31
--- /dev/null
+++ b/devel/hs-async/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= async
+PORTVERSION= 2.0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Run IO operations asynchronously and wait for their results
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= stm>=2.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
new file mode 100644
index 000000000000..9bb0a7b2a41a
--- /dev/null
+++ b/devel/hs-async/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/async-2.0.1.3.tar.gz) = 70d681084aca826c84d722320fc5d67ac6294802afbb13f8b5e8eac2bbc972e5
+SIZE (cabal/async-2.0.1.3.tar.gz) = 8345
diff --git a/devel/hs-async/pkg-descr b/devel/hs-async/pkg-descr
new file mode 100644
index 000000000000..c66d6cc6af2b
--- /dev/null
+++ b/devel/hs-async/pkg-descr
@@ -0,0 +1,15 @@
+This package provides a higher-level interface over threads, in which an
+Async a is a concurrent thread that will eventually deliver a value of
+type a. The package provides ways to create Async computations, wait for
+their results, and cancel them.
+
+Using Async is safer than using threads in two ways:
+
+ - When waiting for a thread to return a result, if the thread dies with
+ an exception then the caller must either re-throw the exception (wait)
+ or handle it (waitCatch); the exception cannot be ignored.
+
+ - The API makes it possible to build a tree of threads that are
+ automatically killed when their parent dies (see withAsync).
+
+WWW: https://github.com/simonmar/async
diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile
index 71f2e261b4a6..46e59d14da3c 100644
--- a/devel/hs-attempt/Makefile
+++ b/devel/hs-attempt/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-attempt
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attempt
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-attempt/pkg-descr b/devel/hs-attempt/pkg-descr
index d4bb59a77144..467cac2fd275 100644
--- a/devel/hs-attempt/pkg-descr
+++ b/devel/hs-attempt/pkg-descr
@@ -1,4 +1,4 @@
Defines a data type, Attempt, which has a Success and Failure
constructor. Failure contains an extensible exception.
-WWW: http://github.com/snoyberg/attempt/tree/master
+WWW: http://github.com/snoyberg/attempt/tree/master
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 5e395dc8f7d5..c6771df4e52f 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-base-unicode-symbols
-# Date created: September 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= base-unicode-symbols
-PORTVERSION= 0.2.2.3
-PORTREVISION= 2
+PORTVERSION= 0.2.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/distinfo b/devel/hs-base-unicode-symbols/distinfo
index e98d4e42b8a5..2b45526e5bfa 100644
--- a/devel/hs-base-unicode-symbols/distinfo
+++ b/devel/hs-base-unicode-symbols/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/base-unicode-symbols-0.2.2.3.tar.gz) = 1201fcc936cf4328153d9ac7e20f797d904ac14ed6493689ddb1cfe61bb30320
-SIZE (cabal/base-unicode-symbols-0.2.2.3.tar.gz) = 5549
+SHA256 (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9
+SIZE (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = 5562
diff --git a/devel/hs-base-unicode-symbols/pkg-descr b/devel/hs-base-unicode-symbols/pkg-descr
index 4a623dbba5f6..c243bbb7a00e 100644
--- a/devel/hs-base-unicode-symbols/pkg-descr
+++ b/devel/hs-base-unicode-symbols/pkg-descr
@@ -7,4 +7,4 @@ For further Unicode goodness you can enable the UnicodeSyntax language
extension. This extension enables Unicode characters to be used to
stand for certain ASCII character sequences.
-WWW: http://haskell.org/haskellwiki/Unicode-symbols
+WWW: http://haskell.org/haskellwiki/Unicode-symbols
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 02b477711c22..cd4f0766c3d1 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-base16-bytestring
-# Date created: May 25, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/pkg-descr b/devel/hs-base16-bytestring/pkg-descr
index 1154d6f8954a..5b1a9caa770f 100644
--- a/devel/hs-base16-bytestring/pkg-descr
+++ b/devel/hs-base16-bytestring/pkg-descr
@@ -1,4 +1,4 @@
This package provides a Haskell library for working with base16-encoded
data quickly and efficiently, using the ByteString type.
-WWW: https://github.com/mailrank/base16-bytestring
+WWW: https://github.com/mailrank/base16-bytestring
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index e27a763540c8..c2be52eca291 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-base64-bytestring
-# Date created: August 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= base64-bytestring
-PORTVERSION= 0.1.2.0
+PORTVERSION= 1.0.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/distinfo b/devel/hs-base64-bytestring/distinfo
index 131511a62dab..b115cf08b7ab 100644
--- a/devel/hs-base64-bytestring/distinfo
+++ b/devel/hs-base64-bytestring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/base64-bytestring-0.1.2.0.tar.gz) = 3fec19ebd268308d7d5986933b6fa821a6d5a957f71840bf2018fdb1b452360d
-SIZE (cabal/base64-bytestring-0.1.2.0.tar.gz) = 7247
+SHA256 (cabal/base64-bytestring-1.0.0.0.tar.gz) = 759fbb0f8f3ff26c4ad3e71fbcccfd472bc1a4eefe4b5508ce78a8793305197c
+SIZE (cabal/base64-bytestring-1.0.0.0.tar.gz) = 8861
diff --git a/devel/hs-base64-bytestring/pkg-descr b/devel/hs-base64-bytestring/pkg-descr
index f03e6d9d197c..72d352828439 100644
--- a/devel/hs-base64-bytestring/pkg-descr
+++ b/devel/hs-base64-bytestring/pkg-descr
@@ -1,3 +1,3 @@
Fast base64 encoding and decoding for ByteStrings.
-WWW: https://github.com/bos/base64-bytestring
+WWW: https://github.com/bos/base64-bytestring
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
new file mode 100644
index 000000000000..1d9bad623d6b
--- /dev/null
+++ b/devel/hs-basic-prelude/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= basic-prelude
+PORTVERSION= 0.3.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= An enhanced core prelude; a common foundation for alternate preludes
+
+LICENSE= MIT
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= hashable ReadArgs>=1.2 system-filepath>=0.4 text \
+ transformers 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
new file mode 100644
index 000000000000..12388ca7c8b0
--- /dev/null
+++ b/devel/hs-basic-prelude/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/basic-prelude-0.3.1.0.tar.gz) = 40966f69cb6ec71aeb03b81b6543e6b46a78c242d6edcccd500fca8fce4f6896
+SIZE (cabal/basic-prelude-0.3.1.0.tar.gz) = 4324
diff --git a/devel/hs-basic-prelude/pkg-descr b/devel/hs-basic-prelude/pkg-descr
new file mode 100644
index 000000000000..b1dccdbb99d9
--- /dev/null
+++ b/devel/hs-basic-prelude/pkg-descr
@@ -0,0 +1,17 @@
+The premise of basic-prelude is that there are a lot of very commonly
+desired features missing from the standard Prelude, such as commonly
+used operators (<$> and >=>, for instance) and imports for common
+datatypes (e.g., ByteString and Vector). At the same time, there are
+lots of other components which are more debatable, such as providing
+polymorphic versions of common functions.
+
+So basic-prelude is intended to give a common foundation for a number of
+alternate preludes. The package provides two modules: CorePrelude
+provides the common ground for other preludes to build on top of, while
+BasicPrelude exports CorePrelude together with commonly used list
+functions to provide a drop-in replacement for the standard Prelude.
+
+Users wishing to have an improved Prelude can use BasicPrelude.
+Developers wishing to create a new prelude should use CorePrelude.
+
+WWW: https://github.com/snoyberg/basic-prelude
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 692183457bea..7f49ae90280a 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-bits-atomic
-# Date created: May 12, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/pkg-descr b/devel/hs-bits-atomic/pkg-descr
index 59ff9d08254a..15cee6a17311 100644
--- a/devel/hs-bits-atomic/pkg-descr
+++ b/devel/hs-bits-atomic/pkg-descr
@@ -3,4 +3,4 @@ suitable for low-level shared-memory synchronization. The implementation
is using GCC's builtin atomic operations (available in GCC >= 4) in C
wrappers called through the FFI.
-WWW: http://hackage.haskell.org/package/bits-atomic
+WWW: http://hackage.haskell.org/package/bits-atomic
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
index 220beb9f5179..165e0a3259e3 100644
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ b/devel/hs-blaze-builder-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-blaze-builder-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-builder-conduit
-PORTVERSION= 0.4.0.2
-PORTREVISION= 1
+PORTVERSION= 0.5.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Convert streams of builders to streams of bytestrings
LICENSE= BSD
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.4 text>=0.11 \
+USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 text>=0.11 \
transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-blaze-builder-conduit/distinfo b/devel/hs-blaze-builder-conduit/distinfo
index 587729ee5d95..ed3dc00516b4 100644
--- a/devel/hs-blaze-builder-conduit/distinfo
+++ b/devel/hs-blaze-builder-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-conduit-0.4.0.2.tar.gz) = 30cafc16966cf1aca475dc6951910e229ef2e6a8b51b13832d479c1de09e7471
-SIZE (cabal/blaze-builder-conduit-0.4.0.2.tar.gz) = 3899
+SHA256 (cabal/blaze-builder-conduit-0.5.0.3.tar.gz) = dc72abd4df279580d995e58c472b34a45f8f2336ba445529dc0bbc9f04ac7e35
+SIZE (cabal/blaze-builder-conduit-0.5.0.3.tar.gz) = 3991
diff --git a/devel/hs-blaze-builder-conduit/pkg-descr b/devel/hs-blaze-builder-conduit/pkg-descr
index ee2d4c36193b..5e0eeea772d5 100644
--- a/devel/hs-blaze-builder-conduit/pkg-descr
+++ b/devel/hs-blaze-builder-conduit/pkg-descr
@@ -1,3 +1,3 @@
Convert streams of builders to streams of bytestrings.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 39b5aac94b35..b1404ea9521e 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-blaze-builder-enumerator
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-builder-enumerator
-PORTVERSION= 0.2.0.4
-PORTREVISION= 1
+PORTVERSION= 0.2.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/distinfo b/devel/hs-blaze-builder-enumerator/distinfo
index 4fde8fabdb2a..4e019aa35ea4 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.4.tar.gz) = 09cf9c3302d96d24f529cc5cc7fe253fd06f10dd52994162b9c5572d194c97ff
-SIZE (cabal/blaze-builder-enumerator-0.2.0.4.tar.gz) = 3758
+SHA256 (cabal/blaze-builder-enumerator-0.2.0.5.tar.gz) = 4a39e72f7675f6e3d75e29477e6d66d73cf8fb6f5f5701dad03af1cf79da6b2d
+SIZE (cabal/blaze-builder-enumerator-0.2.0.5.tar.gz) = 3780
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 39b9a308c9a8..b184c340d118 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-blaze-builder
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-builder
PORTVERSION= 0.3.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/pkg-descr b/devel/hs-blaze-builder/pkg-descr
index e8b5ee469c8c..b0596e949b82 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/meiersi/blaze-builder
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index bcd5a7aada0c..0889bd8d422f 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-blaze-textual
-# Date created: May 25, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-textual
-PORTVERSION= 0.2.0.6
-PORTREVISION= 2
+PORTVERSION= 0.2.0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for efficiently rendering Haskell datatypes to bytestrings
+COMMENT= Fast rendering of common datatypes
LICENSE= BSD
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index d4014240af2b..85622c60a597 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-textual-0.2.0.6.tar.gz) = 671c92d82009e917fa7c8294f8672bdd5b881fd8c5cab6926ed1bcf893742999
-SIZE (cabal/blaze-textual-0.2.0.6.tar.gz) = 6849
+SHA256 (cabal/blaze-textual-0.2.0.8.tar.gz) = 873d463efb6bb99260275cb6fdb12f3e3fa4238ae3d2878ad6e87fee4781f87f
+SIZE (cabal/blaze-textual-0.2.0.8.tar.gz) = 6842
diff --git a/devel/hs-blaze-textual/pkg-descr b/devel/hs-blaze-textual/pkg-descr
index 3ffb6ce4e35a..ddc16604b7dc 100644
--- a/devel/hs-blaze-textual/pkg-descr
+++ b/devel/hs-blaze-textual/pkg-descr
@@ -1,4 +1,3 @@
-blaze-textual is a fast Haskell library for rendering common
-Haskell datatypes in text form using the blaze-builder library.
+A library for efficiently rendering Haskell datatypes to bytestrings.
-WWW: http://github.com/mailrank/blaze-textual
+WWW: http://github.com/bos/blaze-textual
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 2305d7740003..a98200aa7647 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-bloomfilter
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= bloomfilter
PORTVERSION= 1.2.6.10
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/pkg-descr b/devel/hs-bloomfilter/pkg-descr
index e5dff1cddec8..20d374f98d7a 100644
--- a/devel/hs-bloomfilter/pkg-descr
+++ b/devel/hs-bloomfilter/pkg-descr
@@ -1,3 +1,3 @@
Pure and impure Bloom Filter implementations.
-WWW: http://www.serpentine.com/software/bloomfilter
+WWW: http://www.serpentine.com/software/bloomfilter
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 8dbe691cbb14..6924e402e07c 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-bsd-sysctl
-# Date created: 04 May 2010
-# Whom: Ju Pengfei <jupengfei@gmail.com>
-#
+# Created by: Ju Pengfei <jupengfei@gmail.com>
# $FreeBSD$
-#
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/pkg-descr b/devel/hs-bsd-sysctl/pkg-descr
index d0a72c768e3b..168b33fcd9e7 100644
--- a/devel/hs-bsd-sysctl/pkg-descr
+++ b/devel/hs-bsd-sysctl/pkg-descr
@@ -3,4 +3,4 @@ the Haskell FFI. It allows to read and write both basic sysctl types, as
well as complex opaque types (typically C structures) described via Storable
instances.
-WWW: http://hackage.haskell.org/package/bsd-sysctl
+WWW: http://hackage.haskell.org/package/bsd-sysctl
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index feaece83b392..b17c6b6b29d8 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-byteorder
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= byteorder
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/pkg-descr b/devel/hs-byteorder/pkg-descr
index cb5b066f8798..61281c6ba93c 100644
--- a/devel/hs-byteorder/pkg-descr
+++ b/devel/hs-byteorder/pkg-descr
@@ -1,3 +1,3 @@
This package is for working with native byte-ordering of the system.
-WWW: http://community.haskell.org/~aslatter/code/byteorder
+WWW: http://community.haskell.org/~aslatter/code/byteorder
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index ac8244b7e11d..b93dc1c6e052 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-bytestring-nums
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= bytestring-nums
-PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTVERSION= 0.3.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/distinfo b/devel/hs-bytestring-nums/distinfo
index 37c73baaad5d..a1d9cc088072 100644
--- a/devel/hs-bytestring-nums/distinfo
+++ b/devel/hs-bytestring-nums/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bytestring-nums-0.3.5.tar.gz) = b36593c367907aa151a24d0c10310a33a0cb06ded7f385d43f8a87bcb35f768a
-SIZE (cabal/bytestring-nums-0.3.5.tar.gz) = 3704
+SHA256 (cabal/bytestring-nums-0.3.6.tar.gz) = bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd
+SIZE (cabal/bytestring-nums-0.3.6.tar.gz) = 3770
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 40f914b91904..ce63c1126f65 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for: c2hs
-# Date created: 23 August 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= c2hs
-PORTVERSION= 0.16.3
-PORTREVISION= 3
+PORTVERSION= 0.16.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= C->Haskell, an Interface Generator for Haskell
+COMMENT= C->Haskell tool that gives some cross-language type safety
LICENSE= GPLv2
FILE_LICENSE= COPYING
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index b577dc607a95..cf3ccb826975 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/c2hs-0.16.3.tar.gz) = a562be4f9c2d2a2c55bc61233f86e129aff1ec6ac588b9eb904e17379beb1ae3
-SIZE (cabal/c2hs-0.16.3.tar.gz) = 137409
+SHA256 (cabal/c2hs-0.16.4.tar.gz) = f1b15c18de884273eeab4400097a6fad8373849835e2a943d4583d9602fb1555
+SIZE (cabal/c2hs-0.16.4.tar.gz) = 138114
diff --git a/devel/hs-c2hs/pkg-descr b/devel/hs-c2hs/pkg-descr
index ccded44a2df6..9853bcb2643d 100644
--- a/devel/hs-c2hs/pkg-descr
+++ b/devel/hs-c2hs/pkg-descr
@@ -1,10 +1,7 @@
-C->Haskell is an interface generator that simplifies the development of Haskell
-bindings to C libraries. The tool processes existing C header files that
-determine data layout and function signatures on the C side in conjunction with
-Haskell modules that specify Haskell-side type signatures and marshaling
-details. Hooks embedded in the Haskell code signal access to C structures and
-functions -- they are expanded by the interfacing tool in dependence on
-information from the corresponding C header file. Another noteworthy property
-is the lightweight nature of the approach.
+C->Haskell assists in the development of Haskell bindings to C libraries.
+It extracts interface information from C header files and generates Haskell
+code with foreign imports and marshaling. Unlike writing foreign imports
+by hand (or using hsch2s), this ensures that C functions are imported with
+the correct Haskell types.
WWW: http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index bff7afcbd183..5985f4713173 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-cabal-install
-# Date created: 2010-08-17
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cabal-install
PORTVERSION= 0.14.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -20,7 +15,15 @@ CABAL_SETUP= Setup.hs
USE_CABAL= network>=1 random>=1 HTTP>=4000.0.2 zlib>=0.4
STANDALONE= yes
-EXECUTABLE= cabal
+EXECUTABLE= cabal-install
+
+# Some magic to make `cabal` work with a custom toolchain
+SUB_FILES= cabal
+SUB_LIST= AR=${AR} CC=${CC} CPP=${CPP} LD=${CC} RANLIB=${RANLIB}
+
+post-install::
+ @${MV} ${PREFIX}/bin/cabal ${PREFIX}/bin/cabal-install
+ ${INSTALL_SCRIPT} ${WRKDIR}/cabal ${PREFIX}/bin
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cabal-install/files/cabal.in b/devel/hs-cabal-install/files/cabal.in
new file mode 100644
index 000000000000..206cf42c79de
--- /dev/null
+++ b/devel/hs-cabal-install/files/cabal.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+export CC=%%CC%%
+export CPP=%%CPP%%
+export LD=%%LD%%
+export AR=%%AR%%
+export RANLIB=%%RANLIB%%
+
+%%PREFIX%%/bin/cabal-install $*
diff --git a/devel/hs-cabal-install/files/patch-Main.hs b/devel/hs-cabal-install/files/patch-Main.hs
new file mode 100644
index 000000000000..fa1da85aaf3e
--- /dev/null
+++ b/devel/hs-cabal-install/files/patch-Main.hs
@@ -0,0 +1,24 @@
+--- ./Main.hs.orig 2012-04-17 17:17:31.000000000 +0200
++++ ./Main.hs 2012-11-23 20:47:29.000000000 +0100
+@@ -75,7 +75,7 @@
+ ( Verbosity, normal, intToVerbosity, lessVerbose )
+ import qualified Paths_cabal_install (version)
+
+-import System.Environment (getArgs, getProgName)
++import System.Environment (getArgs)
+ import System.Exit (exitFailure)
+ import System.FilePath (splitExtension, takeExtension)
+ import System.Directory (doesFileExist)
+@@ -107,10 +107,10 @@
+
+ where
+ printCommandHelp help = do
+- pname <- getProgName
++ let pname = "cabal"
+ putStr (help pname)
+ printGlobalHelp help = do
+- pname <- getProgName
++ let pname = "cabal"
+ configFile <- defaultConfigFile
+ putStr (help pname)
+ putStr $ "\nYou can edit the cabal configuration file to set defaults:\n"
diff --git a/devel/hs-cabal-install/pkg-descr b/devel/hs-cabal-install/pkg-descr
index 9ff898a5d4dd..3e70a87ca157 100644
--- a/devel/hs-cabal-install/pkg-descr
+++ b/devel/hs-cabal-install/pkg-descr
@@ -2,4 +2,4 @@ The 'cabal' command-line program simplifies the process of managing
Haskell software by automating the fetching, configuration, compilation
and installation of Haskell libraries and programs.
-WWW: http://www.haskell.org/cabal/
+WWW: http://www.haskell.org/cabal/
diff --git a/devel/hs-cabal-install/pkg-plist b/devel/hs-cabal-install/pkg-plist
new file mode 100644
index 000000000000..9af81222a386
--- /dev/null
+++ b/devel/hs-cabal-install/pkg-plist
@@ -0,0 +1,2 @@
+@comment $FreeBSD$
+bin/cabal
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 865bdc4da823..20120218320a 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-cereal
-# Date created: 2010-08-17
-# Whom: Ashish SHUKLA <ashish@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= cereal
PORTVERSION= 0.3.5.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/pkg-descr b/devel/hs-cereal/pkg-descr
index 5a885777e7b9..9f81e45ddf2b 100644
--- a/devel/hs-cereal/pkg-descr
+++ b/devel/hs-cereal/pkg-descr
@@ -4,4 +4,4 @@ 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.
-WWW: http://hackage.haskell.org/package/cereal
+WWW: http://hackage.haskell.org/package/cereal
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 4513bd7edd28..47db4912bf72 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-checkers
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= checkers
PORTVERSION= 0.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/pkg-descr b/devel/hs-checkers/pkg-descr
index 0b8f5b052f4c..acb8063a8f0f 100644
--- a/devel/hs-checkers/pkg-descr
+++ b/devel/hs-checkers/pkg-descr
@@ -3,4 +3,4 @@ standard Haskell type classes as QuickCheck properties. Also some
morphism properties. It also provides arbitrary instances and
generator combinators for common data types.
-WWW: http://haskell.org/haskellwiki/checkers
+WWW: http://haskell.org/haskellwiki/checkers
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
new file mode 100644
index 000000000000..fa0d206d65b1
--- /dev/null
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= classy-prelude-conduit
+PORTVERSION= 0.4.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Conduit instances for classy-prelude
+
+LICENSE= MIT
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= classy-prelude>=0.4.1 conduit>=0.5.4.1 xml-conduit>=1.0
+
+.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
new file mode 100644
index 000000000000..a39666a8e933
--- /dev/null
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/classy-prelude-conduit-0.4.1.tar.gz) = e8616c45c64c3e122aef41631d6eb2b61e2e89e92900af5cec0f7a6b3bc89152
+SIZE (cabal/classy-prelude-conduit-0.4.1.tar.gz) = 1966
diff --git a/devel/hs-classy-prelude-conduit/pkg-descr b/devel/hs-classy-prelude-conduit/pkg-descr
new file mode 100644
index 000000000000..5aa260406365
--- /dev/null
+++ b/devel/hs-classy-prelude-conduit/pkg-descr
@@ -0,0 +1,3 @@
+Conduit instances for classy-prelude.
+
+WWW: https://github.com/snoyberg/classy-prelude
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
new file mode 100644
index 000000000000..0b24579c93af
--- /dev/null
+++ b/devel/hs-classy-prelude/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= classy-prelude
+PORTVERSION= 0.4.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A typeclass-based Prelude
+
+LICENSE= MIT
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= basic-prelude>=0.3 hashable system-filepath>=0.4 text \
+ transformers unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
new file mode 100644
index 000000000000..5a06f6d831bb
--- /dev/null
+++ b/devel/hs-classy-prelude/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/classy-prelude-0.4.1.tar.gz) = c1ad044194e48795eb9b2846ddc3bdb987695bd5872dc21b8b0b23ad73c44193
+SIZE (cabal/classy-prelude-0.4.1.tar.gz) = 9437
diff --git a/devel/hs-classy-prelude/pkg-descr b/devel/hs-classy-prelude/pkg-descr
new file mode 100644
index 000000000000..208d6f12f8ec
--- /dev/null
+++ b/devel/hs-classy-prelude/pkg-descr
@@ -0,0 +1,6 @@
+Focuses on using common typeclasses when possible, and creating new ones
+to avoid name clashing. Exposes many recommended datastructures (Map,
+ByteString, etc) directly without requiring long import lists and qualified
+modules.
+
+WWW: https://github.com/snoyberg/classy-prelude
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index a49d94241bf1..595a64778c97 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cmdargs
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cmdargs
-PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -19,7 +13,5 @@ CABAL_SETUP= Setup.hs
USE_CABAL= transformers>=0.2
-EXECUTABLE= cmdargs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index 1e7c65bdb21e..c8e84dee8c5c 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.9.5.tar.gz) = 3b8e9b7469070dd5893f9a7ba51d6fc460b5667e04174a534ba2150cb9b60a46
-SIZE (cabal/cmdargs-0.9.5.tar.gz) = 59775
+SHA256 (cabal/cmdargs-0.10.1.tar.gz) = e83b1be217a337fd3b445373eef0acc2c6933877fb8c70ff5dc16a550cfcee5c
+SIZE (cabal/cmdargs-0.10.1.tar.gz) = 60350
diff --git a/devel/hs-cmdargs/pkg-descr b/devel/hs-cmdargs/pkg-descr
index 3b179329252c..d951fd63a60a 100644
--- a/devel/hs-cmdargs/pkg-descr
+++ b/devel/hs-cmdargs/pkg-descr
@@ -2,4 +2,16 @@ This library provides an easy way to define command line parsers. Most users
will want to use the "System.Console.CmdArgs.Implicit" module, whose
documentation contains an example.
-WWW: http://community.haskell.org/~ndm/cmdargs/
+ * System.Console.CmdArgs.Explicit provides a way to write command line
+ parsers for both single mode programs (most programs) and multiple mode
+ programs (e.g. darcs or cabal). Parsers are defined by constructing a
+ data structure.
+
+ * System.Console.CmdArgs.Implicit provides a way to concisely define
+ command line parsers, up to three times shorter than getopt. These
+ parsers are translated into the Explicit data type.
+
+ * System.Console.CmdArgs.GetOpt provides a wrapper allowing compatiblity
+ with existing getopt parsers, mapping to the Explicit data type.
+
+WWW: http://community.haskell.org/~ndm/cmdargs/
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index c0546e68e2de..7eaa0cfb60f9 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= conduit
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index 2e6eaa55fe42..d181c37fb1e0 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-0.4.2.tar.gz) = e073ccf93847345dd8177de7aacb43a02bb331816be1dfd208abfb871e401aed
-SIZE (cabal/conduit-0.4.2.tar.gz) = 25409
+SHA256 (cabal/conduit-0.5.5.tar.gz) = 388a4e5343165f78516e02055bbdd9e95fcb1d17a37870f4d2d565ddd513612b
+SIZE (cabal/conduit-0.5.5.tar.gz) = 34781
diff --git a/devel/hs-conduit/pkg-descr b/devel/hs-conduit/pkg-descr
index 13047bf0cad1..5a7542b270d9 100644
--- a/devel/hs-conduit/pkg-descr
+++ b/devel/hs-conduit/pkg-descr
@@ -1,6 +1,7 @@
-Conduits are an approach to the streaming data problem. It is meant as
-an alternative to enumerators/iterators, hoping to address the same
-issues with different trade-offs based on real-world experience with
-enumerators.
+conduit is a solution to the streaming data problem, allowing for
+production, transformation, and consumption of streams of data in
+constant memory. It is an alternative to lazy I/O which guarantees
+deterministic resource handling, and fits in the same general solution
+space as enumerator/iteratee and pipes.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index a409408b2704..b840aee6981c 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-configurator
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= configurator
-PORTVERSION= 0.2.0.0
-PORTREVISION= 2
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index f29e855631fa..baee181bcf5d 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/configurator-0.2.0.0.tar.gz) = 8a0e20e93d8dca612b744a838ad0b5de05d1ba2d51fb7262aa5a60e7e3af6c7e
-SIZE (cabal/configurator-0.2.0.0.tar.gz) = 14193
+SHA256 (cabal/configurator-0.2.0.1.tar.gz) = d7f8bea4e67843454ca66685c950eb0483eccf4345998fdf1cecce2e7071860b
+SIZE (cabal/configurator-0.2.0.1.tar.gz) = 14221
diff --git a/devel/hs-configurator/pkg-descr b/devel/hs-configurator/pkg-descr
index f186a40516a3..180ea8e233f8 100644
--- a/devel/hs-configurator/pkg-descr
+++ b/devel/hs-configurator/pkg-descr
@@ -16,4 +16,4 @@ Features include:
to be split across several smaller files, or common configuration data
to be shared across several applications.
-WWW: http://github.com/mailrank/configurator
+WWW: http://github.com/bos/configurator
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 7e4727c54ecb..0c87c9ea8875 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-convertible
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= convertible
PORTVERSION= 1.0.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-convertible/pkg-descr b/devel/hs-convertible/pkg-descr
index 2487378105fe..cf89aba1b1fb 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/cgi-bin/hackage-scripts/package/convertible
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index c343710ea4ee..b2607ed2fac8 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: cpphs
-# Date created: 14 June 2004
-# Whom: obraun@FreeBSD.org
-#
+# Created by: obraun@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= cpphs
-PORTVERSION= 1.14
+PORTVERSION= 1.15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 1386dbb247c2..82f4c6d409c9 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpphs-1.14.tar.gz) = 1fcccb0c9e7acd832cb2eea61286d8ab4a213caabc9bd12930deaec5a87f4cd3
-SIZE (cabal/cpphs-1.14.tar.gz) = 43104
+SHA256 (cabal/cpphs-1.15.tar.gz) = 868c68cda54601db1f0ea4bee72fe1b3c8580fd7c8e1bc03becdfb887f7254dc
+SIZE (cabal/cpphs-1.15.tar.gz) = 71444
diff --git a/devel/hs-cpphs/pkg-descr b/devel/hs-cpphs/pkg-descr
index a12fd527a1a6..b596c1d60cfd 100644
--- a/devel/hs-cpphs/pkg-descr
+++ b/devel/hs-cpphs/pkg-descr
@@ -5,4 +5,4 @@ pretty-much feature-complete and compatible with traditional (K&R)
pre-processors. Additional features include: a plain-text mode; an option
to unlit literate code files; and an option to turn off macro-expansion.
-WWW: http://haskell.org/cpphs/
+WWW: http://haskell.org/cpphs/
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 9be8f55e133b..6b32106a71f1 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: darcs
-# Date created: 13 April 2003
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= darcs
-PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTVERSION= 2.8.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,8 +11,8 @@ COMMENT= A distributed, interactive, smart revision control system
LICENSE= GPLv2
FILE_LICENSE= COPYING
-USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html>=1.0 \
- mtl>=1.0 parsec>=2.0 random>=1.0 regex-compat>=0.95.1 \
+USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html \
+ mtl>=1.0 parsec>=2.0 random regex-compat>=0.95.1 \
regex-posix>=0.95.1 tar>=0.4 text>=0.11.0.6 unix-compat>=0.1.2 \
vector>=0.7 zlib>=0.5.1.0
@@ -38,7 +33,7 @@ THREADED_DESC= Use threading and SMP support
COLOR_DESC= Use ANSI color escapes
MMAP_DESC= Compile with mmap support
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
CONFIGURE_ARGS+= --flags="library executable"
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 60534904d5fb..0e7662e0cca2 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.1.tar.gz) = a1e5ad3146b6f738ba162623f27fb70498e682c2b1142f38f80e2c187f9ae9bb
-SIZE (cabal/darcs-2.8.1.tar.gz) = 1293098
+SHA256 (cabal/darcs-2.8.3.tar.gz) = 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59
+SIZE (cabal/darcs-2.8.3.tar.gz) = 1289187
diff --git a/devel/hs-darcs/pkg-descr b/devel/hs-darcs/pkg-descr
index e9dd4d017cc7..8c40f8939085 100644
--- a/devel/hs-darcs/pkg-descr
+++ b/devel/hs-darcs/pkg-descr
@@ -16,4 +16,4 @@ This smartness lets you respond to changing demands in ways that would
otherwise not be possible. Learn more about spontaneous branches with
darcs.
-WWW: http://darcs.net/
+WWW: http://darcs.net/
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index d3d6d034e72d..ae288aab4194 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-data-default
-# Date created: 2011-03-07
-# Whom: Ashish SHUKLA <ashish@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= data-default
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A class for types with a default value for Haskell
+COMMENT= A class for types with a default value
LICENSE= BSD
diff --git a/devel/hs-data-default/distinfo b/devel/hs-data-default/distinfo
index b4dbdf587dde..71aaf0d346b8 100644
--- a/devel/hs-data-default/distinfo
+++ b/devel/hs-data-default/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-default-0.4.0.tar.gz) = 02a03ade573ef1db019c8848759ae331b7cbef1230c91ef817f483b97a4334de
-SIZE (cabal/data-default-0.4.0.tar.gz) = 1985
+SHA256 (cabal/data-default-0.5.0.tar.gz) = 4ad884231906e064b9c74f511b542d7ee5032fbe055e95023c1a10999ae468f3
+SIZE (cabal/data-default-0.5.0.tar.gz) = 2005
diff --git a/devel/hs-data-default/pkg-descr b/devel/hs-data-default/pkg-descr
index f596d3830a40..ab88ac6310f0 100644
--- a/devel/hs-data-default/pkg-descr
+++ b/devel/hs-data-default/pkg-descr
@@ -1,3 +1,3 @@
A class for types with a default value.
-WWW: http://hackage.haskell.org/package/data-default
+WWW: http://hackage.haskell.org/package/data-default
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
new file mode 100644
index 000000000000..976a60d5b80d
--- /dev/null
+++ b/devel/hs-data-pprint/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= data-pprint
+PORTVERSION= 0.2.1.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Prettyprint and compare Data values
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= mtl>=2.0 parallel>=3.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
new file mode 100644
index 000000000000..e73b5a4608c8
--- /dev/null
+++ b/devel/hs-data-pprint/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-pprint-0.2.1.4.tar.gz) = c8c180c525744bec6987e43de79ed12d5590a436d09b0f7d008ce0c0cdda7f16
+SIZE (cabal/data-pprint-0.2.1.4.tar.gz) = 9952
diff --git a/devel/hs-data-pprint/pkg-descr b/devel/hs-data-pprint/pkg-descr
new file mode 100644
index 000000000000..706b14a2089d
--- /dev/null
+++ b/devel/hs-data-pprint/pkg-descr
@@ -0,0 +1,10 @@
+Prettyprint and compare Data values.
+
+ * Size limit for the output
+ * Time limit for the computation
+ * Escape exceptions
+ * Do not escape unicode characters
+ * Comparison: Highlight the first difference
+ * Comparison: Yes, No or Maybe results
+
+WWW: http://hackage.haskell.org/package/data-pprint
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
new file mode 100644
index 000000000000..c278a8af8fc5
--- /dev/null
+++ b/devel/hs-date-cache/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= date-cache
+PORTVERSION= 0.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Date cacher
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-date-cache/distinfo b/devel/hs-date-cache/distinfo
new file mode 100644
index 000000000000..5bf3401bd783
--- /dev/null
+++ b/devel/hs-date-cache/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/date-cache-0.3.0.tar.gz) = abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f
+SIZE (cabal/date-cache-0.3.0.tar.gz) = 2126
diff --git a/devel/hs-date-cache/pkg-descr b/devel/hs-date-cache/pkg-descr
new file mode 100644
index 000000000000..3c6527a44d32
--- /dev/null
+++ b/devel/hs-date-cache/pkg-descr
@@ -0,0 +1,4 @@
+Formatting time is slow. This package provides mechanisms to cache formatted
+date.
+
+WWW: http://hackage.haskell.org/package/date-cache
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 72d09bde7cf9..ccc3e7668ece 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-datetime
-# Date created: December 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= datetime
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index 51d097749425..a8ee776c708c 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-directory-tree
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= directory-tree
-PORTVERSION= 0.10.1
+PORTVERSION= 0.11.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/distinfo b/devel/hs-directory-tree/distinfo
index dafd5c3eb5b8..3dde80070341 100644
--- a/devel/hs-directory-tree/distinfo
+++ b/devel/hs-directory-tree/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/directory-tree-0.10.1.tar.gz) = 7c2d6f1856a293c6d86e819b0a6ea85a69ca7a27c0cbdb12044bfac09bab4c09
-SIZE (cabal/directory-tree-0.10.1.tar.gz) = 9500
+SHA256 (cabal/directory-tree-0.11.0.tar.gz) = 890570cfe689d8925355944c5281a50eefef1395a5834219a75b3abebee5781f
+SIZE (cabal/directory-tree-0.11.0.tar.gz) = 10645
diff --git a/devel/hs-directory-tree/pkg-descr b/devel/hs-directory-tree/pkg-descr
index 2fb6664fcc1f..231a59ec13e9 100644
--- a/devel/hs-directory-tree/pkg-descr
+++ b/devel/hs-directory-tree/pkg-descr
@@ -1,8 +1,7 @@
-A simple directory-like tree datatype, with useful IO functions and Foldable
-and Traversable instance.
+A simple directory-like tree datatype, with useful IO functions and
+Foldable and Traversable instance. Provides a simple data structure
+mirroring a directory tree on the filesystem, as well as useful
+functions for reading and writing file and directory structures in the
+IO monad.
-Provides a simple data structure mirroring a directory tree on the
-filesystem, as well as useful functions for reading and writing
-file and directory structures in the IO monad.
-
-WWW: http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/
+WWW: http://brandon.si/code/directory-tree-module-released/
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index f294a1319c57..80144b529292 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: dlist
-# Date created: November 10, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= dlist
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index 42998f7b2145..08d9f93a7578 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: drift
-# Date created: 13 August 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
# $FreeBSD$
PORTNAME= drift
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 8193b2e425c8..1e4fb63e9d74 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-edit-distance
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= edit-distance
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Levenshtein and restricted Damerau-Levenshtein edit distances
LICENSE= BSD
-USE_CABAL= random
+USE_CABAL= random>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index d692a5d08a83..d429bd1982f3 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/edit-distance-0.2.1.tar.gz) = 68c4e7993d3b1900805e3ff6e48a4fce3d38c0cb0617fb8fad24f68adff711fe
-SIZE (cabal/edit-distance-0.2.1.tar.gz) = 9942
+SHA256 (cabal/edit-distance-0.2.1.1.tar.gz) = d60ba4ca60467a34e2f5e8a9452f6a9caf52e963fe95dbc4d5fbab61191a10b5
+SIZE (cabal/edit-distance-0.2.1.1.tar.gz) = 9940
diff --git a/devel/hs-edit-distance/pkg-descr b/devel/hs-edit-distance/pkg-descr
index 11a5bf7b35b0..6db6f7ace4e5 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/batterseapower/edit-distance
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index c8af86ff88df..9cb790120106 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-enumerator
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= enumerator
PORTVERSION= 0.4.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/pkg-descr b/devel/hs-enumerator/pkg-descr
index b4a8cd16e12e..9228d1b84f4f 100644
--- a/devel/hs-enumerator/pkg-descr
+++ b/devel/hs-enumerator/pkg-descr
@@ -19,4 +19,4 @@ programs.
This library contains an enumerator implementation for Haskell, designed to
be both simple and efficient.
-WWW: https://john-millikin.com/software/enumerator/
+WWW: https://john-millikin.com/software/enumerator/
diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile
index 597ce01c8a1b..3e95db73cfd8 100644
--- a/devel/hs-failure/Makefile
+++ b/devel/hs-failure/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-failure
-# Date created: December 25, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= failure
PORTVERSION= 0.2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-failure/pkg-descr b/devel/hs-failure/pkg-descr
index 6b565720d680..e207cc568cae 100644
--- a/devel/hs-failure/pkg-descr
+++ b/devel/hs-failure/pkg-descr
@@ -1,3 +1,3 @@
A simple type class for success/failure computations.
-WWW: http://www.haskell.org/haskellwiki/Failure
+WWW: http://www.haskell.org/haskellwiki/Failure
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 45f4fb44a9f5..969f6b0ddb48 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-fast-logger
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= fast-logger
-PORTVERSION= 0.0.2
-PORTREVISION= 2
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,7 @@ COMMENT= A fast logging system
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= blaze-builder
+USE_CABAL= blaze-builder date-cache>=0.3 text unix-time
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo
index 61476a0798ca..a2dd1255395b 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fast-logger-0.0.2.tar.gz) = 277f1031914c82d7f4fa1c6d6d3304c65116eb84d1a56cdb30ac52e2d9839ddf
-SIZE (cabal/fast-logger-0.0.2.tar.gz) = 3223
+SHA256 (cabal/fast-logger-0.3.1.tar.gz) = 7a0627c62211e4652f4c305d33a1b39cc2681d0fe72ae8c2866c39d0d41e566a
+SIZE (cabal/fast-logger-0.3.1.tar.gz) = 4606
diff --git a/devel/hs-fast-logger/pkg-descr b/devel/hs-fast-logger/pkg-descr
index d4a694308a07..e5bf188f9e77 100644
--- a/devel/hs-fast-logger/pkg-descr
+++ b/devel/hs-fast-logger/pkg-descr
@@ -1,3 +1,3 @@
A fast logging system.
-WWW: http://hackage.haskell.org/package/fast-logger
+WWW: http://hackage.haskell.org/package/fast-logger
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index e7293f6bf48f..9163b51a49ab 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-fgl
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= fgl
PORTVERSION= 5.4.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 65fb75694eb5..5c6de1d7af32 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-file-embed
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= file-embed
-PORTVERSION= 0.0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.0.4.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 969fc8d221eb..e19df2aaa64b 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/file-embed-0.0.4.4.tar.gz) = 175ad2ee32f43608da64d2bfe5f7ce2bcf9ee1517c9dfd888b1b3a757751fcb3
-SIZE (cabal/file-embed-0.0.4.4.tar.gz) = 3447
+SHA256 (cabal/file-embed-0.0.4.6.tar.gz) = 77e351e14cead1934e17c312610c51e2179172d4ee7735b8eac5cba04dd15b5c
+SIZE (cabal/file-embed-0.0.4.6.tar.gz) = 3490
diff --git a/devel/hs-file-embed/pkg-descr b/devel/hs-file-embed/pkg-descr
index 850d570d2321..74b2dba7c9cf 100644
--- a/devel/hs-file-embed/pkg-descr
+++ b/devel/hs-file-embed/pkg-descr
@@ -1,3 +1,4 @@
-Use Template Haskell to embed file contents directly.
+Use Template Haskell to read a file or all the files in a directory, and
+turn them into (path, text) pairs embedded in your haskell code.
-WWW: https://github.com/snoyberg/file-embed
+WWW: https://github.com/snoyberg/file-embed
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index cd5af6eebde5..17cb10676903 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-FileManip
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= filemanip
-PORTVERSION= 0.3.5.2
-PORTREVISION= 6
+PORTVERSION= 0.3.6.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 0607ff4f31f1..0d2855ef0d4a 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filemanip-0.3.5.2.tar.gz) = 7611ffb3ef26c0c983723e34f93b12888c9a5ee54510b2229aa39fcda386da4e
-SIZE (cabal/filemanip-0.3.5.2.tar.gz) = 10209
+SHA256 (cabal/filemanip-0.3.6.2.tar.gz) = 3f93da5faa33d675b1a64a90a262c2decfd3d28924f0a4bfb7c691053309810e
+SIZE (cabal/filemanip-0.3.6.2.tar.gz) = 10192
diff --git a/devel/hs-filemanip/pkg-descr b/devel/hs-filemanip/pkg-descr
index 396e697e1579..0de277d22ee1 100644
--- a/devel/hs-filemanip/pkg-descr
+++ b/devel/hs-filemanip/pkg-descr
@@ -1,4 +1,4 @@
A Haskell library for working with files and directories. Includes code
for pattern matching, finding files, modifying file contents, and more.
-WWW: http://hackage.haskell.org/package/filemanip
+WWW: https://github.com/bos/filemanip
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index b2a172ace45d..aac684ca66ff 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-filestore
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= filestore
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index f38b281ecf44..174cc9c4f3f5 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.5.tar.gz) = 07d3dcd54b2c411ef5ac81bddbf240bcc58519f0ce3b3509b48d7c3d23aaf732
-SIZE (cabal/filestore-0.5.tar.gz) = 29379
+SHA256 (cabal/filestore-0.5.0.1.tar.gz) = f4dc9ec0e49abcd138328eec6495df034f656979d0f6936e8a98ad35f5e071f1
+SIZE (cabal/filestore-0.5.0.1.tar.gz) = 29263
diff --git a/devel/hs-filestore/pkg-descr b/devel/hs-filestore/pkg-descr
index 6dac50238f1c..f5a82fb20949 100644
--- a/devel/hs-filestore/pkg-descr
+++ b/devel/hs-filestore/pkg-descr
@@ -3,4 +3,4 @@ store, and modules that instantiate this interface. Currently Git, Darcs,
and Mercurial modules are provided, and other VCSs or databases could be
added.
-WWW: http://johnmacfarlane.net/repos/filestore
+WWW: http://johnmacfarlane.net/repos/filestore
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
index 1c495a701ae4..502d84789f63 100644
--- a/devel/hs-filesystem-conduit/Makefile
+++ b/devel/hs-filesystem-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-filesystem-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= filesystem-conduit
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Use system-filepath data types with conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.4 system-fileio>=0.3.3 system-filepath>=0.4.3 \
+USE_CABAL= conduit>=0.5 system-fileio>=0.3.3 system-filepath>=0.4.3 \
text>=0.11 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-filesystem-conduit/distinfo b/devel/hs-filesystem-conduit/distinfo
index 2e9b30424de3..1a2488ca2681 100644
--- a/devel/hs-filesystem-conduit/distinfo
+++ b/devel/hs-filesystem-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filesystem-conduit-0.4.0.tar.gz) = ceec0adf0bc5b77b2a0b91c1e1b720ce1d7124ee41d891b9ecc5a7f694ca4582
-SIZE (cabal/filesystem-conduit-0.4.0.tar.gz) = 3125
+SHA256 (cabal/filesystem-conduit-0.5.0.2.tar.gz) = d8f934889839492f04c2e5812aefa62af1a53c67c94f8b22dd641c33c5a0fd6e
+SIZE (cabal/filesystem-conduit-0.5.0.2.tar.gz) = 3075
diff --git a/devel/hs-filesystem-conduit/pkg-descr b/devel/hs-filesystem-conduit/pkg-descr
index 2c077d0d98a3..38f1a13f1c69 100644
--- a/devel/hs-filesystem-conduit/pkg-descr
+++ b/devel/hs-filesystem-conduit/pkg-descr
@@ -1,4 +1,4 @@
Provides ability to traverse a folder structure efficiently, as well as
convenience wrappers for reading from and writing to files.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
new file mode 100644
index 000000000000..f8c59bfb9323
--- /dev/null
+++ b/devel/hs-fsnotify/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= fsnotify
+PORTVERSION= 0.0.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cross-platform library for file system notifications
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= hinotify>=0.3.5 system-fileio>=0.3.8 system-filepath>=0.4.6 \
+ text>=0.11.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
new file mode 100644
index 000000000000..719f9a4f214e
--- /dev/null
+++ b/devel/hs-fsnotify/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/fsnotify-0.0.4.tar.gz) = 5f2317ec9f17665a89bfd5d9601e313f01969e10327d7e28fc354a4464ffe168
+SIZE (cabal/fsnotify-0.0.4.tar.gz) = 14565
diff --git a/devel/hs-fsnotify/pkg-descr b/devel/hs-fsnotify/pkg-descr
new file mode 100644
index 000000000000..ba3bb03ac7ec
--- /dev/null
+++ b/devel/hs-fsnotify/pkg-descr
@@ -0,0 +1,5 @@
+Cross platform library for file creation, modification, and deletion
+notification. This library builds upon existing libraries for platform-specific
+Window, Mac, and Linux filesystem event notification.
+
+WWW: http://hackage.haskell.org/package/fsnotify
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 2e80c6bd221e..4a7c56d56ccd 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-gconf
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gconf
-PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTVERSION= 0.12.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,8 @@ LICENSE= LGPL21
FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
-USE_CABAL= glib>=0.12 mtl gtk2hs-buildtools
+
+USE_CABAL= glib>=0.12 gtk2hs-buildtools
USE_GNOME= gconf2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index 01f61bf854f6..fe57666833af 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gconf-0.12.1.tar.gz) = a6070309b7f52edbe6c2b99214eb20d8bd93210bb08acb95847d8dfe1a6cc007
-SIZE (cabal/gconf-0.12.1.tar.gz) = 34182
+SHA256 (cabal/gconf-0.12.1.1.tar.gz) = 7677eb8a6947ce3bd2b2c3c854f289dc3b59b77b66bac0f8a75be26d8fbfc4da
+SIZE (cabal/gconf-0.12.1.1.tar.gz) = 34104
diff --git a/devel/hs-gconf/pkg-descr b/devel/hs-gconf/pkg-descr
index 4073dd738da5..a11bbab17b6a 100644
--- a/devel/hs-gconf/pkg-descr
+++ b/devel/hs-gconf/pkg-descr
@@ -3,4 +3,4 @@ It supports default or mandatory settings set by the administrator, and
changes to the database are instantly applied to all running applications. It
is written for the GNOME desktop but doesn't require it.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index f7da6d6f1abd..4a762179cedb 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-ghc-events
-# Date created: December 6, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= ghc-events
-PORTVERSION= 0.4.0.0
-PORTREVISION= 2
+PORTVERSION= 0.4.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 9c32781b3bbc..94e5b36aa0ba 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-events-0.4.0.0.tar.gz) = e21dad165ccb068fbe048e7b12ffed964cff0bed31125bcccb485534bb2c3960
-SIZE (cabal/ghc-events-0.4.0.0.tar.gz) = 65760
+SHA256 (cabal/ghc-events-0.4.2.0.tar.gz) = 94ec7628b996b32a8e55060cd640997e0755a751d9cd36b8d22e125e5eca0908
+SIZE (cabal/ghc-events-0.4.2.0.tar.gz) = 69355
diff --git a/devel/hs-ghc-events/files/patch-ghc-events.cabal b/devel/hs-ghc-events/files/patch-ghc-events.cabal
deleted file mode 100644
index fd73d37b9893..000000000000
--- a/devel/hs-ghc-events/files/patch-ghc-events.cabal
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./ghc-events.cabal.orig 2012-01-14 03:14:39.000000000 +0100
-+++ ./ghc-events.cabal 2012-05-12 13:48:07.000000000 +0200
-@@ -27,7 +27,7 @@
-
- library
- build-depends: base == 4.*,
-- mtl >= 1.1 && < 2.1,
-+ mtl >= 1.1 && < 2.2,
- containers >= 0.2 && < 0.5,
- binary == 0.5.*,
- bytestring == 0.9.*,
-@@ -40,7 +40,7 @@
- GHC.RTS.Events.Analysis.Thread
- other-modules: GHC.RTS.EventParserUtils,
- GHC.RTS.EventTypes
-- extensions: RecordWildCards, NamedFieldPuns, BangPatterns, PatternGuards
-+ extensions: CPP, RecordWildCards, NamedFieldPuns, BangPatterns, PatternGuards
-
- executable ghc-events
- main-is: GhcEvents.hs
diff --git a/devel/hs-ghc-events/pkg-descr b/devel/hs-ghc-events/pkg-descr
index f5a797a3af75..54fc57732db0 100644
--- a/devel/hs-ghc-events/pkg-descr
+++ b/devel/hs-ghc-events/pkg-descr
@@ -1,4 +1,4 @@
Parses .eventlog files emitted by GHC 6.12.1 and later. Includes the
ghc-events-show tool to dump and event log file as text.
-WWW: http://hackage.haskell.org/package/ghc-events
+WWW: http://hackage.haskell.org/package/ghc-events
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 863b590a5431..d82f2ae49ef1 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -1,17 +1,13 @@
-# New ports collection makefile for: hs-ghc-mtl
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= ghc-mtl
-PORTVERSION= 1.0.1.1
-PORTREVISION= 2
+PORTVERSION= 1.0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An mtl compatible version of the Ghc-Api monads and monad-transformers
+COMMENT= An mtl compatible version of the Ghc-Api monads and\
+ monad-transformers
LICENSE= BSD
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index d8897f1ecf07..acc413bdbf5b 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-mtl-1.0.1.1.tar.gz) = f63a10a67a3e0f86d96738abd325e25a44b86c280bb531058097f37ec40b9512
-SIZE (cabal/ghc-mtl-1.0.1.1.tar.gz) = 2307
+SHA256 (cabal/ghc-mtl-1.0.1.2.tar.gz) = 6acf35a5e0a806c56d8b87a67e84cfe46dba79a3338620f8197aef45b1f5a81a
+SIZE (cabal/ghc-mtl-1.0.1.2.tar.gz) = 2364
diff --git a/devel/hs-ghc-mtl/pkg-descr b/devel/hs-ghc-mtl/pkg-descr
index cd1980a084fc..4c7b2bde0c4c 100644
--- a/devel/hs-ghc-mtl/pkg-descr
+++ b/devel/hs-ghc-mtl/pkg-descr
@@ -1,4 +1,4 @@
Provides an 'mtl' compatible version of the 'GhcT' monad-transformer
defined in the 'GHC-API' since version 6.10.1.
-WWW: http://code.haskell.org/~jcpetruzza/ghc-mtl
+WWW: http://darcsden.com/jcpetruzza/ghc-mtl
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 8d859ec613d0..a1cb48f442a4 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-ghc-paths
-# Date created: July 09 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index c8b92549be86..e8573ed54213 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-gio
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gio
-PORTVERSION= 0.12.3
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index a538b6b00ecf..30008c917c09 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gio-0.12.3.tar.gz) = 56aa7cd4d48486ce895fadba0113abc68a5f188bafccb200d448f2fe68a3b84e
-SIZE (cabal/gio-0.12.3.tar.gz) = 77997
+SHA256 (cabal/gio-0.12.4.tar.gz) = 3efe74e15c2df03fcf390d37879e91f88dbd93257ae79900f88989f3cfc1fb5a
+SIZE (cabal/gio-0.12.4.tar.gz) = 77980
diff --git a/devel/hs-gio/pkg-descr b/devel/hs-gio/pkg-descr
index 45137e5ecfb5..48c3f357460d 100644
--- a/devel/hs-gio/pkg-descr
+++ b/devel/hs-gio/pkg-descr
@@ -5,4 +5,4 @@ over raw POSIX calls. Among other things that means using GObject. It also
means not cloning the POSIX API, but providing higher-level, document-centric
interfaces.
-WWW: http://projects.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index e13ac9eba878..5f53970f9dd8 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -1,25 +1,22 @@
-# New ports collection makefile for: git-annex
-# Date created: 8 June 2011
-# Whom: frase@frase.id.au
-#
+# Created by: frase@frase.id.au
# $FreeBSD$
-#
PORTNAME= git-annex
-PORTVERSION= 3.20120807
+PORTVERSION= 3.20121211
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-FILE_LICENSE= GPL
+FILE_LICENSE= COPYRIGHT
CABAL_SETUP= Setup.hs
-USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse json \
- lifted-base MissingH monad-control mtl network pcre-light \
- QuickCheck>=2.1 SHA text transformers-base utf8-string
+USE_CABAL= async bloomfilter dataenc edit-distance hslogger HTTP IfElse \
+ json lifted-base MissingH monad-control mtl network pcre-light \
+ QuickCheck>=2.1 SafeSemaphore SHA text transformers-base \
+ utf8-string
USE_GMAKE= yes
USE_PERL5_BUILD= yes
@@ -33,13 +30,16 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
-OPTIONS_DEFINE= S3 ASSISTANT
+OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING
OPTIONS_DEFAULT= S3 ASSISTANT
S3_DESC= S3 support
ASSISTANT_DESC= 'assistant' and 'watch' commands
+INOTIFY_DESC= File system notifications support
+WEBAPP_DESC= Web application (req. assistant)
+PAIRING_DESC= Enable pairing (req. web application)
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MS3}
CONFIGURE_ARGS+= --flags="S3"
@@ -55,5 +55,32 @@ USE_CABAL+= stm>=2.3
CONFIGURE_ARGS+= --flags="-Assistant"
.endif
+.if ${PORT_OPTIONS:MINOTIFY}
+CONFIGURE_ARGS+= --flags="Inotify"
+USE_CABAL+= kqueue
+.else
+CONFIGURE_ARGS+= --flags="-Inotify"
+.endif
+
+.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MASSISTANT}
+CONFIGURE_ARGS+= --flags="Webapp"
+USE_CABAL+= yesod yesod-static case-insensitive http-types \
+ transformers wai wai-logger warp blaze-builder \
+ blaze-html crypto-api hamlet clientsession \
+ yesod-default>=1.1.0 data-default
+.else
+CONFIGURE_ARGS+= --flags="-Webapp"
+.endif
+
+.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MPAIRING}
+CONFIGURE_ARGS+= --flags="Pairing"
+USE_CABAL+= network-multicast network-info
+.else
+CONFIGURE_ARGS+= --flags="-Pairing"
+.endif
+
+# Disable all the other options
+CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus"
+
.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 4de2446bd2cb..78258a0755df 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-3.20120807.tar.gz) = 89c2a504c5570e2162809a81ee470f41709fb6b7a32c3f18f59f2fd8e5a149fb
-SIZE (cabal/git-annex-3.20120807.tar.gz) = 1183955
+SHA256 (cabal/git-annex-3.20121211.tar.gz) = 3b6d9d7d8d44c7939813a4798a78b76a02efef655030d742149eda3779daa13e
+SIZE (cabal/git-annex-3.20121211.tar.gz) = 2068316
diff --git a/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs b/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs
new file mode 100644
index 000000000000..de4e212d205a
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs
@@ -0,0 +1,20 @@
+--- ./Build/InstallDesktopFile.hs.orig 2012-10-17 03:24:57.000000000 +0200
++++ ./Build/InstallDesktopFile.hs 2012-11-06 11:26:23.567300019 +0100
+@@ -59,11 +59,15 @@
+
+ writeFDODesktop :: FilePath -> IO ()
+ writeFDODesktop command = do
+- datadir <- ifM systemwideInstall ( return systemDataDir, userDataDir )
++ prefix <- catchMaybeIO (getEnv "PREFIX")
++ let (sddir,scdir) = case prefix of
++ Just p -> (p </> "share", p </> "etc/xdg")
++ Nothing -> (systemDataDir, systemConfigDir)
++ datadir <- ifM systemwideInstall ( return sddir, userDataDir )
+ writeDesktopMenuFile (desktop command)
+ =<< inDestDir (desktopMenuFilePath "git-annex" datadir)
+
+- configdir <- ifM systemwideInstall ( return systemConfigDir, userConfigDir )
++ configdir <- ifM systemwideInstall ( return scdir, userConfigDir )
+ installAutoStart command
+ =<< inDestDir (autoStartPath "git-annex" configdir)
+
diff --git a/devel/hs-git-annex/files/patch-Makefile b/devel/hs-git-annex/files/patch-Makefile
deleted file mode 100644
index ef1edc58c8da..000000000000
--- a/devel/hs-git-annex/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig 2011-11-22 20:21:04.000000000 +0100
-+++ ./Makefile 2011-12-03 14:33:37.000000000 +0100
-@@ -90,6 +90,8 @@
- IKIWIKI=ikiwiki
- endif
-
-+manuals: $(mans)
-+
- docs: $(mans)
- $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \
- --no-usedirs --disable-plugin=openid --plugin=sidebar \
diff --git a/devel/hs-git-annex/pkg-descr b/devel/hs-git-annex/pkg-descr
index 71347a4b5354..177cad81ff08 100644
--- a/devel/hs-git-annex/pkg-descr
+++ b/devel/hs-git-annex/pkg-descr
@@ -9,4 +9,4 @@ 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.
-WWW: http://git-annex.branchable.com/
+WWW: http://git-annex.branchable.com/
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
new file mode 100644
index 000000000000..2a403c147879
--- /dev/null
+++ b/devel/hs-git-annex/pkg-plist
@@ -0,0 +1,6 @@
+@comment $FreeBSD$
+etc/xdg/autostart/git-annex.desktop
+share/applications/git-annex.desktop
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
+@dirrmtry share/applications
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
index b06880ce9c8d..4992e24a6a3c 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-glade
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= glade
PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index a4efa91dcaef..c9445a244f27 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-glib
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= glib
-PORTVERSION= 0.12.3.1
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,6 +11,7 @@ LICENSE= LGPL21
FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
+
USE_CABAL= gtk2hs-buildtools
USE_GNOME= glib20
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 81174d75f26b..4907f52b0bae 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/glib-0.12.3.1.tar.gz) = fe821dc994452e497d075f3be74a7eac6e1637be84982ce7ae0aec59400bbacc
-SIZE (cabal/glib-0.12.3.1.tar.gz) = 45431
+SHA256 (cabal/glib-0.12.4.tar.gz) = 5d9df40d0891ec45cd4b96485ae00815a57563dcf4167f18fef2d11e3cbc2269
+SIZE (cabal/glib-0.12.4.tar.gz) = 45391
diff --git a/devel/hs-glib/pkg-descr b/devel/hs-glib/pkg-descr
index ecd3ae3d33da..eae843ac2f13 100644
--- a/devel/hs-glib/pkg-descr
+++ b/devel/hs-glib/pkg-descr
@@ -3,4 +3,4 @@ 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.
-WWW: http://projects.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 9fa3dff35277..935d399cfea9 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-gtk2hs-buildtools
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.12.3.1
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,13 +12,13 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
+USE_CABAL= random
USE_ALEX= yes
USE_HAPPY= yes
-USE_CABAL= random
+EXECUTABLE= gtk2hsTypeGen gtk2hsHookGenerator gtk2hsC2hs
STANDALONE= yes
-EXECUTABLE= gtk2hsTypeGen gtk2hsHookGenerator gtk2hsC2hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 0e4a468c5b75..470daee5a72a 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk2hs-buildtools-0.12.3.1.tar.gz) = c6ff1fbb9b50e0c5bbc65ab7e16f2b5ff80536b2704bac6c34f106ff8357b428
-SIZE (cabal/gtk2hs-buildtools-0.12.3.1.tar.gz) = 212286
+SHA256 (cabal/gtk2hs-buildtools-0.12.4.tar.gz) = 5fe05fee08484ee9a8515b04536426fe263c830094c548534304971e2ffa0576
+SIZE (cabal/gtk2hs-buildtools-0.12.4.tar.gz) = 212505
diff --git a/devel/hs-gtk2hs-buildtools/pkg-descr b/devel/hs-gtk2hs-buildtools/pkg-descr
index 5886066ca240..0b409f26bed7 100644
--- a/devel/hs-gtk2hs-buildtools/pkg-descr
+++ b/devel/hs-gtk2hs-buildtools/pkg-descr
@@ -5,4 +5,4 @@ mirrors the C type hiearchy of GObjects found in glib, and a generator for
signal declarations that are used to call back from C to Haskell. These tools
are not needed to actually run Gtk2Hs programs.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://www.haskell.org/gtk2hs/
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index e1c27602fdc6..2c1c78bf64ac 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: haddock
-# Date created: 09 May 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.10.0
-PORTREVISION= 1
+PORTVERSION= 2.11.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 2ee8e770372e..08fc20d8c264 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.10.0.tar.gz) = d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410
-SIZE (cabal/haddock-2.10.0.tar.gz) = 159750
+SHA256 (cabal/haddock-2.11.0.tar.gz) = 8dcd7c5cc9f3db7526a42297be4ee563820ade3d1a49e3d0e165569abcb14928
+SIZE (cabal/haddock-2.11.0.tar.gz) = 146824
diff --git a/devel/hs-haddock/pkg-descr b/devel/hs-haddock/pkg-descr
index 3611bfb5b9c9..17176ab296b8 100644
--- a/devel/hs-haddock/pkg-descr
+++ b/devel/hs-haddock/pkg-descr
@@ -1,3 +1,3 @@
Haddock is a documentation-generation tool for Haskell libraries.
-WWW: http://www.haskell.org/haddock/
+WWW: http://www.haskell.org/haddock/
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 77d761509f17..be1c56a02eb8 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: happy
-# Date created: 22 December 2000
-# Whom: Simon Marlow <simonmar@microsoft.com>
-#
+# Created by: Simon Marlow <simonmar@microsoft.com>
# $FreeBSD$
PORTNAME= happy
-PORTVERSION= 1.18.9
-PORTREVISION= 1
+PORTVERSION= 1.18.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -22,13 +18,7 @@ USE_AUTOTOOLS= autoconf:env
STANDALONE= yes
EXECUTABLE= happy
-USE_PERL5_BUILD= yes
-
INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.if defined(SLAVE)
-GHC_CMD= ghc
-.endif
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index 6c27872e5406..fefe11034ae7 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happy-1.18.9.tar.gz) = 7d34c512b8aecbc135f6b4c43bc18044ff50ae6d5afdd0d2570228dccecb618a
-SIZE (cabal/happy-1.18.9.tar.gz) = 158476
+SHA256 (cabal/happy-1.18.10.tar.gz) = c1c920f77906740252e261e2baec5b7519e584344d6080aa5a9cc0b677b9064b
+SIZE (cabal/happy-1.18.10.tar.gz) = 159994
diff --git a/devel/hs-happy/pkg-descr b/devel/hs-happy/pkg-descr
index cbba78d92fad..9471d05ae287 100644
--- a/devel/hs-happy/pkg-descr
+++ b/devel/hs-happy/pkg-descr
@@ -1,3 +1,3 @@
Happy is a parser generator system for Haskell.
-WWW: http://www.haskell.org/happy/
+WWW: http://www.haskell.org/happy/
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 7a9fb76933ad..7f894ea5cdfb 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hashable
-# Date created: July 17, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hashable
-PORTVERSION= 1.1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 04fd769de14a..5a166ac6bda9 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.1.2.3.tar.gz) = 9a76e6e64996c5050dc76cbaa842c1b37559c18322c69e5a72460a46c62269a7
-SIZE (cabal/hashable-1.1.2.3.tar.gz) = 8685
+SHA256 (cabal/hashable-1.1.2.5.tar.gz) = 3fb5d430c9289ebada4991a76fd78f028aaaf17957dc666ddc7b89c98a54713d
+SIZE (cabal/hashable-1.1.2.5.tar.gz) = 9129
diff --git a/devel/hs-hashable/pkg-descr b/devel/hs-hashable/pkg-descr
index 9d4e0fedea85..14e98ea4ac1d 100644
--- a/devel/hs-hashable/pkg-descr
+++ b/devel/hs-hashable/pkg-descr
@@ -3,4 +3,4 @@ to a hash value. This class exists for the benefit of hashing-based data
structures. The package provides instances for basic types and a way to
combine hash values.
-WWW: http://github.com/tibbe/hashable
+WWW: http://github.com/tibbe/hashable
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 6a9082a6d52c..b22b7e2adcf1 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hashed-storage
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hashed-storage
-PORTVERSION= 0.5.9
-PORTREVISION= 2
+PORTVERSION= 0.5.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 9cedede303c2..29d35a601b04 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashed-storage-0.5.9.tar.gz) = 62c2394d0a127222920211152022e8bc40775ebbdd22fd383715cb32f90796f9
-SIZE (cabal/hashed-storage-0.5.9.tar.gz) = 56719
+SHA256 (cabal/hashed-storage-0.5.10.tar.gz) = 05824a4cedd2be03444fd0bc664f5c94f6edc50005f1a8f99657150fa6cdedcc
+SIZE (cabal/hashed-storage-0.5.10.tar.gz) = 57658
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index b100272b2bdf..25d51f8cada5 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hashtables
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hashtables
-PORTVERSION= 1.0.1.6
-PORTREVISION= 1
+PORTVERSION= 1.0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable>=1.1 primitive vector>=0.7
+USE_CABAL= hashable>=1.1 primitive>=0.4 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 e592f3635927..7208dedd5367 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashtables-1.0.1.6.tar.gz) = 8bea51356c6846969967fe161ba247b406a691ae77c9c2be98f9105282d2351c
-SIZE (cabal/hashtables-1.0.1.6.tar.gz) = 47721
+SHA256 (cabal/hashtables-1.0.1.8.tar.gz) = 28fed49706e8fc7fe30b6393d9ed05c6d6b3f4bd0eda300c791054adfefe796a
+SIZE (cabal/hashtables-1.0.1.8.tar.gz) = 48392
diff --git a/devel/hs-hashtables/pkg-descr b/devel/hs-hashtables/pkg-descr
index 0b977bef6fdd..25312ea14af2 100644
--- a/devel/hs-hashtables/pkg-descr
+++ b/devel/hs-hashtables/pkg-descr
@@ -2,4 +2,4 @@ This package provides a couple of different implementations of mutable hash tabl
in the ST monad, as well as a type class abstracting their common operations, and
a set of wrappers to use the hash tables in the IO monad.
-WWW: http://github.com/gregorycollins/hashtables
+WWW: http://github.com/gregorycollins/hashtables
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index 125d5fd22141..a651caf6c5dc 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-haskeline
-# Date created: July 09 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= haskeline
PORTVERSION= 0.6.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index 37c23e1ec2b4..67ca1e722a84 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: haskell-platform
-# Date created: April 23, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= haskell-platform
-PORTVERSION= 2012.2.0.0
-PORTREVISION= 1
+PORTVERSION= 2012.4.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,32 +10,37 @@ COMMENT= The Haskell Platform
LICENSE= BSD
METAPORT= yes
-USE_CABAL= cgi==3001.1.7.4_4,1 \
- fgl==5.4.2.4_2 \
- GLUT==2.1.2.1_5,1 \
- haskell-src==1.0.1.5_1 \
- html==1.0.1.2_4 \
- HTTP==4000.2.3_1 \
- HUnit==1.2.4.2_2 \
- mtl==2.1.1_1 \
- network==2.3.0.13_1 \
- OpenGL==2.2.3.1_2,1 \
- parallel==3.2.0.2_1 \
- parsec==3.1.2_1 \
- QuickCheck==2.4.2_1 \
- random==1.0.1.1_1 \
- regex-base==0.93.2_4 \
- regex-compat==0.95.1_2 \
- regex-posix==0.95.1_2 \
- stm==2.3_1 \
- syb==0.3.6.1_1 \
- text=0.11.2.0_1 \
- transformers==0.3.0.0_1 \
- xhtml==3000.2.1_1 \
- zlib==0.5.3.3_1 \
- cabal-install==0.14.0_1 \
- alex==3.0.1_1 \
- happy==1.18.9_1
+
+USE_CABAL= async==2.0.1.3 \
+ cgi==3001.1.7.4_5,1 \
+ fgl==5.4.2.4_3 \
+ GLUT==2.1.2.1_6,1 \
+ haskell-src==1.0.1.5_2 \
+ html==1.0.1.2_5 \
+ HTTP==4000.2.5 \
+ HUnit==1.2.5.1 \
+ mtl==2.1.2 \
+ network==2.3.1.0 \
+ OpenGL==2.2.3.1_3,1 \
+ parallel==3.2.0.3 \
+ parsec==3.1.3 \
+ primitive==0.5.0.1 \
+ QuickCheck==2.5.1.1 \
+ random==1.0.1.1_2 \
+ regex-base==0.93.2_5 \
+ regex-compat==0.95.1_3 \
+ regex-posix==0.95.2 \
+ split==0.2.1.1 \
+ stm==2.4 \
+ syb==0.3.7 \
+ text==0.11.2.3 \
+ transformers==0.3.0.0_2 \
+ vector==0.10.0.1 \
+ xhtml==3000.2.1_2 \
+ zlib==0.5.4.0 \
+ cabal-install==0.14.0_2 \
+ alex==3.0.2 \
+ happy==1.18.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-platform/pkg-descr b/devel/hs-haskell-platform/pkg-descr
index 678f2c09926a..2f80071afccd 100644
--- a/devel/hs-haskell-platform/pkg-descr
+++ b/devel/hs-haskell-platform/pkg-descr
@@ -12,4 +12,4 @@ for a system to be in full compliance:
* haddock
-WWW: http://haskell.org/platform/
+WWW: http://haskell.org/platform/
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 669411ac5c8b..27868a48619e 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-haskell-src-exts
-# Date created: December 30 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= haskell-src-exts
-PORTVERSION= 1.13.3
-PORTREVISION= 1
+PORTVERSION= 1.13.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index d20aa55f6055..8b3e968c80df 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-exts-1.13.3.tar.gz) = 259186b608e616351462c3ceccd5350a6569992c987119021bf53510a5d15b7c
-SIZE (cabal/haskell-src-exts-1.13.3.tar.gz) = 289796
+SHA256 (cabal/haskell-src-exts-1.13.5.tar.gz) = 7c5adc74bc76b26a2ba7de6927877c6ed930c64039371c0c84c5257aae837f0d
+SIZE (cabal/haskell-src-exts-1.13.5.tar.gz) = 291329
diff --git a/devel/hs-haskell-src-exts/pkg-descr b/devel/hs-haskell-src-exts/pkg-descr
index 053857b4bb27..033d20510a5f 100644
--- a/devel/hs-haskell-src-exts/pkg-descr
+++ b/devel/hs-haskell-src-exts/pkg-descr
@@ -13,4 +13,4 @@ and a few more. All extensions implemented in GHC are supported.
Apart from these standard extensions, it also handles regular patterns as
per the HaRP extension as well as HSX-style embedded XML syntax.
-WWW: http://code.haskell.org/haskell-src-exts/
+WWW: http://code.haskell.org/haskell-src-exts/
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 04e34c9c7702..7268c8ea90d1 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-haskell-src
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= haskell-src
PORTVERSION= 1.0.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/pkg-descr b/devel/hs-haskell-src/pkg-descr
index 10e4171bf475..02c68f4750b8 100644
--- a/devel/hs-haskell-src/pkg-descr
+++ b/devel/hs-haskell-src/pkg-descr
@@ -3,4 +3,4 @@ source code. The package provides a lexer, parser and pretty-printer,
and a definition of a Haskell abstract syntax tree (AST). Common uses
of this package are to parse or generate Haskell 98 code.
-WWW: http://hackage.haskell.org/package/haskell-src
+WWW: http://hackage.haskell.org/package/haskell-src
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index e4cdb096b9ba..02805f44e289 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-hastache
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hastache
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 4be8cd23cf7b..330e7923ef24 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hastache-0.4.1.tar.gz) = b33dc7c7790d80fc705f5b1e5601938ef6c66cc06a5708d180327457eb1acdb4
-SIZE (cabal/hastache-0.4.1.tar.gz) = 12040
+SHA256 (cabal/hastache-0.4.2.tar.gz) = 719f07aa9917e5b0d8586bb26fc045e81fae50fb4d3230a351a05bdb7148a6a9
+SIZE (cabal/hastache-0.4.2.tar.gz) = 12113
diff --git a/devel/hs-hastache/pkg-descr b/devel/hs-hastache/pkg-descr
index 4c5d8c389295..986d16e5fdb6 100644
--- a/devel/hs-hastache/pkg-descr
+++ b/devel/hs-hastache/pkg-descr
@@ -2,4 +2,4 @@ Haskell implementation of Mustache templates [1].
[1] http://mustache.github.com/
-WWW: http://github.com/lymar/hastache
+WWW: http://github.com/lymar/hastache
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index bea3abc5d2bf..c5657c34f2c3 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: hdoc
-# Date created: 25 October 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
PORTNAME= hdoc
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
new file mode 100644
index 000000000000..30e8c9bde366
--- /dev/null
+++ b/devel/hs-hinotify/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= hinotify
+PORTVERSION= 0.3.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell binding to inotify
+
+LICENSE= BSD
+
+LIB_DEPENDS= inotify.0:${PORTSDIR}/devel/libinotify
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
new file mode 100644
index 000000000000..69880f0354af
--- /dev/null
+++ b/devel/hs-hinotify/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hinotify-0.3.5.tar.gz) = 14c42e1fe3b7cef1bf5a545615c33b20ce7c6affe8474824faeb0d2e38deff02
+SIZE (cabal/hinotify-0.3.5.tar.gz) = 11030
diff --git a/devel/hs-hinotify/pkg-descr b/devel/hs-hinotify/pkg-descr
new file mode 100644
index 000000000000..df58c92156ce
--- /dev/null
+++ b/devel/hs-hinotify/pkg-descr
@@ -0,0 +1,5 @@
+This library provides a wrapper to the Linux Kernel's inotify feature,
+allowing applications to subscribe to notifications when a file is accessed
+or modified.
+
+WWW: https://github.com/kolmodin/hinotify.git
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index d71e100a756a..a4c32f5dbeaf 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hint
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= hint
-PORTVERSION= 0.3.3.4
-PORTREVISION= 1
+PORTVERSION= 0.3.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 497aadfc60a3..920e879eec28 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hint-0.3.3.4.tar.gz) = 3ec235f0cd969316540d1e6eb6d0789fd37450e7a1df8bf8e641839a2485bb5e
-SIZE (cabal/hint-0.3.3.4.tar.gz) = 27888
+SHA256 (cabal/hint-0.3.3.5.tar.gz) = 98562846596b7835c18c630e7c3d3c2ae39000facea4ab889b51b002c222ed26
+SIZE (cabal/hint-0.3.3.5.tar.gz) = 28562
diff --git a/devel/hs-hint/pkg-descr b/devel/hs-hint/pkg-descr
index a26bd4beffe6..32b30f834e00 100644
--- a/devel/hs-hint/pkg-descr
+++ b/devel/hs-hint/pkg-descr
@@ -3,4 +3,4 @@ modules, browse them, type-check and evaluate strings with Haskell
expressions and even coerce them into values. The library is thread-safe
and type-safe (even the coercion of expressions to values).
-WWW: http://darcsden.com/jcpetruzza/hint
+WWW: http://darcsden.com/jcpetruzza/hint
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index b08ba8032dfd..a342b3fdfa5e 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hlibev
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index 1e80abf04450..ff9fcbfa44b5 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,18 +1,13 @@
-# New ports collection makefile for: hs-hlint
-# Date created: January 2, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hlint
-PORTVERSION= 1.8.30
+PORTVERSION= 1.8.39
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Source code suggestions
-LICENSE= GPLv2
+LICENSE= BSD
CABAL_SETUP= Setup.hs
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index f5a1d51189bf..1e48d978c903 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.8.30.tar.gz) = 05b47cfc2c255d2b9e52c70a37f1e55a957327f3d610ec3eb62d9513ef81a2b0
-SIZE (cabal/hlint-1.8.30.tar.gz) = 67921
+SHA256 (cabal/hlint-1.8.39.tar.gz) = e58cea4090352e95c457b1153857ca57c346c8bfbb0bf17fbf28661b08713801
+SIZE (cabal/hlint-1.8.39.tar.gz) = 63401
diff --git a/devel/hs-hlint/pkg-descr b/devel/hs-hlint/pkg-descr
index 2788cb4a0018..97ed14e6ace5 100644
--- a/devel/hs-hlint/pkg-descr
+++ b/devel/hs-hlint/pkg-descr
@@ -1,3 +1,3 @@
HLint gives suggestions on how to improve your source code.
-WWW: http://community.haskell.org/~ndm/hlint/
+WWW: http://community.haskell.org/~ndm/hlint/
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index ed67535356e5..5de7501c002b 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hoogle
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= hoogle
-PORTVERSION= 4.2.11
-PORTREVISION= 1
+PORTVERSION= 4.2.14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index 6b3d849751a7..a36ec1292674 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.11.tar.gz) = 2dbed43057d1a4091c8218e28ebb2d5f2bced7912f94c7fd4e1ae1212946e054
-SIZE (cabal/hoogle-4.2.11.tar.gz) = 115155
+SHA256 (cabal/hoogle-4.2.14.tar.gz) = 32af22fa4c1ecd87c1ab67e196e11e0db6e8805723c3adecf3cb8adb3f72b5fa
+SIZE (cabal/hoogle-4.2.14.tar.gz) = 118457
diff --git a/devel/hs-hoogle/pkg-descr b/devel/hs-hoogle/pkg-descr
index 9daa8c9e53f7..adc9fc133bd2 100644
--- a/devel/hs-hoogle/pkg-descr
+++ b/devel/hs-hoogle/pkg-descr
@@ -2,4 +2,4 @@ Hoogle is a Haskell API search engine, which allows you to search many
standard Haskell libraries by either function name, or by approximate type
signature.
-WWW: http://www.haskell.org/hoogle/
+WWW: http://www.haskell.org/hoogle/
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 72cb44f65eab..cbbef5cfc071 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for: hs-hslogger
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= hslogger
-PORTVERSION= 1.1.5
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Versatile logging framework for Haskell
+COMMENT= Versatile logging framework
LICENSE= BSD
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index 898508ca57ee..7b9d53dc3117 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslogger-1.1.5.tar.gz) = 676ea4d926eeac1a930d76a3a32b921f8550e8ff973c595e93d2f7ae99316952
-SIZE (cabal/hslogger-1.1.5.tar.gz) = 35632
+SHA256 (cabal/hslogger-1.2.1.tar.gz) = c5538c3f79b9e8aac97a6f1377c82b9f70b88ee5e39f62f358953467e271cded
+SIZE (cabal/hslogger-1.2.1.tar.gz) = 35813
diff --git a/devel/hs-hslogger/pkg-descr b/devel/hs-hslogger/pkg-descr
index b6ba6797caae..3b616f2f672d 100644
--- a/devel/hs-hslogger/pkg-descr
+++ b/devel/hs-hslogger/pkg-descr
@@ -1,9 +1,7 @@
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.
+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-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
new file mode 100644
index 000000000000..a8b9a4e7d8a1
--- /dev/null
+++ b/devel/hs-hspec-expectations/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= hspec-expectations
+PORTVERSION= 0.3.0.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Catchy combinators for HUnit
+
+LICENSE= MIT
+
+USE_CABAL= HUnit
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
new file mode 100644
index 000000000000..9f5decfcbd9f
--- /dev/null
+++ b/devel/hs-hspec-expectations/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hspec-expectations-0.3.0.3.tar.gz) = e4601065616f67ae345bee79bac883701a6f79772309c535a7a1e5c7aa5becde
+SIZE (cabal/hspec-expectations-0.3.0.3.tar.gz) = 3659
diff --git a/devel/hs-hspec-expectations/pkg-descr b/devel/hs-hspec-expectations/pkg-descr
new file mode 100644
index 000000000000..25a4e696f718
--- /dev/null
+++ b/devel/hs-hspec-expectations/pkg-descr
@@ -0,0 +1,3 @@
+Catchy combinators for HUnit.
+
+WWW: https://github.com/sol/hspec-expectations#readme
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 821804fd044b..5983d2a030cb 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-hspec
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hspec
-PORTVERSION= 1.2.0.1
+PORTVERSION= 1.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,8 +9,10 @@ COMMENT= Behavior Driven Development for Haskell
LICENSE= BSD
-USE_CABAL= ansi-terminal==0.5.5_4 HUnit>=1 QuickCheck>=2.4.0.1 \
- silently>=1.1.1 transformers>=0.2.0
+USE_CABAL= ansi-terminal==0.5.5_5 hspec-expectations HUnit>=1.2.5 \
+ QuickCheck>=2.4.0.1 setenv silently>=1.1.1 transformers>=0.2.0
+
+EXECUTABLE= hspec-discover
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 9ae122ccaed0..2f980c7057eb 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.2.0.1.tar.gz) = ae9a078103a639061e20d4fe5d51f1d3fa7bfe3be6e34ba01cf90623b8f0a912
-SIZE (cabal/hspec-1.2.0.1.tar.gz) = 10370
+SHA256 (cabal/hspec-1.4.2.tar.gz) = 98958b685b5f7ead7fdd831aec6e0a7a866a03937a117014f36fba10cb359562
+SIZE (cabal/hspec-1.4.2.tar.gz) = 16278
diff --git a/devel/hs-hspec/pkg-descr b/devel/hs-hspec/pkg-descr
index 9392f9a17cce..b609ae0a9673 100644
--- a/devel/hs-hspec/pkg-descr
+++ b/devel/hs-hspec/pkg-descr
@@ -3,4 +3,4 @@ Ruby library RSpec. However, Hspec is just a framework for running
HUnit and QuickCheck tests. Compared to other options, it provides a
much nicer syntax that makes tests very easy to read.
-WWW: http://hspec.github.com/
+WWW: http://hspec.github.com/
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 7660546f2074..5fb63e48c16e 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: idoc
-# Date created: 25 October 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
PORTNAME= idoc
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
new file mode 100644
index 000000000000..80345f408030
--- /dev/null
+++ b/devel/hs-kqueue/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= kqueue
+PORTVERSION= 0.1.2.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A binding to the kqueue event library
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= mtl>=1.1
+USE_C2HS= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-kqueue/distinfo b/devel/hs-kqueue/distinfo
new file mode 100644
index 000000000000..443e6c2eb685
--- /dev/null
+++ b/devel/hs-kqueue/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/kqueue-0.1.2.4.tar.gz) = f9aa0609a8ce74857068e66f014851542e61f5c97ac144327028a66e33a47740
+SIZE (cabal/kqueue-0.1.2.4.tar.gz) = 7342
diff --git a/devel/hs-kqueue/files/patch-src__System__KQueue.chs b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
new file mode 100644
index 000000000000..f5a9586bc0dd
--- /dev/null
+++ b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
@@ -0,0 +1,41 @@
+--- ./src/System/KQueue.chs.orig 2012-01-03 14:00:32.000000000 +0100
++++ ./src/System/KQueue.chs 2012-01-27 07:17:17.000000000 +0100
+@@ -21,6 +21,7 @@
+
+ #include <sys/time.h>
+ #include <sys/event.h>
++#include "MachDeps.h"
+
+ import Control.Applicative ( (<$>), (<*>) )
+ import Control.Exception ( Exception, throwIO )
+@@ -62,11 +63,19 @@
+
+ -- | A kernel event.
+ data KEvent = KEvent
++#if SIZEOF_HSWORD == 4
++ { ident :: CUInt -- ^ The identifier for the event, often a file descriptor.
++#else
+ { ident :: CULong -- ^ The identifier for the event, often a file descriptor.
++#endif
+ , evfilter :: Filter -- ^ The kernel filter (type of event).
+ , flags :: [Flag] -- ^ Actions to perform on the event.
+ , fflags :: [FFlag] -- ^ Filter-specific flags.
++#if SIZEOF_HSWORD == 4
++ , data_ :: CInt -- ^ Filter-specific data value.
++#else
+ , data_ :: CLong -- ^ Filter-specific data value.
++#endif
+ , udata :: Ptr () -- ^ User-defined data, passed through unchanged.
+ } deriving (Show, Eq)
+
+@@ -122,8 +131,10 @@
+ , NoteExit = NOTE_EXIT
+ , NoteFork = NOTE_FORK
+ , NoteExec = NOTE_EXEC
++#ifndef __FreeBSD__
+ , NoteSignal = NOTE_SIGNAL
+ , NoteReap = NOTE_REAP
++#endif
+ };
+ #endc
+
diff --git a/devel/hs-kqueue/pkg-descr b/devel/hs-kqueue/pkg-descr
new file mode 100644
index 000000000000..e5de30724d1d
--- /dev/null
+++ b/devel/hs-kqueue/pkg-descr
@@ -0,0 +1,5 @@
+A low-level binding to the kqueue library as found in BSD and Mac OS X.
+It provides, among other things, a way of monitoring files and directories
+for changes.
+
+WWW: http://github.com/hesselink/kqueue
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 421cce3d85e8..47e62d59ba55 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-language-c-ghc
-# Date created: March 2, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= language-c
PORTVERSION= 0.3.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 995162770277..9a36c77cfdc5 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-language-javascript
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= language-javascript
-PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTVERSION= 0.5.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index 4c81937f5dff..bc5691944c91 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-javascript-0.5.4.tar.gz) = 38ad4d75b30720aff44cc8af77c68a546e64a8369b2a7cef6caccf3bac085d42
-SIZE (cabal/language-javascript-0.5.4.tar.gz) = 95431
+SHA256 (cabal/language-javascript-0.5.7.tar.gz) = a3a9924a212d28afa06ce97a9d52d6352da852549b89f44efd5ecd8e17f8cd56
+SIZE (cabal/language-javascript-0.5.7.tar.gz) = 96118
diff --git a/devel/hs-language-javascript/pkg-descr b/devel/hs-language-javascript/pkg-descr
index 5d771b451af2..b7da79b659f9 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/alanz/language-javascript
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 5f10130e80b2..2830da05964f 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-largeword
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= largeword
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index c67cc0ff213c..c77d620f3b0b 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/largeword-1.0.1.tar.gz) = d93f9150c7d01531442c0362b07f5c38420da90f8698299a1a577120c464734e
-SIZE (cabal/largeword-1.0.1.tar.gz) = 1839
+SHA256 (cabal/largeword-1.0.3.tar.gz) = 6fee917834de18d5df6a45bf1535fb9dd989045a0c609757e384731630b466a1
+SIZE (cabal/largeword-1.0.3.tar.gz) = 2967
diff --git a/devel/hs-largeword/pkg-descr b/devel/hs-largeword/pkg-descr
index 7951c5902fb4..6cd8d083ab73 100644
--- a/devel/hs-largeword/pkg-descr
+++ b/devel/hs-largeword/pkg-descr
@@ -1,4 +1,4 @@
Provides Word128, Word192 and Word256 and a way of producing other large
words if required.
-WWW: http://trac.haskell.org/largeword/wiki
+WWW: http://trac.haskell.org/largeword/wiki
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index fd474318b338..a10d699ae723 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-lazysmallcheck-ghc
-# Date created: March 11, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index a676eff1b11f..63395e37ce5d 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-lifted-base
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= lifted-base
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index f8c43569a4fb..182a5dc92431 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.1.1.tar.gz) = 759300ba3eaf4e78455066c438c3f64ccffd6af5d80550bf4d0075c57f180691
-SIZE (cabal/lifted-base-0.1.1.tar.gz) = 10640
+SHA256 (cabal/lifted-base-0.2.tar.gz) = cb4958e56f0d60e1a6ea60469633b7821ad6f4be342b50d477a6e9b038195189
+SIZE (cabal/lifted-base-0.2.tar.gz) = 11556
diff --git a/devel/hs-lifted-base/pkg-descr b/devel/hs-lifted-base/pkg-descr
index 312558291b2b..bd832d764e4a 100644
--- a/devel/hs-lifted-base/pkg-descr
+++ b/devel/hs-lifted-base/pkg-descr
@@ -1,4 +1,4 @@
lifted-base exports IO operations from the base library lifted to any
instance of MonadBase or MonadBaseControl.
-WWW: https://github.com/basvandijk/lifted-base
+WWW: https://github.com/basvandijk/lifted-base
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 1d9be4f7e32b..4f92a7f9e3c6 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-logict
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= logict
-PORTVERSION= 0.5.0.1
-PORTREVISION= 1
+PORTVERSION= 0.5.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/distinfo b/devel/hs-logict/distinfo
index ac4fdda480dc..e040c23d541b 100644
--- a/devel/hs-logict/distinfo
+++ b/devel/hs-logict/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/logict-0.5.0.1.tar.gz) = fb5bc4007f59be6498a415d06844621c0eb24a7705cdf315261f43ee0c676a4c
-SIZE (cabal/logict-0.5.0.1.tar.gz) = 5271
+SHA256 (cabal/logict-0.5.0.2.tar.gz) = 3fe821d0d69259599a24ead377746f558d841e4027c0c471eb6b070368290a54
+SIZE (cabal/logict-0.5.0.2.tar.gz) = 5276
diff --git a/devel/hs-logict/pkg-descr b/devel/hs-logict/pkg-descr
index a6eedda3715b..1983b695da40 100644
--- a/devel/hs-logict/pkg-descr
+++ b/devel/hs-logict/pkg-descr
@@ -4,4 +4,4 @@ adaptation of the two-continuation implementation found in the paper
[1] http://okmij.org/ftp/papers/LogicT.pdf
-WWW: http://code.haskell.org/~dolio/logict
+WWW: http://code.haskell.org/~dolio/logict
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index 617c00694b48..ac16734ee28c 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -1,11 +1,9 @@
-# New ports collection makefile for: hs-mmap
-# Date created: July 09 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= mmap
PORTVERSION= 0.5.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmap/pkg-descr b/devel/hs-mmap/pkg-descr
index 7d753fbb267e..c1d1e1c6a89d 100644
--- a/devel/hs-mmap/pkg-descr
+++ b/devel/hs-mmap/pkg-descr
@@ -3,4 +3,4 @@ devices to be lazily loaded into memory as strict or lazy ByteStrings,
ForeignPtrs or plain Ptrs, using the virtual memory subsystem to do on-demand
loading. Modifications are also supported.
-WWW: http://hackage.haskell.org/packages/archive/mmap
+WWW: http://hackage.haskell.org/packages/archive/mmap
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 911cbbbdfeea..0acb874d6e11 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-monad-control
-# Date created: September 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= monad-control
-PORTVERSION= 0.3.1.3
-PORTREVISION= 1
+PORTVERSION= 0.3.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index b256034badfe..f167072351b7 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-control-0.3.1.3.tar.gz) = 69cb7b6967417e6477002255c7af2cd54cd7894782d8a753281033065196a06b
-SIZE (cabal/monad-control-0.3.1.3.tar.gz) = 10294
+SHA256 (cabal/monad-control-0.3.1.4.tar.gz) = c17fd5fa094044816ab79158a00fa7a9fd8b35dfea27e1eecc4d4049b3916c57
+SIZE (cabal/monad-control-0.3.1.4.tar.gz) = 10338
diff --git a/devel/hs-monad-control/pkg-descr b/devel/hs-monad-control/pkg-descr
index 2acc2dd194a4..26c8761cdddf 100644
--- a/devel/hs-monad-control/pkg-descr
+++ b/devel/hs-monad-control/pkg-descr
@@ -4,4 +4,4 @@ lifted from IO or any other base monad. Instances are based on monad
transformers in MonadTransControl, which includes all standard monad
transformers in the transformers library except ContT.
-WWW: https://github.com/basvandijk/monad-control
+WWW: https://github.com/basvandijk/monad-control
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
new file mode 100644
index 000000000000..8abb9f9ceaac
--- /dev/null
+++ b/devel/hs-monad-logger/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= monad-logger
+PORTVERSION= 0.2.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A class of monads which can log messages
+
+LICENSE= MIT
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= conduit>=0.5 fast-logger>=0.2 monad-control mtl \
+ resourcet>=0.3 text transformers transformers-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
new file mode 100644
index 000000000000..c1e2fce29c76
--- /dev/null
+++ b/devel/hs-monad-logger/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/monad-logger-0.2.3.tar.gz) = a39ac84cd2bc98935e42223c4c6dbca25c209f050191958c33ff2c3573d89c10
+SIZE (cabal/monad-logger-0.2.3.tar.gz) = 4468
diff --git a/devel/hs-monad-logger/pkg-descr b/devel/hs-monad-logger/pkg-descr
new file mode 100644
index 000000000000..39e2f11e5b65
--- /dev/null
+++ b/devel/hs-monad-logger/pkg-descr
@@ -0,0 +1,4 @@
+This package uses template-haskell for determining source code locations
+of messages.
+
+WWW: https://github.com/kazu-yamamoto/logger
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index ff2c384ac529..df8560480f91 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-monad-par-extras
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= monad-par-extras
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/pkg-descr b/devel/hs-monad-par-extras/pkg-descr
index 71a34cc7bbd3..07ac21dba7b4 100644
--- a/devel/hs-monad-par-extras/pkg-descr
+++ b/devel/hs-monad-par-extras/pkg-descr
@@ -1,4 +1,4 @@
The modules below provide additional data structures, and other added
capabilities layered on top of the Par monad.
-WWW: https://github.com/simonmar/monad-par
+WWW: https://github.com/simonmar/monad-par
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 5fece4da14fa..167a4b0457c4 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-monad-par
-# Date created: July 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= monad-par
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/pkg-descr b/devel/hs-monad-par/pkg-descr
index f9842e124919..67b988eb2063 100644
--- a/devel/hs-monad-par/pkg-descr
+++ b/devel/hs-monad-par/pkg-descr
@@ -6,4 +6,4 @@ supports forking and simple communication in terms of IVars. The library
comes with an efficient work-stealing implementation, but the internals
are also exposed so that you can build your own scheduler if necessary.
-WWW: http://github.com/simonmar/monad-par
+WWW: http://github.com/simonmar/monad-par
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index a35ebb2b142f..9d1019e3f7cb 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-mtl
-# Date created: 2010-05-14
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= mtl
-PORTVERSION= 2.1.1
-PORTREVISION= 1
+PORTVERSION= 2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad transformer library
+COMMENT= Monad classes, using functional dependencies
LICENSE= BSD
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 32bd14e261d3..611b054ca49e 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mtl-2.1.1.tar.gz) = 9250831796b1678380d915d2953ce94fa466af8d5c92d0c569963f0f0b037a90
-SIZE (cabal/mtl-2.1.1.tar.gz) = 13651
+SHA256 (cabal/mtl-2.1.2.tar.gz) = 8c775764333420a4391823f9cb9b640306a262552280ea9bbdd2ca11194a8bef
+SIZE (cabal/mtl-2.1.2.tar.gz) = 13723
diff --git a/devel/hs-mtl/pkg-descr b/devel/hs-mtl/pkg-descr
index d6b4f8115d41..6df11125e493 100644
--- a/devel/hs-mtl/pkg-descr
+++ b/devel/hs-mtl/pkg-descr
@@ -3,4 +3,4 @@ monad transformers, inspired by the paper "Functional Programming with
Overloading and Higher-Order Polymorphism" by Mark P Jones, in Advanced
School of Functional Programming, 1995.
-WWW: http://hackage.haskell.org/package/mtl
+WWW: http://github.com/ekmett/mtl
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 022f9d3e9908..33a228f3a5dd 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-mueval
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= mueval
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/pkg-descr b/devel/hs-mueval/pkg-descr
index 60bbcf5eadde..c68364fa4a9a 100644
--- a/devel/hs-mueval/pkg-descr
+++ b/devel/hs-mueval/pkg-descr
@@ -6,4 +6,4 @@ and so on to sandbox the Haskell code. It is, in short, intended to be a
standalone version of Lambdabot's famous evaluation functionality. For
examples and explanations, please see the README file. Mueval is POSIX-only.
-WWW: http://code.haskell.org/mubot/
+WWW: http://code.haskell.org/mubot/
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 2304c022a08a..4dc92ae2974a 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-murmur-hash
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.5
-PORTREVISION= 2
+PORTVERSION= 0.1.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 1a889ca2ede7..3e93a97a4eec 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/murmur-hash-0.1.0.5.tar.gz) = 20d7b7351ffca6d016bd476ba2736bdd7795442dbdeee5522434cfbe4ea9f9d4
-SIZE (cabal/murmur-hash-0.1.0.5.tar.gz) = 4070
+SHA256 (cabal/murmur-hash-0.1.0.6.tar.gz) = ff5a8032599c5f95eb36fd4f3231e2770f6093088e13a977260ef4a406e5d372
+SIZE (cabal/murmur-hash-0.1.0.6.tar.gz) = 4070
diff --git a/devel/hs-murmur-hash/pkg-descr b/devel/hs-murmur-hash/pkg-descr
index 9c572b0b0b3f..1993ecfc66d2 100644
--- a/devel/hs-murmur-hash/pkg-descr
+++ b/devel/hs-murmur-hash/pkg-descr
@@ -4,4 +4,4 @@ hashing function. See <http://murmurhash.googlepages.com/> for details.
This implementation is pure Haskell, so it might be a bit slower than a C
FFI binding.
-WWW: http://github.com/nominolo/murmur-hash
+WWW: http://github.com/nominolo/murmur-hash
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
new file mode 100644
index 000000000000..4ec1ecbeddf7
--- /dev/null
+++ b/devel/hs-optparse-applicative/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= optparse-applicative
+PORTVERSION= 0.4.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Utilities and combinators for parsing command line options
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= transformers>=0.2
+
+.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
new file mode 100644
index 000000000000..c5a0fe76a75c
--- /dev/null
+++ b/devel/hs-optparse-applicative/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/optparse-applicative-0.4.2.tar.gz) = 292c9735552a5656586a6764b5fa74625bc606ea7ad521980b1f12012124b443
+SIZE (cabal/optparse-applicative-0.4.2.tar.gz) = 21536
diff --git a/devel/hs-optparse-applicative/pkg-descr b/devel/hs-optparse-applicative/pkg-descr
new file mode 100644
index 000000000000..b7f10b642208
--- /dev/null
+++ b/devel/hs-optparse-applicative/pkg-descr
@@ -0,0 +1,3 @@
+Utilities and combinators for parsing command line options.
+
+WWW: https://github.com/pcapriotti/optparse-applicative
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index e081d52cf0bd..9ccdbfeb73c0 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-parallel
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= parallel
-PORTVERSION= 3.2.0.2
-PORTREVISION= 1
+PORTVERSION= 3.2.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index d8f63921cf0b..394ba677b4fb 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parallel-3.2.0.2.tar.gz) = 82569faa2ca3245c61cc71731abd7d3595372d4cf09c659ee52740be1a3bc66b
-SIZE (cabal/parallel-3.2.0.2.tar.gz) = 12528
+SHA256 (cabal/parallel-3.2.0.3.tar.gz) = 163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd
+SIZE (cabal/parallel-3.2.0.3.tar.gz) = 12527
diff --git a/devel/hs-parallel/pkg-descr b/devel/hs-parallel/pkg-descr
index 7ee9933b2730..20d72b9b9cab 100644
--- a/devel/hs-parallel/pkg-descr
+++ b/devel/hs-parallel/pkg-descr
@@ -1,3 +1,3 @@
This package provides a library for parallel programming.
-WWW: http://hackage.haskell.org/package/parallel
+WWW: http://hackage.haskell.org/package/parallel
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index c9e3e3be11ee..be22f9e1eee5 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: pcre-light
-# Date created: December 16, 2008
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= pcre-light
PORTVERSION= 0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
index 45d47ca7d347..ca69f42eb3ad 100644
--- a/devel/hs-pool-conduit/Makefile
+++ b/devel/hs-pool-conduit/Makefile
@@ -1,19 +1,13 @@
-# New ports collection makefile for: hs-pool-conduit
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pool-conduit
-PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTVERSION= 0.1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Resource pool allocations via ResourceT
-LICENSE= BSD
+LICENSE= MIT
USE_CABAL= resource-pool>=0.2.1 resourcet>=0.3 transformers>=0.2.1
diff --git a/devel/hs-pool-conduit/distinfo b/devel/hs-pool-conduit/distinfo
index 046b521b3a9f..3a7f2c111cf1 100644
--- a/devel/hs-pool-conduit/distinfo
+++ b/devel/hs-pool-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pool-conduit-0.1.0.2.tar.gz) = 7efaa2e776359d3f75ee2d981b0e84a2f53a34d857b810804d936dbda79e42bb
-SIZE (cabal/pool-conduit-0.1.0.2.tar.gz) = 2066
+SHA256 (cabal/pool-conduit-0.1.0.3.tar.gz) = a9abd59d2b63dc6de99d73381fde66777485a9d671fdc5ac4acd75700e592561
+SIZE (cabal/pool-conduit-0.1.0.3.tar.gz) = 2067
diff --git a/devel/hs-pool-conduit/pkg-descr b/devel/hs-pool-conduit/pkg-descr
index 84fca905d372..b870847700ae 100644
--- a/devel/hs-pool-conduit/pkg-descr
+++ b/devel/hs-pool-conduit/pkg-descr
@@ -1,4 +1,4 @@
Allocate resources from a pool, guaranteeing resource handling via the
ResourceT transformer.
-WWW: http://www.yesodweb.com/book/persistent
+WWW: http://www.yesodweb.com/book/persistent
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index b1ddb500d803..d1c012eb9eeb 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-primitive
-# Date created: June 5, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= primitive
-PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTVERSION= 0.5.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Wrappers for primitive operations
+COMMENT= Primitive memory-related operations
LICENSE= BSD
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 6b27bf170c4e..20184ed76901 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/primitive-0.4.1.tar.gz) = c69dd5e2a4da743037c51d5b626ab4f4bc3d7f023664bb9ae372c39e4a4c2919
-SIZE (cabal/primitive-0.4.1.tar.gz) = 9058
+SHA256 (cabal/primitive-0.5.0.1.tar.gz) = 526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313
+SIZE (cabal/primitive-0.5.0.1.tar.gz) = 10372
diff --git a/devel/hs-primitive/pkg-descr b/devel/hs-primitive/pkg-descr
index 29c4e5982e1a..f01b8ae8ab68 100644
--- a/devel/hs-primitive/pkg-descr
+++ b/devel/hs-primitive/pkg-descr
@@ -1,4 +1,3 @@
-This package provides wrappers for primitive array operations from
-GHC.Prim.
+This package provides wrappers for primitive array operations.
WWW: http://code.haskell.org/primitive
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
new file mode 100644
index 000000000000..ad596b06de39
--- /dev/null
+++ b/devel/hs-project-template/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= project-template
+PORTVERSION= 0.1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Specify Haskell project templates and generate files
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= base64-bytestring classy-prelude-conduit>=0.4 conduit>=0.5.4 \
+ mtl>=2.0 system-fileio>=0.3 system-filepath>=0.4 text>=0.11 \
+ transformers>=0.2
+
+.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
new file mode 100644
index 000000000000..1476eddae170
--- /dev/null
+++ b/devel/hs-project-template/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/project-template-0.1.0.1.tar.gz) = 43c41931b9428f6a69c030e91544ee6bb5a034063ca570a443df23621d6d152a
+SIZE (cabal/project-template-0.1.0.1.tar.gz) = 3689
diff --git a/devel/hs-project-template/pkg-descr b/devel/hs-project-template/pkg-descr
new file mode 100644
index 000000000000..6ed4883c94be
--- /dev/null
+++ b/devel/hs-project-template/pkg-descr
@@ -0,0 +1,3 @@
+Specify Haskell project templates and generate files.
+
+WWW: https://github.com/fpco/haskell-ide
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index 7889efc3d48c..0079c12fbb7c 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-random
-# Date created: May 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= random
PORTVERSION= 1.0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/pkg-descr b/devel/hs-random/pkg-descr
index d933cfaddff3..95ada75efb76 100644
--- a/devel/hs-random/pkg-descr
+++ b/devel/hs-random/pkg-descr
@@ -1,4 +1,4 @@
This package provides a basic random number generation library, including
the ability to split random number generators.
-WWW: http://hackage.haskell.org/package/random
+WWW: http://hackage.haskell.org/package/random
diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile
index 39e13f3753a9..9d693eb5686a 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-ranges/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-ranges
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= ranges
PORTVERSION= 0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ranges/pkg-descr b/devel/hs-ranges/pkg-descr
index 6c37d38607bc..80a74326a39b 100644
--- a/devel/hs-ranges/pkg-descr
+++ b/devel/hs-ranges/pkg-descr
@@ -1,4 +1,4 @@
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
+WWW: http://hackage.haskell.org/package/ranges
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index ac2c97030b63..3708ed0283e4 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-reactive
-# Date created: January 07 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= reactive
PORTVERSION= 0.11.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Future.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Future.hs
index b1aff91a64cb..805779cf2397 100644
--- a/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Future.hs
+++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Future.hs
@@ -1,5 +1,5 @@
--- ./src/FRP/Reactive/Internal/Future.hs.orig 2010-07-28 18:48:55.000000000 +0200
-+++ ./src/FRP/Reactive/Internal/Future.hs 2011-07-16 11:01:46.000000000 +0200
++++ ./src/FRP/Reactive/Internal/Future.hs 2012-10-04 23:19:51.000000000 +0200
@@ -23,7 +23,8 @@
import Control.Applicative (Applicative(..))
@@ -10,12 +10,3 @@
import Test.QuickCheck
-@@ -44,7 +45,7 @@
- -- time\/value pair. Particularly useful with time types that have
- -- non-flat structure.
- newtype FutureG t a = Future { unFuture :: (Time t, a) }
-- deriving (Functor, Applicative, Monad, Copointed, Comonad {-, Show-}
-+ deriving (Functor, Applicative, Monad, Extend, Copointed, Comonad {-, Show-}
- , Arbitrary, CoArbitrary)
-
- isNeverF :: (Bounded t, Eq t) => FutureG t t1 -> Bool
diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs
index 6c53c4280011..395aefb4fbc0 100644
--- a/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs
+++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs
@@ -1,5 +1,5 @@
--- ./src/FRP/Reactive/PrimReactive.hs.orig 2010-07-28 18:48:55.000000000 +0200
-+++ ./src/FRP/Reactive/PrimReactive.hs 2012-05-13 12:51:24.045468968 +0200
++++ ./src/FRP/Reactive/PrimReactive.hs 2012-10-04 23:37:49.000000000 +0200
@@ -63,6 +63,8 @@
import Prelude hiding (zip,zipWith)
@@ -9,6 +9,15 @@
import Control.Applicative
import Control.Arrow (first)
import Control.Monad
+@@ -78,7 +80,7 @@
+
+ import Control.Comonad
+
+-import Test.QuickCheck
++import Test.QuickCheck hiding (once)
+ import Test.QuickCheck.Instances
+ import Test.QuickCheck.Checkers
+ import Test.QuickCheck.Classes
@@ -708,17 +710,7 @@
instance Copointed (EventG t) where
@@ -28,7 +37,7 @@
-- This frTOrf definition type-checks. Is it what we want?
frTOrf :: FutureG t (ReactiveG t a) -> ReactiveG t (FutureG t a)
-@@ -738,14 +730,14 @@
+@@ -738,7 +730,7 @@
-- Semantically: extract == extract . rat == (`rat` mempty) But mempty
-- is the earliest time (since I'm using the Max monoid *), so here's a
-- cheap alternative that also doesn't require Ord t:
@@ -37,14 +46,6 @@
-- extract r == extract (rat r) == rat r mempty
- -- * Moreover, mempty is the earliest time in the Sum monoid on
- -- non-negative values, for relative-time behaviors.
-
--instance Monoid t => Comonad (ReactiveG t) where
-+instance Monoid t => Extend (ReactiveG t) where
- duplicate r@(_ `Stepper` Event u) =
- r `Stepper` Event (duplicate <$> u)
-
@@ -872,13 +864,13 @@
toListE_ = map futVal . toListE
-}
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 560a8f6cdfb7..276a3e4805b7 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-readline
-# Date created: July 09 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= readline
PORTVERSION= 1.0.1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 53caf824a4d1..8b0fdc2be095 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-resource-pool
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= resource-pool
-PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTVERSION= 0.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resource-pool/distinfo b/devel/hs-resource-pool/distinfo
index c91fa7c60638..135b3b97cc3a 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resource-pool-0.2.1.0.tar.gz) = 0795060e79dad0876b6082f713f66ae4d8be12fd536e3ee0a936500352745389
-SIZE (cabal/resource-pool-0.2.1.0.tar.gz) = 5044
+SHA256 (cabal/resource-pool-0.2.1.1.tar.gz) = 2fc44795d068b32a4f37a576ce94a0a32a954dcf3f6af8b259ead6598ffffefa
+SIZE (cabal/resource-pool-0.2.1.1.tar.gz) = 5029
diff --git a/devel/hs-resource-pool/pkg-descr b/devel/hs-resource-pool/pkg-descr
index e6c4797e4a26..ce39173ec084 100644
--- a/devel/hs-resource-pool/pkg-descr
+++ b/devel/hs-resource-pool/pkg-descr
@@ -1,4 +1,4 @@
A high-performance striped pooling abstraction for managing flexibly-sized
collections of resources such as database connections.
-WWW: http://github.com/bos/pool
+WWW: http://github.com/bos/pool
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 815a0e277b67..2c1094fefd41 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-resourcet
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= resourcet
-PORTVERSION= 0.3.3.1
+PORTVERSION= 0.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index 621f59a822ca..ff766ed45b6e 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-0.3.3.1.tar.gz) = b4c9e767282a8d4a11d8430b47a6001283b56fa14d4d593e27350e89c0159998
-SIZE (cabal/resourcet-0.3.3.1.tar.gz) = 7357
+SHA256 (cabal/resourcet-0.4.4.tar.gz) = 3f8c9cfc3b91d1b2247dbb3d667b85cc516ff72b69419617691127ba0e85a129
+SIZE (cabal/resourcet-0.4.4.tar.gz) = 8515
diff --git a/devel/hs-resourcet/pkg-descr b/devel/hs-resourcet/pkg-descr
index ac125909da28..1d3620bef6b7 100644
--- a/devel/hs-resourcet/pkg-descr
+++ b/devel/hs-resourcet/pkg-descr
@@ -1,4 +1,4 @@
This package was originally included with the conduit package, and has
since been split off.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index 795867ddfe1f..f0989548dcb9 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-safe
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= safe
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
new file mode 100644
index 000000000000..1353bc2c54f8
--- /dev/null
+++ b/devel/hs-setenv/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= setenv
+PORTVERSION= 0.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A cross-platform library for setting environment variables
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
new file mode 100644
index 000000000000..ea99ef169268
--- /dev/null
+++ b/devel/hs-setenv/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/setenv-0.1.0.tar.gz) = 5e37d7a0a7abe3830fdb42cbba39f9b707f35a8affa770656645e7e5ee128413
+SIZE (cabal/setenv-0.1.0.tar.gz) = 2478
diff --git a/devel/hs-setenv/pkg-descr b/devel/hs-setenv/pkg-descr
new file mode 100644
index 000000000000..a2773485639b
--- /dev/null
+++ b/devel/hs-setenv/pkg-descr
@@ -0,0 +1,3 @@
+A cross-platform library for setting environment variables.
+
+WWW: http://hackage.haskell.org/package/setenv
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index bed2712bee18..6e1fd6367532 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-show
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= show
PORTVERSION= 0.4.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index 899748c5e87d..922c156abf56 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-silently
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= silently
-PORTVERSION= 1.2.0.2
+PORTVERSION= 1.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index e9ad0c87851e..634a7f5622ea 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/silently-1.2.0.2.tar.gz) = a1560c3840b9923eeb0b52fafbf8e197348c0ee1fc89b01383a10c68e5ca9761
-SIZE (cabal/silently-1.2.0.2.tar.gz) = 3120
+SHA256 (cabal/silently-1.2.4.tar.gz) = b2d01ebe18c07313564253bd755a439b5e6f9dc2cc49b3f7ddc69464c92a8729
+SIZE (cabal/silently-1.2.4.tar.gz) = 3140
diff --git a/devel/hs-silently/pkg-descr b/devel/hs-silently/pkg-descr
index 84ac5d6941dc..de5c2067971b 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/trystan/silently
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
new file mode 100644
index 000000000000..eca8af8e52eb
--- /dev/null
+++ b/devel/hs-simple-reflect/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= simple-reflect
+PORTVERSION= 0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple reflection of expressions containing variables
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
new file mode 100644
index 000000000000..38757a83b136
--- /dev/null
+++ b/devel/hs-simple-reflect/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/simple-reflect-0.2.tar.gz) = 83a2beaffa7d57401abbe208d9f95216f69e8ff07f71b7163621899964629c6b
+SIZE (cabal/simple-reflect-0.2.tar.gz) = 4166
diff --git a/devel/hs-simple-reflect/pkg-descr b/devel/hs-simple-reflect/pkg-descr
new file mode 100644
index 000000000000..a0e47cf36f14
--- /dev/null
+++ b/devel/hs-simple-reflect/pkg-descr
@@ -0,0 +1,6 @@
+This package allows simple reflection of expressions containing variables.
+Reflection here means that a Haskell expression is turned into a string.
+The primary aim of this package is teaching and understanding; there are
+no options for manipulating the reflected expressions beyond showing them.
+
+WWW: http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index b312f0c7eb8a..59ed10b5dfd3 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-smallcheck
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= smallcheck
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/pkg-descr b/devel/hs-smallcheck/pkg-descr
index 84132e9abc30..f8c9459977b2 100644
--- a/devel/hs-smallcheck/pkg-descr
+++ b/devel/hs-smallcheck/pkg-descr
@@ -2,4 +2,4 @@ SmallCheck is a testing library that allows to verify properties for all
test cases up to some depth. The test cases are generated automatically
by SmallCheck.
-WWW: https://github.com/feuerbach/smallcheck
+WWW: https://github.com/feuerbach/smallcheck
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index adcfbe93d63d..93c2c74327d4 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-split
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= split
-PORTVERSION= 0.1.4.3
+PORTVERSION= 0.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index b6752b193634..ef10b9e027ac 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/split-0.1.4.3.tar.gz) = 7e69989206e26bb28f46cc8cf1edff5e439aa6be4adbc5b09118d6fdc1aa3bc5
-SIZE (cabal/split-0.1.4.3.tar.gz) = 12882
+SHA256 (cabal/split-0.2.1.1.tar.gz) = bf36c149a6613fc6be78ec170ae98a696aae887b82434a1439da10e47823f7ff
+SIZE (cabal/split-0.2.1.1.tar.gz) = 14046
diff --git a/devel/hs-split/pkg-descr b/devel/hs-split/pkg-descr
index 201803a01e2e..d6e9a02f4eee 100644
--- a/devel/hs-split/pkg-descr
+++ b/devel/hs-split/pkg-descr
@@ -1,3 +1,19 @@
+A collection of various methods for splitting lists into parts, akin to
+the "split" function found in several mainstream languages. Here is its
+tale:
+
+Once upon a time the standard Data.List module held no function for
+splitting a list into parts according to a delimiter. Many a brave
+lambda-knight strove to add such a function, but their striving was in
+vain, for Lo, the Supreme Council fell to bickering amongst themselves
+what was to be the essential nature of the One True Function which could
+cleave a list in twain (or thrain, or any required number of parts).
+
+And thus came to pass the split package, comprising divers functions for
+splitting a list asunder, each according to its nature. And the Supreme
+Council had no longer any grounds for argument, for the favored method
+of each was contained therein.
+
Combinator library and utility functions for splitting lists.
-WWW: http://code.haskell.org/~byorgey/code/split
+WWW: http://hackage.haskell.org/package/split
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 32cfd8df3599..c79088344fc9 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-stm
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= stm
-PORTVERSION= 2.3
-PORTREVISION= 1
+PORTVERSION= 2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 67d1ea0234a5..5d40dd0143a3 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-2.3.tar.gz) = 557f5ad39292ee862b1ce22ed96be03130b404b43288380e6fd8ee3a71a0418c
-SIZE (cabal/stm-2.3.tar.gz) = 6649
+SHA256 (cabal/stm-2.4.tar.gz) = d495f0c70a958e749cb6fe51db57ba358312066c5c498cce5516db2de0f7d48d
+SIZE (cabal/stm-2.4.tar.gz) = 9043
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 932110dfd872..794de1085c81 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-strict
-# Date created: May 14, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/pkg-descr b/devel/hs-strict/pkg-descr
index 9c2c5e181056..8c556ef51e03 100644
--- a/devel/hs-strict/pkg-descr
+++ b/devel/hs-strict/pkg-descr
@@ -1,4 +1,4 @@
This package provides strict versions of some standard Haskell data
types (pairs, Maybe and Either). It also contains strict IO operations.
-WWW: http://www.cse.unsw.edu.au/~rl/code/strict.html
+WWW: http://www.cse.unsw.edu.au/~rl/code/strict.html
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index 22f2d421b879..f444b61166e8 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-syb-with-class-instances-text
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/pkg-descr b/devel/hs-syb-with-class-instances-text/pkg-descr
index 46ed4c80f3c9..1f2b7d81c006 100644
--- a/devel/hs-syb-with-class-instances-text/pkg-descr
+++ b/devel/hs-syb-with-class-instances-text/pkg-descr
@@ -1,3 +1,3 @@
Provides SYB-with-class instances for Text from the text package.
-WWW: http://hackage.haskell.org/package/syb-with-class-instances-text
+WWW: http://hackage.haskell.org/package/syb-with-class-instances-text
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 393908678351..1935304de638 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-syb-with-class
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.3
-PORTREVISION= 2
+PORTVERSION= 0.6.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 34557d84601d..6316c1522657 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.3.tar.gz) = 2df95462d1f29d843105bbfd7dc936b7a4029cbb86d45dd564b47c75a04ab236
-SIZE (cabal/syb-with-class-0.6.1.3.tar.gz) = 12311
+SHA256 (cabal/syb-with-class-0.6.1.4.tar.gz) = 6cba1af7474ecbb3ac8040dc46d994e9e8b9fede3bc8daa610e4044054a8263a
+SIZE (cabal/syb-with-class-0.6.1.4.tar.gz) = 12349
diff --git a/devel/hs-syb-with-class/pkg-descr b/devel/hs-syb-with-class/pkg-descr
index db7e7cefbee2..dcdb30013926 100644
--- a/devel/hs-syb-with-class/pkg-descr
+++ b/devel/hs-syb-with-class/pkg-descr
@@ -1,4 +1,4 @@
Classes, and Template Haskell code to generate instances, for the Scrap
Your Boilerplate With Class system.
-WWW: http://hackage.haskell.org/package/syb-with-class
+WWW: http://hackage.haskell.org/package/syb-with-class
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 2c547fd156b0..82c375a6135b 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-syb
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= syb
-PORTVERSION= 0.3.6.1
-PORTREVISION= 1
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index 641fdd820fab..4913058e8d68 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-0.3.6.1.tar.gz) = 646cfc8feaa2625bbac94675ee51256de69ebfcf35d760cbfa39aaeda132dff7
-SIZE (cabal/syb-0.3.6.1.tar.gz) = 38422
+SHA256 (cabal/syb-0.3.7.tar.gz) = 59f4058a8182a472c0e0e35f8aca836470a5785d3dcd01e3d44bb188c850da73
+SIZE (cabal/syb-0.3.7.tar.gz) = 39091
diff --git a/devel/hs-syb/pkg-descr b/devel/hs-syb/pkg-descr
index 84962484b5e0..c0e973a0d899 100644
--- a/devel/hs-syb/pkg-descr
+++ b/devel/hs-syb/pkg-descr
@@ -3,4 +3,4 @@ Boilerplate" papers. It defines the "Data" class of types permitting
folding and unfolding of constructor applications, instances of this
class for primitive types, and a variety of traversals.
-WWW: http://www.cs.uu.nl/wiki/GenericProgramming/SYB
+WWW: http://www.cs.uu.nl/wiki/GenericProgramming/SYB
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index d6bd9614e0f1..74801fe399dc 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-system-fileio
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= system-fileio
-PORTVERSION= 0.3.8
+PORTVERSION= 0.3.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index 46a40ad51844..9d2895fc7f1c 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-fileio-0.3.8.tar.gz) = a498b5fae2389aa269b010bf8b284eb1cecad9cf116f7097a3f9e1c1fab3677f
-SIZE (cabal/system-fileio-0.3.8.tar.gz) = 15015
+SHA256 (cabal/system-fileio-0.3.10.tar.gz) = 04cf8b61e35dba6d5281f1edec46e688d7afd1a01dfa27c391bf5b61aa891ab9
+SIZE (cabal/system-fileio-0.3.10.tar.gz) = 15241
diff --git a/devel/hs-system-fileio/pkg-descr b/devel/hs-system-fileio/pkg-descr
index 3d14d899d707..0f8e8a1551b4 100644
--- a/devel/hs-system-fileio/pkg-descr
+++ b/devel/hs-system-fileio/pkg-descr
@@ -5,4 +5,4 @@ versions of GHC. In particular, this library supports working with
POSIX files that have paths which can't be decoded in the current locale
encoding.
-WWW: https://john-millikin.com/software/haskell-filesystem/
+WWW: https://john-millikin.com/software/haskell-filesystem/
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 0036679d6cfe..25790a7af3c7 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-system-filepath
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= system-filepath
-PORTVERSION= 0.4.6
-PORTREVISION= 1
+PORTVERSION= 0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index 5191fb66436f..54bdb6b5ef62 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-filepath-0.4.6.tar.gz) = 54ca52758574cc9c64d6e7186a77f34c24844f1a4c5e3a0b7fc2feb24070145d
-SIZE (cabal/system-filepath-0.4.6.tar.gz) = 13741
+SHA256 (cabal/system-filepath-0.4.7.tar.gz) = 09d93ad801ed0f9ea166c9e7bfb1d761c056f5019a5f9297f2d3fa6cfeab0b81
+SIZE (cabal/system-filepath-0.4.7.tar.gz) = 13989
diff --git a/devel/hs-system-filepath/pkg-descr b/devel/hs-system-filepath/pkg-descr
index 8a786e01757f..c57f56163c61 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://john-millikin.com/software/haskell-filesystem/
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 3de528281d04..fc1125f7d81d 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tagged
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tagged
-PORTVERSION= 0.4.2.1
-PORTREVISION= 1
+PORTVERSION= 0.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index a66765c812f4..cec3d0890bef 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagged-0.4.2.1.tar.gz) = a74cf7e0a7b03a8bd84d7a1e3b0d8bd5d6abceaadac0924d44dd1aea3d078d29
-SIZE (cabal/tagged-0.4.2.1.tar.gz) = 4488
+SHA256 (cabal/tagged-0.4.4.tar.gz) = 1d0178cbaf9922e70f17116bcef779baee2f6ded90ab2448d7e4fb3b0646882d
+SIZE (cabal/tagged-0.4.4.tar.gz) = 4970
diff --git a/devel/hs-tagged/pkg-descr b/devel/hs-tagged/pkg-descr
index fbba7ebb89ef..6b7856a96b3d 100644
--- a/devel/hs-tagged/pkg-descr
+++ b/devel/hs-tagged/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 phantom types to avoid unsafely passing dummy arguments.
-WWW: http://github.com/ekmett/tagged
+WWW: http://github.com/ekmett/tagged
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index 8bd0aa2f167b..b7d3b3be89e0 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-temporary
-# Date created: February 6, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= temporary
-PORTVERSION= 1.1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.1.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-temporary/distinfo b/devel/hs-temporary/distinfo
index 3c950300c99c..79c44b4f6156 100644
--- a/devel/hs-temporary/distinfo
+++ b/devel/hs-temporary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/temporary-1.1.2.3.tar.gz) = ad471e31c117c989aa6fe23bbc21ad3fc5f011dbdea3532048b8b1f59ea492f4
-SIZE (cabal/temporary-1.1.2.3.tar.gz) = 5195
+SHA256 (cabal/temporary-1.1.2.4.tar.gz) = 5f9ebb2aac8767c8f73c071073bea56363ea0d589df162417a988b9f856013c9
+SIZE (cabal/temporary-1.1.2.4.tar.gz) = 5220
diff --git a/devel/hs-temporary/pkg-descr b/devel/hs-temporary/pkg-descr
index 4f7c7a3ebb17..7ad3c6866b8c 100644
--- a/devel/hs-temporary/pkg-descr
+++ b/devel/hs-temporary/pkg-descr
@@ -5,4 +5,4 @@ Cabal implementations of its own temporary file and folder functions so
that you can use them without linking against Cabal or depending on it
being installed.
-WWW: http://www.github.com/batterseapower/temporary
+WWW: http://www.github.com/batterseapower/temporary
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
index d289003b51f7..8f11562a1a08 100644
--- a/devel/hs-terminfo/Makefile
+++ b/devel/hs-terminfo/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-terminfo
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= terminfo
-PORTVERSION= 0.3.2.4
+PORTVERSION= 0.3.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-terminfo/distinfo b/devel/hs-terminfo/distinfo
index b4f56c01ac66..3e1b9918427e 100644
--- a/devel/hs-terminfo/distinfo
+++ b/devel/hs-terminfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/terminfo-0.3.2.4.tar.gz) = fecc61b8ee7f85bf9df71dad00c30cda35d70c02fefa8c3ea43e3955d1f57c1a
-SIZE (cabal/terminfo-0.3.2.4.tar.gz) = 45369
+SHA256 (cabal/terminfo-0.3.2.5.tar.gz) = 6f419fa3a9afe995993f18022d6a347aedffc9a28a6974701f8421b15f584dc1
+SIZE (cabal/terminfo-0.3.2.5.tar.gz) = 45361
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 3d8d670f8bde..7e425908169f 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-test-framework-hunit
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= test-framework-hunit
-PORTVERSION= 0.2.7
-PORTREVISION= 2
+PORTVERSION= 0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/distinfo b/devel/hs-test-framework-hunit/distinfo
index a3b11ae088de..745ab5cc1e95 100644
--- a/devel/hs-test-framework-hunit/distinfo
+++ b/devel/hs-test-framework-hunit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-hunit-0.2.7.tar.gz) = cc8d21df58cdd85bb4ae5871e1a28c6a9e1c0fe618f3c899fdefd95d2211e4b0
-SIZE (cabal/test-framework-hunit-0.2.7.tar.gz) = 2633
+SHA256 (cabal/test-framework-hunit-0.3.0.tar.gz) = 04b1536f4d40f04a65d0d540c462d45c50301014c384339f19e90d9cdcba8bcb
+SIZE (cabal/test-framework-hunit-0.3.0.tar.gz) = 2679
diff --git a/devel/hs-test-framework-hunit/pkg-descr b/devel/hs-test-framework-hunit/pkg-descr
index 5fde931d6f7c..d440c1729d35 100644
--- a/devel/hs-test-framework-hunit/pkg-descr
+++ b/devel/hs-test-framework-hunit/pkg-descr
@@ -1,3 +1,3 @@
HUnit support for the test-framework package.
-WWW: http://batterseapower.github.com/test-framework/
+WWW: http://batterseapower.github.com/test-framework/
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 91d30f2aa366..246d8bdcf1ec 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-test-framework-quickcheck2
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= test-framework-quickcheck2
-PORTVERSION= 0.2.12.2
-PORTREVISION= 1
+PORTVERSION= 0.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= QuickCheck2 support for the test-framework package
LICENSE= BSD
-USE_CABAL= QuickCheck>=2.4 test-framework>=0.6
+USE_CABAL= QuickCheck>=2.4 test-framework>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-quickcheck2/distinfo b/devel/hs-test-framework-quickcheck2/distinfo
index 83caeed83e11..3f6ce7f52d6e 100644
--- a/devel/hs-test-framework-quickcheck2/distinfo
+++ b/devel/hs-test-framework-quickcheck2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-quickcheck2-0.2.12.2.tar.gz) = 371a2cb52a4ff3779e79488295710cc9b5eef5511437ec39ab71088fd1f1a822
-SIZE (cabal/test-framework-quickcheck2-0.2.12.2.tar.gz) = 5342
+SHA256 (cabal/test-framework-quickcheck2-0.3.0.1.tar.gz) = 3a10264a977032a51259cf872c47f38d84753c30ad8930452f4a63b2e866e784
+SIZE (cabal/test-framework-quickcheck2-0.3.0.1.tar.gz) = 3379
diff --git a/devel/hs-test-framework-quickcheck2/pkg-descr b/devel/hs-test-framework-quickcheck2/pkg-descr
index e49c192a7081..b5f8f13880ce 100644
--- a/devel/hs-test-framework-quickcheck2/pkg-descr
+++ b/devel/hs-test-framework-quickcheck2/pkg-descr
@@ -1,3 +1,3 @@
QuickCheck2 support for the test-framework package.
-WWW: http://batterseapower.github.com/test-framework/
+WWW: http://batterseapower.github.com/test-framework/
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 3cd00840fa0a..fa45e73a88a0 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-test-framework
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= test-framework
-PORTVERSION= 0.6
-PORTREVISION= 1
+PORTVERSION= 0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index 5aba8042a9d0..c68e5ba7aa4f 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-0.6.tar.gz) = 439c1ffb4dcdf3efb8947dc3191ea9696878fe6df066b2be80b595c6ddc005aa
-SIZE (cabal/test-framework-0.6.tar.gz) = 19299
+SHA256 (cabal/test-framework-0.8.tar.gz) = 94c958a5bc6e81d0da4643ae82a5beecf0ecbf5eb6e46d3661f79f32b02d09f1
+SIZE (cabal/test-framework-0.8.tar.gz) = 20253
diff --git a/devel/hs-test-framework/pkg-descr b/devel/hs-test-framework/pkg-descr
index 87b265f6da67..fed515745e17 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.com/test-framework/
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index d02eae478efa..bb30e8d2a2ef 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-testpack
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= testpack
PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
new file mode 100644
index 000000000000..3bb1c4fa0204
--- /dev/null
+++ b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
@@ -0,0 +1,26 @@
+--- ./src/Test/HUnit/Tools.hs.orig 2012-02-28 23:20:32.000000000 +0100
++++ ./src/Test/HUnit/Tools.hs 2012-10-04 00:04:08.000000000 +0200
+@@ -128,7 +128,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:
+
+@@ -174,7 +178,11 @@
+ 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
diff --git a/devel/hs-testpack/pkg-descr b/devel/hs-testpack/pkg-descr
index 2cd5dfb7aaac..b110688ae52c 100644
--- a/devel/hs-testpack/pkg-descr
+++ b/devel/hs-testpack/pkg-descr
@@ -6,4 +6,4 @@ 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
+WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 4b84942277b7..aff49fb4721a 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-text
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= text
-PORTVERSION= 0.11.2.0
-PORTREVISION= 1
+PORTVERSION= 0.11.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 78bfeb1fe889..08fbe3e28417 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-0.11.2.0.tar.gz) = 178d12eb0dad50f3ef5135c443b31993e91ed91b1d04a2ebfa5c05520518a5bb
-SIZE (cabal/text-0.11.2.0.tar.gz) = 121020
+SHA256 (cabal/text-0.11.2.3.tar.gz) = 352737b045a42635f1017473179297ab562d53513ab3a4b965f38514171e344b
+SIZE (cabal/text-0.11.2.3.tar.gz) = 122938
diff --git a/devel/hs-text/pkg-descr b/devel/hs-text/pkg-descr
index b5ecb942a500..af75c8704634 100644
--- a/devel/hs-text/pkg-descr
+++ b/devel/hs-text/pkg-descr
@@ -1,4 +1,4 @@
An efficient packed, immutable Unicode text type (both strict and lazy), with a
powerful loop fusion optimization framework.
-WWW: http://code.haskell.org/text
+WWW: https://github.com/bos/text
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
new file mode 100644
index 000000000000..7d6d41481374
--- /dev/null
+++ b/devel/hs-threads/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= threads
+PORTVERSION= 0.5.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fork threads and wait for their result
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= base-unicode-symbols>=0.1.1 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
new file mode 100644
index 000000000000..8686d9edb63d
--- /dev/null
+++ b/devel/hs-threads/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/threads-0.5.0.1.tar.gz) = de5383ebbda62ed292a2dc89dc8ae41510861d1bdb2c658300db60705457be2a
+SIZE (cabal/threads-0.5.0.1.tar.gz) = 7304
diff --git a/devel/hs-threads/pkg-descr b/devel/hs-threads/pkg-descr
new file mode 100644
index 000000000000..7830c436a893
--- /dev/null
+++ b/devel/hs-threads/pkg-descr
@@ -0,0 +1,14 @@
+This package provides functions to fork threads and wait for their result,
+whether it's an exception or a normal value. Besides waiting for the
+termination of a single thread this packages also provides functions to
+wait for a group of threads to terminate. This package is similar to the
+"threadmanager", "async" and "spawn" packages. The advantages of this
+package are:
+
+ * Simpler API.
+ * More efficient in both space and time.
+ * No space-leak when forking a large number of threads.
+ * Correct handling of asynchronous exceptions.
+ * GHC specific functionality like `forkOn` and `forkIOWithUnmask`.
+
+WWW: https://github.com/basvandijk/threads
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 1624f8e7f6ee..ab1cc0fc1ceb 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-threadscope
-# Date created: December 6, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= threadscope
-PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTVERSION= 0.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cairo ghc-events>=0.3 glib gtk>=0.12 gtk2hs-buildtools mtl \
+USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
pango
EXECUTABLE= threadscope
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index 4d1d17355fb2..5201049b94dd 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threadscope-0.2.1.tar.gz) = afd7c9c3443c2f24b96c4d643893576e473a1006c99ede245e2f8ff1f8724923
-SIZE (cabal/threadscope-0.2.1.tar.gz) = 67264
+SHA256 (cabal/threadscope-0.2.2.tar.gz) = 8345bd2334ddec44b23b400f359d2b50ff7590102f55d4e93958c29086fa951d
+SIZE (cabal/threadscope-0.2.2.tar.gz) = 79239
diff --git a/devel/hs-threadscope/pkg-descr b/devel/hs-threadscope/pkg-descr
index 10b8c7aa0d2e..cf6ff60913f9 100644
--- a/devel/hs-threadscope/pkg-descr
+++ b/devel/hs-threadscope/pkg-descr
@@ -6,4 +6,4 @@ Haskell programs. Using Threadscope we can check to see that work is
well balanced across the available processors and spot performance
issues relating to garbage collection or poor load balancing.
-WWW: http://hackage.haskell.org/package/threadscope
+WWW: http://www.haskell.org/haskellwiki/ThreadScope
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
new file mode 100644
index 000000000000..94ea5b54ad08
--- /dev/null
+++ b/devel/hs-time-compat/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= time-compat
+PORTVERSION= 0.1.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compatibility with old-time for the time package
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-time-compat/distinfo b/devel/hs-time-compat/distinfo
new file mode 100644
index 000000000000..40084338fd34
--- /dev/null
+++ b/devel/hs-time-compat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/time-compat-0.1.0.2.tar.gz) = 0bc6766a085058aeb518dd4bf49c6267db341312162d3cf5b94268bc675f0719
+SIZE (cabal/time-compat-0.1.0.2.tar.gz) = 2255
diff --git a/devel/hs-time-compat/pkg-descr b/devel/hs-time-compat/pkg-descr
new file mode 100644
index 000000000000..d4a08092033f
--- /dev/null
+++ b/devel/hs-time-compat/pkg-descr
@@ -0,0 +1,3 @@
+Compatibility with the old-time package for the "new" time package.
+
+WWW: http://hub.darcs.net/dag/time-compat
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 6dad71f77955..817cb6ba4dd8 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-transformers-base
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= transformers-base
PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/pkg-descr b/devel/hs-transformers-base/pkg-descr
index d47e71f7c7a0..ed281732e3f5 100644
--- a/devel/hs-transformers-base/pkg-descr
+++ b/devel/hs-transformers-base/pkg-descr
@@ -1,4 +1,4 @@
This package provides a straightforward port of monadLib's BaseM type
class to transformers.
-WWW: https://github.com/mvv/transformers-base
+WWW: https://github.com/mvv/transformers-base
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index e0c35577c27f..6cd592e4ed92 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-transformers
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers/pkg-descr b/devel/hs-transformers/pkg-descr
index 36932c017d12..4ab06b1b4c74 100644
--- a/devel/hs-transformers/pkg-descr
+++ b/devel/hs-transformers/pkg-descr
@@ -14,4 +14,4 @@ It can be used on its own in portable Haskell code, or with the monad
classes in the mtl or monads-tf packages, which automatically lift
operations introduced by monad transformers through other transformers.
-WWW: http://hackage.haskell.org/package/transformers
+WWW: http://hackage.haskell.org/package/transformers
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index cf494858e4ea..86df2b201139 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-unamb
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/pkg-descr b/devel/hs-unamb/pkg-descr
index 7daa6ef089cf..b6210e385a89 100644
--- a/devel/hs-unamb/pkg-descr
+++ b/devel/hs-unamb/pkg-descr
@@ -3,4 +3,4 @@ wraps thread racing up in a purely functional, semantically simple
wrapper. Originally a part of Reactive, the author moved unamb
to its own Haskell package in order to encourage experimentation.
-WWW: http://haskell.org/haskellwiki/unamb
+WWW: http://haskell.org/haskellwiki/unamb
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 1dbffe6a303e..643499f63cb3 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-uniplate
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= uniplate
-PORTVERSION= 1.6.7
-PORTREVISION= 1
+PORTVERSION= 1.6.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +12,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable>=1.1.2.3 syb unordered-containers>=0.1
+USE_CABAL= hashable>=1.1.2.3 syb unordered-containers>=0.2.1
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${DATADIR}
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index 88d7b153a7d5..3fa97fd5ae89 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uniplate-1.6.7.tar.gz) = bd81e77f8ffbee2c5dd768790bb7b6b3ff871ca85d070564ea758f5b6d6ce1b8
-SIZE (cabal/uniplate-1.6.7.tar.gz) = 30071
+SHA256 (cabal/uniplate-1.6.10.tar.gz) = 433aa7ac4bb939d27b4ed4b2fedf99d5768b51c18fc918914b1bd13ae9d61048
+SIZE (cabal/uniplate-1.6.10.tar.gz) = 30033
diff --git a/devel/hs-uniplate/pkg-descr b/devel/hs-uniplate/pkg-descr
index eb9cf844f505..9939e3fd5fa8 100644
--- a/devel/hs-uniplate/pkg-descr
+++ b/devel/hs-uniplate/pkg-descr
@@ -2,4 +2,4 @@ Uniplate is a library for writing simple and consie generic operations.
Uniplate has similar goals to the original Scap Your Boilerplate work,
but is substantially simpler and faster.
-WWW: http://community.haskell.org/~ndm/uniplate/
+WWW: http://community.haskell.org/~ndm/uniplate/
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index e5a531aefedb..f8896cd2e426 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-unix-compat
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= unix-compat
-PORTVERSION= 0.3.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index b3f7e669dd5c..405124344052 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.3.0.1.tar.gz) = 84096dc156ebc99c3201ef6f5589ae0e5e92aefa25b081e295840672608cc227
-SIZE (cabal/unix-compat-0.3.0.1.tar.gz) = 12614
+SHA256 (cabal/unix-compat-0.4.0.0.tar.gz) = 28a77f4a6aabc5893461963c1943d4040a099fd4028b07dc569e55261bde1076
+SIZE (cabal/unix-compat-0.4.0.0.tar.gz) = 13004
diff --git a/devel/hs-unix-compat/pkg-descr b/devel/hs-unix-compat/pkg-descr
index da7fac995072..81a398a04130 100644
--- a/devel/hs-unix-compat/pkg-descr
+++ b/devel/hs-unix-compat/pkg-descr
@@ -2,4 +2,4 @@ This package provides portable implementations of parts of the unix package.
This package re-exports the unix package when available. When it isn't
available, portable implementations are used.
-WWW: http://github.com/jystic/unix-compat
+WWW: http://github.com/jystic/unix-compat
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
new file mode 100644
index 000000000000..4b09fa6f4747
--- /dev/null
+++ b/devel/hs-unix-time/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= unix-time
+PORTVERSION= 0.1.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Unix time parser/formatter and utilities
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.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
new file mode 100644
index 000000000000..aec56f6cb2b4
--- /dev/null
+++ b/devel/hs-unix-time/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/unix-time-0.1.4.tar.gz) = 855bed734cccd25bce95c36d306acf11cb29e9c760bee863239f4c594e4e1fa9
+SIZE (cabal/unix-time-0.1.4.tar.gz) = 34957
diff --git a/devel/hs-unix-time/pkg-descr b/devel/hs-unix-time/pkg-descr
new file mode 100644
index 000000000000..79f775dea72e
--- /dev/null
+++ b/devel/hs-unix-time/pkg-descr
@@ -0,0 +1,3 @@
+Fast parser/formatter/utilities for Unix time.
+
+WWW: http://hackage.haskell.org/package/unix-time
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index 470433d32074..6153a00a1c4d 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-unordered-containers
-# Date created: July 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= unordered-containers
-PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTVERSION= 0.2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index 66bf365368a0..29ba19f3d49b 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.1.0.tar.gz) = 97f0c85d9419e2d323124812dde83039abe604113c567783c2ca1928c68d627e
-SIZE (cabal/unordered-containers-0.2.1.0.tar.gz) = 20179
+SHA256 (cabal/unordered-containers-0.2.2.1.tar.gz) = fe9bacdc6649dc8b196d9ab1a28ba5e2ac60fef37f6aebc0f50332c0fbe1c85b
+SIZE (cabal/unordered-containers-0.2.2.1.tar.gz) = 23129
diff --git a/devel/hs-unordered-containers/pkg-descr b/devel/hs-unordered-containers/pkg-descr
index b37a99a1886b..3009521ab581 100644
--- a/devel/hs-unordered-containers/pkg-descr
+++ b/devel/hs-unordered-containers/pkg-descr
@@ -3,4 +3,4 @@ for performance critical use, both in terms of large data quantities and
high speed. The declared cost of each operation is either worst-case or
amortized, but remains valid even if structures are shared.
-WWW: http://hackage.haskell.org/package/unordered-containers
+WWW: https://github.com/tibbe/unordered-containers
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index c3bf43a7a3bf..6d7589ac4a58 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-utf8-light
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= utf8-light
PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-light/pkg-descr b/devel/hs-utf8-light/pkg-descr
index 45302fd031d4..0e7ea7364551 100644
--- a/devel/hs-utf8-light/pkg-descr
+++ b/devel/hs-utf8-light/pkg-descr
@@ -1,3 +1,3 @@
Lightweight UTF8 handling.
-WWW: http://hackage.haskell.org/package/utf8-light
+WWW: http://hackage.haskell.org/package/utf8-light
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 6f950a047a72..5e2359da5eac 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-utf8-string-ghc
-# Date created: 2008-10-21
-# Whom: Ashish Shukla <wahjava@gmail.com>
-#
# $FreeBSD$
-#
PORTNAME= utf8-string
PORTVERSION= 0.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 44e77289e4bc..408527231ae7 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-utility-ht
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= utility-ht
PORTVERSION= 0.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/pkg-descr b/devel/hs-utility-ht/pkg-descr
index e20d5c8b1d7b..b2ac10a4eb54 100644
--- a/devel/hs-utility-ht/pkg-descr
+++ b/devel/hs-utility-ht/pkg-descr
@@ -3,4 +3,4 @@ Functions. Some of these functions are improved implementations of
standard functions. They have the same name as their standard
counterparts.
-WWW: http://hackage.haskell.org/package/utility-ht
+WWW: http://hackage.haskell.org/package/utility-ht
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 9b66824a0e76..3eb43ce00437 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-uuagc-bootstrap
-# Date created: August 12, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/pkg-descr b/devel/hs-uuagc-bootstrap/pkg-descr
index cdca22fc0cb6..d0d0a26f1695 100644
--- a/devel/hs-uuagc-bootstrap/pkg-descr
+++ b/devel/hs-uuagc-bootstrap/pkg-descr
@@ -6,4 +6,4 @@ It is a preprocessor for Haskell which makes it easy to write catamorphisms
You can define tree walks using the intuitive concepts of inherited and
synthesized attributes, while keeping the full expressive power of Haskell.
-WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem
+WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 25d9fa00e463..74c6cc5a722a 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-uuagc-cabal
-# Date created: August 12, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= uuagc-cabal
-PORTVERSION= 1.0.2.0
-PORTREVISION= 2
+PORTVERSION= 1.0.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,6 +10,7 @@ COMMENT= Cabal plugin for the Universiteit Utrecht Attribute Grammar System
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= mtl>=2.0.1.0 uulib>=0.9.14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index 41e021c26714..c54907888f13 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-cabal-1.0.2.0.tar.gz) = 0007d8bb1cfb973986f263c09ba27b3abd3731f7e05efae2cf2198c00cf3765b
-SIZE (cabal/uuagc-cabal-1.0.2.0.tar.gz) = 14176
+SHA256 (cabal/uuagc-cabal-1.0.4.0.tar.gz) = 8e92ccb48ece047cbf8d1681f9ce8ed6e6f0412f27e82152eb8dfdbc1c45d854
+SIZE (cabal/uuagc-cabal-1.0.4.0.tar.gz) = 14544
diff --git a/devel/hs-uuagc-cabal/pkg-descr b/devel/hs-uuagc-cabal/pkg-descr
index 24dc88ac128c..4b63c73759ef 100644
--- a/devel/hs-uuagc-cabal/pkg-descr
+++ b/devel/hs-uuagc-cabal/pkg-descr
@@ -1,3 +1,3 @@
Cabal plugin for UUAGC.
-WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
+WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 1b2451555a3a..4d10950abecf 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-uuagc
-# Date created: February 27 2008
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= uuagc
-PORTVERSION= 0.9.40.3
-PORTREVISION= 1
+PORTVERSION= 0.9.42.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,8 +12,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-bootstrap>=0.9.40.0 \
- uuagc-cabal>=1.0.2.0 uulib>=0.9.14
+USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
+ uulib>=0.9.14
EXECUTABLE= uuagc
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index e2f08771ca82..0e7f4d5378dd 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-0.9.40.3.tar.gz) = 1446be31bb8a4d2457b7ca718e949d443adbcf6135a28781fd83201d173b7714
-SIZE (cabal/uuagc-0.9.40.3.tar.gz) = 157659
+SHA256 (cabal/uuagc-0.9.42.2.tar.gz) = d645e99c510823bd21ca49ec91a4e321ba1eb2c324e6c2e34b077456e31bfcd0
+SIZE (cabal/uuagc-0.9.42.2.tar.gz) = 599995
diff --git a/devel/hs-uuagc/pkg-descr b/devel/hs-uuagc/pkg-descr
index f28d0bd19b97..0859fc9c716d 100644
--- a/devel/hs-uuagc/pkg-descr
+++ b/devel/hs-uuagc/pkg-descr
@@ -1,3 +1,3 @@
Generates Haskell files from an attribute grammar specification.
-WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
+WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 7abfb716f328..6e48ed546c59 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-uulib
-# Date created: February 27 2008
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= uulib
PORTVERSION= 0.9.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 625c679c641d..b67b25511e3a 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-vault
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= vault
-PORTVERSION= 0.2.0.0
-PORTREVISION= 1
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 8697d83731c8..eba7b50c3d6d 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vault-0.2.0.0.tar.gz) = 5b0797d80cb229ae470ffa43a66f0f13e29d916b5fc28a9c4b8e2f11f73c68c3
-SIZE (cabal/vault-0.2.0.0.tar.gz) = 4761
+SHA256 (cabal/vault-0.2.0.1.tar.gz) = b8e3164c7cbcefc2823c31495111cec79613a0d33db1cd8143e9da56ed7afc08
+SIZE (cabal/vault-0.2.0.1.tar.gz) = 4760
diff --git a/devel/hs-vault/pkg-descr b/devel/hs-vault/pkg-descr
index 0deb88790668..98063be518c0 100644
--- a/devel/hs-vault/pkg-descr
+++ b/devel/hs-vault/pkg-descr
@@ -4,4 +4,4 @@ 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
+WWW: https://github.com/HeinrichApfelmus/vault
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index a32b8c20aff3..5af066576394 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-vector-algorithms
-# Date created: June 5, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= vector-algorithms
-PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTVERSION= 0.5.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index 7f23bccccd13..0c9a0eadba09 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-algorithms-0.5.4.tar.gz) = 62576deb6dc96ef8a4fc269e3315652145ee23abb2ef2db0fe4bcf576d952648
-SIZE (cabal/vector-algorithms-0.5.4.tar.gz) = 22833
+SHA256 (cabal/vector-algorithms-0.5.4.2.tar.gz) = c42c35dcf23cb60b874e50d6fec894463c835d6e2ef71d02283039f86635eb22
+SIZE (cabal/vector-algorithms-0.5.4.2.tar.gz) = 22938
diff --git a/devel/hs-vector-algorithms/pkg-descr b/devel/hs-vector-algorithms/pkg-descr
index 0989acf01741..28dff5f3a16d 100644
--- a/devel/hs-vector-algorithms/pkg-descr
+++ b/devel/hs-vector-algorithms/pkg-descr
@@ -1,3 +1,3 @@
Efficient algorithms for vector arrays.
-WWW: http://code.haskell.org/~dolio/
+WWW: http://code.haskell.org/~dolio/
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index fa25e8487dd0..e58d834569f2 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-vector
-# Date created: June 5, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= vector
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.10.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,8 +10,7 @@ COMMENT= Efficient Arrays
LICENSE= BSD
CABAL_SETUP= Setup.hs
-
-USE_CABAL= primitive>=0.4.0.1
+USE_CABAL= primitive>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index b1d914fec6ac..d03cef6903b4 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-0.9.1.tar.gz) = 5a2507f633c8b61a203b34ca29a30fca20fde1d6261f1f8417903b447c4bd7d4
-SIZE (cabal/vector-0.9.1.tar.gz) = 104997
+SHA256 (cabal/vector-0.10.0.1.tar.gz) = ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af
+SIZE (cabal/vector-0.10.0.1.tar.gz) = 102426
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index c36c29beb70e..e2d3909fa822 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-void
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= void
-PORTVERSION= 0.5.6
+PORTVERSION= 0.5.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index da79a60ada1d..2ab856ada36f 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.5.6.tar.gz) = 9fc4bbf2df08c21b541005519a7556b09f12e1c8be0f7f086f1dd2dc25b91d99
-SIZE (cabal/void-0.5.6.tar.gz) = 2172
+SHA256 (cabal/void-0.5.8.tar.gz) = ff08bd4c291efa15a750bcf35b9cc8f4c60d84ecf4fc735288249ec36eb31cc7
+SIZE (cabal/void-0.5.8.tar.gz) = 2273
diff --git a/devel/hs-void/pkg-descr b/devel/hs-void/pkg-descr
index ce75993aa13b..9ff73440c740 100644
--- a/devel/hs-void/pkg-descr
+++ b/devel/hs-void/pkg-descr
@@ -1,4 +1,4 @@
A Haskell 98 logically uninhabited data type. Used to indicate that a
given term should not exist.
-WWW: http://github.com/ekmett/void
+WWW: http://github.com/ekmett/void
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
new file mode 100644
index 000000000000..34f40e0cf4bd
--- /dev/null
+++ b/devel/hs-word8/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= word8
+PORTVERSION= 0.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Word8 library
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
new file mode 100644
index 000000000000..8c2c3109e9d5
--- /dev/null
+++ b/devel/hs-word8/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/word8-0.0.2.tar.gz) = cbb6c4c816ed515428427c6afd8487403e2689d6b1f31f75d623c99960a14846
+SIZE (cabal/word8-0.0.2.tar.gz) = 4482
diff --git a/devel/hs-word8/pkg-descr b/devel/hs-word8/pkg-descr
new file mode 100644
index 000000000000..559690167897
--- /dev/null
+++ b/devel/hs-word8/pkg-descr
@@ -0,0 +1,3 @@
+Word8 library to be used with Data.ByteString.
+
+WWW: http://hackage.haskell.org/package/word8
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index c6072f1d343a..9ffa9faccee9 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-curl
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= curl
-PORTVERSION= 1.3.7
-PORTREVISION= 3
+PORTVERSION= 1.3.8
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ftp/hs-curl/distinfo b/ftp/hs-curl/distinfo
index ea18842622bb..707fe0d5b889 100644
--- a/ftp/hs-curl/distinfo
+++ b/ftp/hs-curl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/curl-1.3.7.tar.gz) = f1410ca81fffff241678d287588b201285c6c9637d6db5d90af6952bc639cd44
-SIZE (cabal/curl-1.3.7.tar.gz) = 51278
+SHA256 (cabal/curl-1.3.8.tar.gz) = 9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e
+SIZE (cabal/curl-1.3.8.tar.gz) = 47704
diff --git a/ftp/hs-curl/pkg-descr b/ftp/hs-curl/pkg-descr
index 0e7e355e64e2..2e1d74feeab9 100644
--- a/ftp/hs-curl/pkg-descr
+++ b/ftp/hs-curl/pkg-descr
@@ -3,8 +3,7 @@ HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE.
libcurl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading,
HTTP form based upload, proxies, cookies, user+password authentication
(Basic, Digest, NTLM, Negotiate, Kerberos4), file transfer resume, http
-proxy tunneling and more!
-
-This package provides a Haskell binding to libcurl.
+proxy tunneling and more! This package provides a Haskell binding to
+libcurl.
WWW: http://hackage.haskell.org/package/curl
diff --git a/graphics/Makefile b/graphics/Makefile
index 8d1aa0bdb55a..e63cdd7011a3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -346,6 +346,8 @@
SUBDIR += hppsmtools
SUBDIR += hs-HGL
SUBDIR += hs-cairo
+ SUBDIR += hs-dia-base
+ SUBDIR += hs-dia-functions
SUBDIR += hs-soegtk
SUBDIR += hs-svgcairo
SUBDIR += hsetroot
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index b24817335e4d..c304289fa5e7 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-HGL-ghc
-# Date created: February 25 2008
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= HGL
PORTVERSION= 3.2.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 54fe3f0f7888..26c965f0eb02 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cairo
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cairo
-PORTVERSION= 0.12.3.1
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,9 @@ LICENSE= BSD
FILE_LICENSE= COPYRIGHT
CABAL_SETUP= Setup.hs
+
USE_CABAL= gtk2hs-buildtools mtl
+
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:${PORTSDIR}/graphics/cairo
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo
index 9345f8ad3e47..73b76d2f3d3c 100644
--- a/graphics/hs-cairo/distinfo
+++ b/graphics/hs-cairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cairo-0.12.3.1.tar.gz) = 91bb958e8fcdff9d5496d6e7888359902e7b0c4e8ddfbf0df949856201c5779c
-SIZE (cabal/cairo-0.12.3.1.tar.gz) = 50437
+SHA256 (cabal/cairo-0.12.4.tar.gz) = 783943379a6b02e8645dd29960e057bea8d05a7afa12a918d87e54d561b7c63f
+SIZE (cabal/cairo-0.12.4.tar.gz) = 50933
diff --git a/graphics/hs-cairo/pkg-descr b/graphics/hs-cairo/pkg-descr
index 0befcbdd0f0a..1fce59cee277 100644
--- a/graphics/hs-cairo/pkg-descr
+++ b/graphics/hs-cairo/pkg-descr
@@ -2,4 +2,4 @@ Cairo is a library to render high quality vector graphics. There exist
various backends that allows rendering to Gtk windows, PDF, PS, PNG and
SVG documents, amongst others.
-WWW: http://projects.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
new file mode 100644
index 000000000000..4a3edcb091a8
--- /dev/null
+++ b/graphics/hs-dia-base/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= dia-base
+PORTVERSION= 0.1.1.2
+CATEGORIES= graphics haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= An EDSL for teaching Haskell with diagrams - data types
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/graphics/hs-dia-base/distinfo b/graphics/hs-dia-base/distinfo
new file mode 100644
index 000000000000..12f7c8f7e7a6
--- /dev/null
+++ b/graphics/hs-dia-base/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/dia-base-0.1.1.2.tar.gz) = 8525de0e876a012fd39c25db34d7cc7d2a4e2434fc20a461abe8aedc9f2b4622
+SIZE (cabal/dia-base-0.1.1.2.tar.gz) = 3779
diff --git a/graphics/hs-dia-base/pkg-descr b/graphics/hs-dia-base/pkg-descr
new file mode 100644
index 000000000000..373c6b6407cf
--- /dev/null
+++ b/graphics/hs-dia-base/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the Diagram data type and the user API to construct
+diagrams.
+
+WWW: http://hackage.haskell.org/package/dia-base
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
new file mode 100644
index 000000000000..16b5f0a6e3a3
--- /dev/null
+++ b/graphics/hs-dia-functions/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= dia-functions
+PORTVERSION= 0.2.1.3
+CATEGORIES= graphics haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= An EDSL for teaching Haskell with diagrams - functions
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0 xhtml>=3000.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/graphics/hs-dia-functions/distinfo b/graphics/hs-dia-functions/distinfo
new file mode 100644
index 000000000000..69b758429ea0
--- /dev/null
+++ b/graphics/hs-dia-functions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/dia-functions-0.2.1.3.tar.gz) = 3460652c5b6562bbfcf82c6edbc64a0d1682d05ee825145339a1e50a89195e7d
+SIZE (cabal/dia-functions-0.2.1.3.tar.gz) = 8137
diff --git a/graphics/hs-dia-functions/pkg-descr b/graphics/hs-dia-functions/pkg-descr
new file mode 100644
index 000000000000..5a61ff8c8c78
--- /dev/null
+++ b/graphics/hs-dia-functions/pkg-descr
@@ -0,0 +1,3 @@
+This package contains diagram manipulating functions and an SVG backend.
+
+WWW: http://hackage.haskell.org/package/dia-functions
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index 6616cdfe028f..49a30ebe7739 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-soegtk
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= soegtk
PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index a45b408db986..ed8f868d1b1a 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-svgcairo
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= svgcairo
PORTVERSION= 0.12.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index c27f5c1a4e02..de27c2f9c771 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for: ghc
-# Date created: 28 August 1999
-# Whom: Simon Marlow <simonmar@microsoft.com>
-#
+# Created by: Simon Marlow <simonmar@microsoft.com>
# $FreeBSD$
PORTNAME= ghc
-PORTVERSION= 7.4.1
+PORTVERSION= 7.4.2
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -17,9 +14,9 @@ COMMENT= A Compiler for the functional language Haskell
ONLY_FOR_ARCHS= i386 amd64
-GHC_VERSION= ${PORTVERSION}
+GHC_VERSION= ${PORTVERSION}
BOOT_GHC_VERSION= 7.4.1
-HSCOLOUR_VERSION= 1.19
+HSCOLOUR_VERSION= 1.20.2
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
@@ -27,12 +24,13 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.*
USE_BZIP2= yes
-USE_GCC= any
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
USE_PERL5_BUILD= yes
-USE_GMAKE= yes
-USE_ICONV= yes
+USE_GMAKE= yes
+USE_ICONV= yes
+USE_BINUTILS= yes
+USE_GCC= 4.6
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -49,12 +47,28 @@ GNU_CONFIGURE= yes
OPTIONS_DEFINE= PROFILE DYNAMIC DOCS
OPTIONS_DEFAULT= PROFILE DYNAMIC DOCS
+BOOT_DESC= Use installed GHC for bootstrapping
+BOOTH_DESC= Use installed HsColour for bootstrapping
PROFILE_DESC= Add support for performance profiling
DYNAMIC_DESC= Add support for dynamic linking
DOCS_DESC= Install HTML documentation
+LOCALBASE?= /usr/local
+
+.if exists(${LOCALBASE}/bin/ghc)
+OPTIONS_DEFINE+= BOOT
+.endif
+
+.if exists(${LOCALBASE}/bin/HsColour)
+OPTIONS_DEFINE+= BOOTH
+.endif
+
.include <bsd.port.options.mk>
+.if empty(PORT_OPTIONS:MBOOT)
+
+EXTRA_PATCHES= ${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in
+
.if ${ARCH} == "i386"
.if ${OSVERSION} >= 900000
@@ -81,28 +95,43 @@ IGNORE= unsupported
.endif
+.endif # MBOOT
+
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
GHC_LIBDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}
GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION}
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
-# This port builds by downloading a minimal binary distribution of GHC and
-# using that to bootstrap.
-BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
-BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
-BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
-BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
HACKAGE_SITE?= http://hackage.haskell.org/
HACKAGE_ARCH?= packages/archive/
-CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} CC=${CC}
-CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} --with-gcc=${CC} \
+CONFIGURE_ARGS= --with-gcc=${CC} \
--with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib \
--with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
+.if empty(PORT_OPTIONS:MBOOT)
+
+BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
+BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
+BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
+BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
+
+SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
+
+CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} CC=${CC}
+CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
+
+.else # MBOOT
+
+SLAVE_CMD= # empty
+
+CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc
+
+.endif # MBOOT
+
# libgmp:
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
@@ -117,23 +146,31 @@ MAKE_ENV+= TMPDIR=${TMPDIR}
# activated. In this way it's possible to use it directly into
# the build tree, without needing to install it. At the end
# you could view the output of: ${BOOT_GHC} describe hscolour
+
.if ${PORT_OPTIONS:MDOCS}
+.if empty(PORT_OPTIONS:MBOOTH)
+
MASTER_SITES+= ${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs
DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g}
+.endif # MBOOTH
+
MAN1= ghc.1
+.if empty(PORT_OPTIONS:MBOOTH)
+
SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
-SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
MAKE_ENV+= LC_ALL=en_US.UTF-8
CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
+.endif # MBOOTH
+
BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
.endif
@@ -159,7 +196,11 @@ post-extract:
@${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS ="
@${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS ="
.endif
+.if ${PORT_OPTIONS:MBOOT}
+ @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${LOCALBASE}/bin/hsc2hs"
+.else
@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
+.endif
@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${LOCALBASE}/include -L${LOCALBASE}/lib"
@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
@@ -205,23 +246,31 @@ post-patch:
@${REINPLACE_CMD} -e 's+\(DO_NOT_INSTALL =\)+\1 haddock+' \
${WRKSRC}/utils/Makefile
+.if ${PORT_OPTIONS:MBOOT}
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/rts/package.conf.in \
+ ${WRKSRC}/libraries/Makefile
+.else
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/../ghc-${BOOT_GHC_VERSION}-boot/rts/package.conf.in \
${WRKSRC}/rts/package.conf.in \
${WRKSRC}/libraries/Makefile
+.endif
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/configure
pre-configure:
@${MKDIR} ${TMPDIR}
+.if empty(PORT_OPTIONS:MBOOT)
@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT})
@(cd ${BOOT_DIR} && PACKAGES='' ${GMAKE} install)
+.endif
# Defining with documentation:
# Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process
# functionally to this port.
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
@${ECHO_MSG} -e "\a"
@${ECHO_MSG} "======================================================================"
@${ECHO_MSG} " WARNING: Now HsColour will be built, the respective port will not "
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index ecd693ccdb14..7bfaddead2c0 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -26,26 +26,11 @@ DIST_SUBDIR?= cabal
FILE_LICENSE?= LICENSE
-.if !defined(STANDALONE)
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-.elif defined(STANDALONE)
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-.endif
-
-GHC_VERSION?= 7.4.1
-GHC_VERSION_N= ${GHC_VERSION:S/./0/g}
-
-GHC_CMD?= ${LOCALBASE}/bin/ghc
CABAL_SETUP?= Setup.lhs
SETUP_CMD?= ./setup
ALEX_CMD?= ${LOCALBASE}/bin/alex
HAPPY_CMD?= ${LOCALBASE}/bin/happy
-HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
C2HS_CMD?= ${LOCALBASE}/bin/c2hs
CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
@@ -79,25 +64,32 @@ CPPFLAGS+= -I${LOCALBASE}/include
INSTALL_PORTDATA?=
INSTALL_PORTEXAMPLES?=
-HSCOLOUR_DESC?= Colorize generated documentation by HsColour
-DYNAMIC_DESC?= Add support for dynamic linking
-PROFILE_DESC?= Add support for profiling
-
-.include <bsd.port.options.mk>
+LOCALBASE?= /usr/local
-.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi)
-OPTIONS_DEFINE+= DYNAMIC
+.if !defined(CABALOPTIONSMKINCLUDED)
+.include "bsd.cabal.options.mk"
.endif
-.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi)
-OPTIONS_DEFINE+= PROFILE
+.if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
+BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+.else
+BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
.endif
-.if exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)
-OPTIONS_DEFINE+= DOCS HSCOLOUR
-OPTIONS_DEFAULT+= DOCS
+USE_BINUTILS= yes
+USE_GCC= 4.6
+
+.if ${PORT_OPTIONS:MDYNAMIC}
+LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi
.endif
+CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
+ --with-ranlib=${RANLIB}
+
.if defined(USE_ALEX)
BUILD_DEPENDS+= ${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
CONFIGURE_ARGS+= --with-alex=${ALEX_CMD}
@@ -118,10 +110,6 @@ LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
USE_ICONV= yes
.endif
-.if defined(EXECUTABLE) && ${PORT_OPTIONS:MDOCS}
-HADDOCK_EXE?= --executables
-.endif
-
.if defined(USE_CABAL)
.include "bsd.hackage.mk"
@@ -146,7 +134,7 @@ ${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${PORTSDIR}/${__u_h_r_port}
BUILD_DEPENDS+= ${dependencies}
-.if !defined(STANDALONE)
+.if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
RUN_DEPENDS+= ${dependencies}
.endif
@@ -159,12 +147,12 @@ USE_PERL5_BUILD= 5.8+
.if ${PORT_OPTIONS:MDOCS}
.if !defined(XMLDOCS)
-HADDOCK_OPTS= ${HADDOCK_EXE}
+HADDOCK_OPTS= # empty
.if ${PORT_OPTIONS:MHSCOLOUR}
BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-HSCOLOUR_VERSION= 1.20.2
+HSCOLOUR_VERSION= 1.20.3
HSCOLOUR_DATADIR= ${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif # HSCOLOUR
@@ -192,9 +180,9 @@ CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD}
.endif
.if ${PORT_OPTIONS:MDYNAMIC}
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-shared --enable-executable-dynamic
.else
-CONFIGURE_ARGS+= --disable-shared
+CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic
.endif
.if ${PORT_OPTIONS:MPROFILE}
@@ -231,7 +219,7 @@ post-patch::
do-configure:
.if !defined(METAPORT)
cd ${WRKSRC} && ${GHC_CMD} --make ${CABAL_SETUP} -o setup -package Cabal
- cd ${WRKSRC} && ${SETENV} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${SETUP_CMD} configure --ghc --prefix=${PREFIX} --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" ${__handle_datadir__} ${CONFIGURE_ARGS}
.if ${PORT_OPTIONS:MDOCS}
@@ -247,14 +235,14 @@ do-configure:
.if !target(do-build)
do-build:
.if !defined(METAPORT)
- cd ${WRKSRC} && ${SETUP_CMD} build
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build
.if !defined(STANDALONE)
- cd ${WRKSRC} && ${SETUP_CMD} register --gen-script
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
.endif
.if ${PORT_OPTIONS:MDOCS}
.if !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
- cd ${WRKSRC} && ${SETUP_CMD} haddock ${HADDOCK_OPTS}
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS}
.endif # STANDALONE
.if defined(XMLDOCS)
@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
@@ -268,7 +256,7 @@ do-build:
.if !target(do-install)
do-install:
.if !defined(METAPORT)
- cd ${WRKSRC} && ${SETUP_CMD} install
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} install
.if !defined(STANDALONE)
cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
new file mode 100644
index 000000000000..28d4a490c636
--- /dev/null
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -0,0 +1,40 @@
+#
+# $FreeBSD$
+#
+# bsd.cabal.options.mk -- Support options for ports based on Haskell Cabal.
+#
+# Created by: Gabor Pali <pgj@FreeBSD.org>
+#
+# Maintained by: haskell@FreeBSD.org
+#
+
+CABALOPTIONSMKINCLUDED= yes
+
+LOCALBASE?= /usr/local
+GHC_CMD?= ${LOCALBASE}/bin/ghc
+HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
+GHC_VERSION= 7.4.2
+
+HSCOLOUR_DESC?= Colorize generated documentation by HsColour
+DYNAMIC_DESC?= Add support for dynamic linking
+PROFILE_DESC?= Add support for profiling
+
+.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi) && !defined(IGNORE_DYNAMIC))
+OPTIONS_DEFINE+= DYNAMIC
+OPTIONS_DEFAULT+= DYNAMIC
+.endif
+
+.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi) && !defined(IGNORE_PROFILE))
+OPTIONS_DEFINE+= PROFILE
+.endif
+
+.if !exists(${GHC_CMD}) || ((exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) && !defined(NOPORTDOCS))
+OPTIONS_DEFINE+= DOCS HSCOLOUR
+OPTIONS_DEFAULT+= DOCS
+.endif
+
+.if defined(OPTIONSMKINCLUDED)
+IGNORE?= options fail: bsd.cabal.mk already includes bsd.options.mk
+.endif
+
+.include <bsd.port.options.mk>
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 9a1852cb8d45..4e5a4ab72fee 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -13,6 +13,8 @@
abstract-deque_port= devel/hs-abstract-deque
abstract-par_port= devel/hs-abstract-par
+activehs_port= www/hs-activehs
+activehs-base_port= devel/hs-activehs-base
aeson_port= converters/hs-aeson
Agda_port= math/hs-Agda # executable
Agda-executable_port= math/hs-Agda-executable # executable
@@ -23,6 +25,7 @@ ansi-terminal_port= devel/hs-ansi-terminal
ansi-wl-pprint_port= devel/hs-ansi-wl-pprint
arrows_port= devel/hs-arrows
asn1-data_port= devel/hs-asn1-data
+async_port= devel/hs-async
attempt_port= devel/hs-attempt
attoparsec_port= textproc/hs-attoparsec
attoparsec-conduit_port= textproc/hs-attoparsec-conduit
@@ -31,6 +34,7 @@ authenticate_port= www/hs-authenticate
base-unicode-symbols_port= devel/hs-base-unicode-symbols
base16-bytestring_port= devel/hs-base16-bytestring
base64-bytestring_port= devel/hs-base64-bytestring
+basic-prelude_port= devel/hs-basic-prelude
bio_port= science/hs-bio
bits-atomic_port= devel/hs-bits-atomic
blaze-builder_port= devel/hs-blaze-builder
@@ -56,7 +60,10 @@ categories_port= math/hs-categories
certificate_port= security/hs-certificate
cgi_port= www/hs-cgi
checkers_port= devel/hs-checkers
+cipher-aes_port= security/hs-cipher-aes
citeproc-hs_port= textproc/hs-citeproc-hs
+classy-prelude_port= devel/hs-classy-prelude
+classy-prelude-conduit_port= devel/hs-classy-prelude-conduit
clientsession_port= security/hs-clientsession
cmdargs_port= devel/hs-cmdargs
comonad_port= math/hs-comonad
@@ -84,9 +91,13 @@ darcs_port= devel/hs-darcs # executable
data-default_port= devel/hs-data-default
data-lens_port= math/hs-data-lens
data-lens-template_port= math/hs-data-lens-template
+data-pprint_port= devel/hs-data-pprint
dataenc_port= converters/hs-dataenc
+date-cache_port= devel/hs-date-cache
datetime_port= devel/hs-datetime
DeepArrow_port= devel/hs-DeepArrow
+dia-base_port= graphics/hs-dia-base
+dia-functions_port= graphics/hs-dia-functions
Diff_port= textproc/hs-Diff
digest_port= security/hs-digest
directory-tree_port= devel/hs-directory-tree
@@ -108,6 +119,7 @@ file-embed_port= devel/hs-file-embed
filemanip_port= devel/hs-filemanip
filestore_port= devel/hs-filestore
filesystem-conduit_port= devel/hs-filesystem-conduit
+fsnotify_port= devel/hs-fsnotify
gconf_port= devel/hs-gconf
ghc-events_port= devel/hs-ghc-events # executable
ghc-mtl_port= devel/hs-ghc-mtl
@@ -137,12 +149,14 @@ haskell-src-exts_port= devel/hs-haskell-src-exts
hastache_port= devel/hs-hastache
HaXml_port= textproc/hs-HaXml # executable
heist_port= www/hs-heist
+hexpat_port= textproc/hs-hexpat
HGL_port= graphics/hs-HGL
highlighting-kate_port= textproc/hs-highlighting-kate
+hinotify_port= devel/hs-hinotify
hint_port= devel/hs-hint
+hlint_port= devel/hs-hlint # executable
hjsmin_port= www/hs-hjsmin
hlibev_port= devel/hs-hlibev # lib_depends
-hlint_port= devel/hs-hlint # executable
hoogle_port= devel/hs-hoogle # executable
hostname_port= net/hs-hostname
hs-bibutils_port= textproc/hs-hs-bibutils
@@ -151,12 +165,14 @@ hscolour_port= print/hs-hscolour # executable
hslogger_port= devel/hs-hslogger
HsOpenSSL_port= security/hs-HsOpenSSL
hspec_port= devel/hs-hspec
+hspec-expectations_port= devel/hs-hspec-expectations
HStringTemplate_port= textproc/hs-HStringTemplate
html_port= textproc/hs-html
html-conduit_port= textproc/hs-html-conduit
HTTP_port= www/hs-HTTP
http-conduit_port= www/hs-http-conduit
http-date_port= www/hs-http-date
+http-reverse-proxy_port= www/hs-http-reverse-proxy
http-server_port= www/hs-http-server
http-types_port= www/hs-http-types
HUnit_port= devel/hs-HUnit
@@ -168,6 +184,7 @@ ieee754_port= math/hs-ieee754
IfElse_port= devel/hs-IfElse
IORefCAS_port= devel/hs-IORefCAS
json_port= converters/hs-json
+kqueue_port= devel/hs-kqueue
language-c_port= devel/hs-language-c
language-javascript_port= devel/hs-language-javascript
largeword_port= devel/hs-largeword
@@ -176,15 +193,18 @@ lhs2tex_port= textproc/hs-lhs2tex
libmpd_port= audio/hs-libmpd
libxml_port= textproc/hs-libxml
lifted-base_port= devel/hs-lifted-base
+List_port= devel/hs-List
logict_port= devel/hs-logict
math-functions_port= math/hs-math-functions
MaybeT_port= devel/hs-MaybeT
MemoTrie_port= devel/hs-MemoTrie
mime_port= mail/hs-mime
mime-mail_port= mail/hs-mime-mail
+mime-types_port= mail/hs-mime-types
MissingH_port= devel/hs-MissingH
mmap_port= devel/hs-mmap
monad-control_port= devel/hs-monad-control
+monad-logger_port= devel/hs-monad-logger
monad-par_port= devel/hs-monad-par
monad-par-extras_port= devel/hs-monad-par-extras
MonadCatchIO-mtl_port= devel/hs-MonadCatchIO-mtl
@@ -197,11 +217,14 @@ mwc-random_port= math/hs-mwc-random
mysql_port= databases/hs-mysql
network_port= net/hs-network
network-conduit_port= net/hs-network-conduit
+network-info_port= net/hs-network-info
+network-multicast_port= net/hs-network-multicast
NumInstances_port= math/hs-NumInstances
ObjectName_port= devel/hs-ObjectName
oeis_port= www/hs-oeis
OpenAL_port= audio/hs-OpenAL
OpenGL_port= x11-toolkits/hs-OpenGL
+optparse-applicative_port= devel/hs-optparse-applicative
pandoc_port= textproc/hs-pandoc # executable
pandoc-types_port= textproc/hs-pandoc-types
pango_port= x11-toolkits/hs-pango
@@ -220,6 +243,7 @@ pool-conduit_port= devel/hs-pool-conduit
porte_port= ports-mgmt/hs-porte # executable
primitive_port= devel/hs-primitive
probability_port= math/hs-probability
+project-template_port= devel/hs-project-template
PSQueue_port= devel/hs-PSQueue
pureMD5_port= security/hs-pureMD5
pwstore-fast_port= security/hs-pwstore-fast
@@ -227,6 +251,7 @@ QuickCheck_port= devel/hs-QuickCheck
random_port= devel/hs-random
ranges_port= devel/hs-ranges
reactive_port= devel/hs-reactive
+ReadArgs_port= devel/hs-ReadArgs
readline_port= devel/hs-readline
recaptcha_port= www/hs-recaptcha
regex-base_port= textproc/hs-regex-base
@@ -237,10 +262,12 @@ resource-pool_port= devel/hs-resource-pool
resourcet_port= devel/hs-resourcet
RSA_port= security/hs-RSA
safe_port= devel/hs-safe
+SafeSemaphore_port= devel/hs-SafeSemaphore
scgi_port= www/hs-scgi
sendfile_port= net/hs-sendfile
semigroupoids_port= math/hs-semigroupoids
semigroups_port= math/hs-semigroups
+setenv_port= devel/hs-setenv
SHA_port= security/hs-SHA
shakespeare_port= www/hs-shakespeare
shakespeare-css_port= www/hs-shakespeare-css
@@ -249,6 +276,7 @@ shakespeare-js_port= www/hs-shakespeare-js
shakespeare-text_port= www/hs-shakespeare-text
show_port= devel/hs-show
silently_port= devel/hs-silently
+simple-reflect_port= devel/hs-simple-reflect
simple-sendfile_port= net/hs-simple-sendfile
skein_port= security/hs-skein
smallcheck_port= devel/hs-smallcheck
@@ -283,7 +311,9 @@ test-framework-quickcheck2_port= devel/hs-test-framework-quickcheck2
testpack_port= devel/hs-testpack
texmath_port= textproc/hs-texmath # executable
text_port= devel/hs-text
+threads_port= devel/hs-threads
threadscope_port= devel/hs-threadscope # executable
+time-compat_port= devel/hs-time-compat
tls_port= security/hs-tls
tls-extra_port= security/hs-tls-extra
transformers_port= devel/hs-transformers
@@ -292,6 +322,7 @@ TypeCompose_port= devel/hs-TypeCompose
unamb_port= devel/hs-unamb
uniplate_port= devel/hs-uniplate
unix-compat_port= devel/hs-unix-compat
+unix-time_port= devel/hs-unix-time
unlambda_port= lang/hs-unlambda # executable
unordered-containers_port= devel/hs-unordered-containers
url_port= www/hs-url
@@ -315,6 +346,7 @@ wai-logger_port= www/hs-wai-logger
wai-test_port= www/hs-wai-test
warp_port= www/hs-warp
webkit_port= www/hs-webkit
+word8_port= devel/hs-word8
wx_port= x11-toolkits/hs-wx
wxc_port= x11-toolkits/hs-wxc # lib_depends
wxcore_port= x11-toolkits/hs-wxcore # lib_depends
@@ -325,7 +357,6 @@ xhtml_port= textproc/hs-xhtml
xml_port= textproc/hs-xml
xml-conduit_port= textproc/hs-xml-conduit
xml-types_port= textproc/hs-xml-types
-xml2html_port= textproc/hs-xml2html
xmlhtml_port= textproc/hs-xmlhtml
xmobar_port= x11/hs-xmobar # executable
xmonad_port= x11-wm/hs-xmonad # executable
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 2a469dbefc02..aaeaf1a5e791 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,7 +1,7 @@
-SHA256 (ghc-7.4.1-src.tar.bz2) = 721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79
-SIZE (ghc-7.4.1-src.tar.bz2) = 25272609
-SHA256 (hscolour-1.19.tar.gz) = 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f
-SIZE (hscolour-1.19.tar.gz) = 25466
+SHA256 (ghc-7.4.2-src.tar.bz2) = f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d
+SIZE (ghc-7.4.2-src.tar.bz2) = 25836446
+SHA256 (hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
+SIZE (hscolour-1.20.2.tar.gz) = 25722
SHA256 (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = e5cfc6c098179f8657d5cbf1a0fe70e8e9bfdde5a280c095e1dfc51d6e43731f
SIZE (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = 45438870
SHA256 (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 836e48e2a250a43b1230eac7f04821de86d915a51d0a36d6040b48cdd25ecedb
diff --git a/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in b/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
index 7976302419f1..7976302419f1 100644
--- a/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in
+++ b/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
diff --git a/lang/ghc/files/patch-compiler_ghc.mk b/lang/ghc/files/patch-compiler_ghc.mk
deleted file mode 100644
index ebd1dda64453..000000000000
--- a/lang/ghc/files/patch-compiler_ghc.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./compiler/ghc.mk.orig 2012-02-01 19:10:32.000000000 +0100
-+++ ./compiler/ghc.mk 2012-05-17 11:32:41.868463028 +0200
-@@ -107,6 +107,10 @@
- @echo 'cRAWCPP_FLAGS = "$(RAWCPP_FLAGS)"' >> $@
- @echo 'cLdHasNoCompactUnwind :: String' >> $@
- @echo 'cLdHasNoCompactUnwind = "$(LdHasNoCompactUnwind)"' >> $@
-+ @echo 'cLdHashSize31 :: String' >> $@
-+ @echo 'cLdHashSize31 = "$(LdHashSize31)"' >> $@
-+ @echo 'cLdReduceMemoryOverheads :: String' >> $@
-+ @echo 'cLdReduceMemoryOverheads = "$(LdReduceMemoryOverheads)"' >> $@
- @echo 'cLdIsGNULd :: String' >> $@
- @echo 'cLdIsGNULd = "$(LdIsGNULd)"' >> $@
- @echo 'cLdHasBuildId :: String' >> $@
diff --git a/lang/ghc/files/patch-compiler_main_DriverPipeline.hs b/lang/ghc/files/patch-compiler_main_DriverPipeline.hs
deleted file mode 100644
index e6740df077ae..000000000000
--- a/lang/ghc/files/patch-compiler_main_DriverPipeline.hs
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./compiler/main/DriverPipeline.hs.orig 2012-05-17 11:27:22.763461303 +0200
-+++ ./compiler/main/DriverPipeline.hs 2012-05-17 11:27:00.427463463 +0200
-@@ -1753,6 +1753,14 @@
- then ["-Wl,-no_compact_unwind"]
- else [])
-
-+ ++ (if cLdHashSize31 == "YES"
-+ then ["-Wl,--hash-size=31"]
-+ else [])
-+
-+ ++ (if cLdReduceMemoryOverheads == "YES"
-+ then ["-Wl,--reduce-memory-overheads"]
-+ else [])
-+
- -- '-Wl,-read_only_relocs,suppress'
- -- ld gives loads of warnings like:
- -- ld: warning: text reloc in _base_GHCziArr_unsafeArray_info to _base_GHCziArr_unsafeArray_closure
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
index 038cefa7a9c9..3383b16e1a76 100644
--- a/lang/ghc/files/patch-configure
+++ b/lang/ghc/files/patch-configure
@@ -1,15 +1,6 @@
---- ./configure.orig 2012-02-01 19:11:45.000000000 +0100
-+++ ./configure 2012-05-18 12:40:29.000000000 +0200
-@@ -608,6 +608,8 @@
- HavePapiLib
- GTK_CONFIG
- LdHasNoCompactUnwind
-+LdHashSize31
-+LdReduceMemoryOverheads
- LdHasBuildId
- LdIsGNULd
- LdXFlag
-@@ -3372,8 +3374,8 @@
+--- configure.orig 2012-06-06 18:11:19.000000000 +0100
++++ configure 2012-08-25 06:03:00.000000000 +0100
+@@ -3372,8 +3372,8 @@
vax)
BuildArch="vax"
;;
@@ -20,7 +11,7 @@
;;
*)
echo "Unknown CPU $build_cpu"
-@@ -3404,7 +3406,7 @@
+@@ -3404,7 +3404,7 @@
freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
BuildOS="$build_os"
;;
@@ -29,7 +20,7 @@
BuildOS="freebsd"
;;
*)
-@@ -3486,8 +3488,8 @@
+@@ -3486,8 +3486,8 @@
vax)
HostArch="vax"
;;
@@ -40,7 +31,7 @@
;;
*)
echo "Unknown CPU $host_cpu"
-@@ -3600,8 +3602,8 @@
+@@ -3600,8 +3600,8 @@
vax)
TargetArch="vax"
;;
@@ -51,123 +42,16 @@
;;
*)
echo "Unknown CPU $target_cpu"
-@@ -3712,6 +3714,9 @@
+@@ -3711,6 +3711,8 @@
+bootstrap_target=`echo "$bootstrap_target" |sed -e 's/-unknown-/-portbld-/g' -e 's/x86_64/amd64/g'`
+build=`echo "$build" |sed -e 's/\(freebsd\)[[:digit:].]*$/\1/g'`
-+
+
# Verify that the installed (bootstrap) GHC is capable of generating
# code for the requested build platform.
- if test "$BootingFromHc" = "NO"
-@@ -5313,9 +5318,9 @@
- echo 'foo() {}' > conftest.c
- ${CC-cc} -c conftest.c
- if ${LdCmd} -r --hash-size=31 -o conftest2.o conftest.o > /dev/null 2>&1; then
-- fp_cv_LdHashSize31=--hash-size=31
-+ fp_cv_LdHashSize31=YES
- else
-- fp_cv_LdHashSize31=
-+ fp_cv_LdHashSize31=NO
- fi
- rm -rf conftest*
- fi
-@@ -5334,9 +5339,9 @@
- echo 'foo() {}' > conftest.c
- ${CC-cc} -c conftest.c
- if ${LdCmd} -r --reduce-memory-overheads -o conftest2.o conftest.o > /dev/null 2>&1; then
-- fp_cv_LdReduceMemoryOverheads=--reduce-memory-overheads
-+ fp_cv_LdReduceMemoryOverheads=YES
- else
-- fp_cv_LdReduceMemoryOverheads=
-+ fp_cv_LdReduceMemoryOverheads=NO
- fi
- rm -rf conftest*
- fi
-@@ -5387,18 +5392,6 @@
- CFLAGS="$CFLAGS -fno-stack-protector"
- fi
-
-- # Reduce memory usage when linking. See trac #5240.
-- if test -n "$LdHashSize31"
-- then
-- LDFLAGS="$LDFLAGS -Wl,$LdHashSize31"
-- IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS $LdHashSize31"
-- fi
-- if test -n "$LdReduceMemoryOverheads"
-- then
-- LDFLAGS="$LDFLAGS -Wl,$LdReduceMemoryOverheads"
-- IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS $LdReduceMemoryOverheads"
-- fi
--
- rm -f conftest.c conftest.o
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
- $as_echo "done" >&6; }
-@@ -5445,15 +5438,15 @@
- fi
-
- # Reduce memory usage when linking. See trac #5240.
-- if test -n "$LdHashSize31"
-+ if [ "$LdHashSize31" = "YES" ]
- then
-- CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdHashSize31"
-- CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 $LdHashSize31"
-+ CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--hash-size=31"
-+ CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 --hash-size=31"
- fi
-- if test -n "$LdReduceMemoryOverheads"
-+ if [ "$LdReduceMemoryOverheads" = "YES" ]
- then
-- CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdReduceMemoryOverheads"
-- CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 $LdReduceMemoryOverheads"
-+ CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--reduce-memory-overheads"
-+ CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 --reduce-memory-overheads"
- fi
-
- rm -f conftest.c conftest.o
-@@ -5502,15 +5495,15 @@
- fi
-
- # Reduce memory usage when linking. See trac #5240.
-- if test -n "$LdHashSize31"
-+ if [ "$LdHashSize31" = "YES" ]
- then
-- CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdHashSize31"
-- CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 $LdHashSize31"
-+ CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--hash-size=31"
-+ CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 --hash-size=31"
- fi
-- if test -n "$LdReduceMemoryOverheads"
-+ if [ "$LdReduceMemoryOverheads" = "YES" ]
- then
-- CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdReduceMemoryOverheads"
-- CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 $LdReduceMemoryOverheads"
-+ CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--reduce-memory-overheads"
-+ CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 --reduce-memory-overheads"
- fi
-
- rm -f conftest.c conftest.o
-@@ -5559,18 +5552,6 @@
- CONF_CC_OPTS_STAGE2="$CONF_CC_OPTS_STAGE2 -fno-stack-protector"
- fi
-
-- # Reduce memory usage when linking. See trac #5240.
-- if test -n "$LdHashSize31"
-- then
-- CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdHashSize31"
-- CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 $LdHashSize31"
-- fi
-- if test -n "$LdReduceMemoryOverheads"
-- then
-- CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdReduceMemoryOverheads"
-- CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 $LdReduceMemoryOverheads"
-- fi
--
- rm -f conftest.c conftest.o
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
- $as_echo "done" >&6; }
-@@ -5772,7 +5753,7 @@
+@@ -5772,7 +5774,7 @@
i386)
test -z "$2" || eval "$2=ArchX86"
;;
@@ -176,7 +60,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -5953,7 +5934,7 @@
+@@ -5953,7 +5955,7 @@
checkVendor() {
case $1 in
@@ -185,7 +69,7 @@
;;
*)
echo "Unknown vendor $1"
-@@ -5976,7 +5957,7 @@
+@@ -5976,7 +5978,7 @@
mingw32)
test -z "$2" || eval "$2=OSMinGW32"
;;
@@ -194,7 +78,7 @@
test -z "$2" || eval "$2=OSFreeBSD"
;;
kfreebsdgnu)
-@@ -9987,7 +9968,7 @@
+@@ -9990,7 +9992,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -203,7 +87,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -10018,11 +9999,7 @@
+@@ -10021,12 +10023,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
@@ -212,7 +96,8 @@
-_ACEOF
-
- LIBS="-lrt $LIBS"
-+ LIBS="$LIBS"
-
+-
++ LIBS="$LIBS"
fi
+ for ac_func in clock_gettime timer_create timer_settime
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 8844713ad7f5..00eeed367856 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- ghc.mk.orig 2012-02-01 19:10:32.000000000 +0100
-+++ ghc.mk 2012-06-08 17:39:40.000000000 +0200
+--- ghc.mk.orig 2012-06-06 18:10:25.000000000 +0100
++++ ghc.mk 2012-08-25 12:57:51.000000000 +0100
@@ -81,6 +81,7 @@
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
@@ -11,12 +8,3 @@ $FreeBSD$
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
endif
-@@ -377,6 +378,8 @@
- endif
- endef
-
-+PACKAGES =
-+
- define addPackage # args: $1 = package, $2 = condition
- ifneq "$(filter $1,$(PKGS_THAT_USE_TH)) $(GhcProfiled)" "$1 YES"
- ifeq "$(filter $1,$(PKGS_THAT_BUILD_WITH_STAGE2))" "$1"
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
new file mode 100644
index 000000000000..96945336bbc0
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -0,0 +1,46 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs 2012-11-23 19:17:52.000000000 +0100
+@@ -46,7 +46,7 @@
+ ) where
+
+ import Distribution.Simple.Program.Types
+- ( Program(..), simpleProgram )
++ ( Program(..), simpleProgram, simpleProgramFromEnvironment )
+ import Distribution.Simple.Utils
+ ( findProgramLocation, findProgramVersion )
+
+@@ -194,15 +194,15 @@
+ }
+
+ gccProgram :: Program
+-gccProgram = (simpleProgram "gcc") {
++gccProgram = (simpleProgramFromEnvironment "gcc" "CC") {
+ programFindVersion = findProgramVersion "-dumpversion" id
+ }
+
+ ranlibProgram :: Program
+-ranlibProgram = simpleProgram "ranlib"
++ranlibProgram = simpleProgramFromEnvironment "ranlib" "RANLIB"
+
+ arProgram :: Program
+-arProgram = simpleProgram "ar"
++arProgram = simpleProgramFromEnvironment "ar" "AR"
+
+ stripProgram :: Program
+ stripProgram = simpleProgram "strip"
+@@ -255,13 +255,13 @@
+ greencardProgram = simpleProgram "greencard"
+
+ ldProgram :: Program
+-ldProgram = simpleProgram "ld"
++ldProgram = simpleProgramFromEnvironment "ld" "LD"
+
+ tarProgram :: Program
+ tarProgram = simpleProgram "tar"
+
+ cppProgram :: Program
+-cppProgram = simpleProgram "cpp"
++cppProgram = simpleProgramFromEnvironment "cpp" "CPP"
+
+ pkgConfigProgram :: Program
+ pkgConfigProgram = (simpleProgram "pkg-config") {
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
new file mode 100644
index 000000000000..98b11338b455
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
@@ -0,0 +1,38 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs.orig 2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs 2012-11-23 19:19:04.000000000 +0100
+@@ -18,6 +18,7 @@
+ -- * Program and functions for constructing them
+ Program(..),
+ simpleProgram,
++ simpleProgramFromEnvironment,
+
+ -- * Configured program and related functions
+ ConfiguredProgram(..),
+@@ -28,7 +29,7 @@
+ ) where
+
+ import Distribution.Simple.Utils
+- ( findProgramLocation )
++ ( findProgramLocation, getProgramFromEnvironment )
+ import Distribution.Version
+ ( Version )
+ import Distribution.Verbosity
+@@ -116,6 +117,18 @@
+ programPostConf = \_ _ -> return []
+ }
+
++-- | Make a simple named program from an environment variable.
++--
++-- > simpleProgramFromEnvironment "foo" "FOO"
++--
++simpleProgramFromEnvironment :: String -> String -> Program
++simpleProgramFromEnvironment name var = Program {
++ programName = name,
++ programFindLocation = \v -> getProgramFromEnvironment v name var,
++ programFindVersion = \_ _ -> return Nothing,
++ programPostConf = \_ _ -> return []
++ }
++
+ -- | Make a simple 'ConfiguredProgram'.
+ --
+ -- > simpleConfiguredProgram "foo" (FoundOnSystem path)
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
new file mode 100644
index 000000000000..d9be9167a45e
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
@@ -0,0 +1,39 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs.orig 2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs 2012-11-23 19:38:03.000000000 +0100
+@@ -95,6 +95,7 @@
+ findModuleFile,
+ findModuleFiles,
+ getDirectoryContentsRecursive,
++ getProgramFromEnvironment,
+
+ -- * simple file globbing
+ matchFileGlob,
+@@ -152,7 +153,7 @@
+ ( getDirectoryContents, doesDirectoryExist, doesFileExist, removeFile
+ , findExecutable )
+ import System.Environment
+- ( getProgName )
++ ( getProgName, getEnvironment )
+ import System.Cmd
+ ( rawSystem )
+ import System.Exit
+@@ -670,6 +671,19 @@
+ ignore ['.', '.'] = True
+ ignore _ = False
+
++getProgramFromEnvironment :: Verbosity -> String -> String -> IO (Maybe FilePath)
++getProgramFromEnvironment verbosity prog name = do
++ debug verbosity $
++ "searching for " ++ prog ++ " in the environment (as " ++ name ++ ")."
++ res <- lookup name `fmap` getEnvironment
++ case res of
++ Nothing -> do
++ debug verbosity $ "falling back to searching in the path."
++ findExecutable prog
++ v@(Just val) -> do
++ debug verbosity $ "found as " ++ val ++ "."
++ return v
++
+ ----------------
+ -- File globbing
+
diff --git a/lang/ghc/files/patch-libraries_bin-package-db_LICENSE b/lang/ghc/files/patch-libraries_bin-package-db_LICENSE
deleted file mode 100644
index 698da4c221ea..000000000000
--- a/lang/ghc/files/patch-libraries_bin-package-db_LICENSE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null
-+++ libraries/bin-package-db/LICENSE
-@@ -0,0 +1,2 @@
-+
-+
diff --git a/lang/ghc/files/patch-mk_config.mk.in b/lang/ghc/files/patch-mk_config.mk.in
deleted file mode 100644
index 091c2aadddb3..000000000000
--- a/lang/ghc/files/patch-mk_config.mk.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./mk/config.mk.in.orig 2012-02-01 19:10:32.000000000 +0100
-+++ ./mk/config.mk.in 2012-05-17 11:30:15.271461640 +0200
-@@ -699,6 +699,9 @@
- # and compiler/main/DriverPipeline.hs.
- LdHasNoCompactUnwind = @LdHasNoCompactUnwind@
-
-+LdHashSize31 = @LdHashSize31@
-+LdReduceMemoryOverheads = @LdReduceMemoryOverheads@
-+
- # On MSYS, building with SplitObjs=YES fails with
- # ar: Bad file number
- # see #3201. We need to specify a smaller max command-line size
diff --git a/lang/ghc/pkg-descr b/lang/ghc/pkg-descr
index 28181522ac05..f6962bd4d3aa 100644
--- a/lang/ghc/pkg-descr
+++ b/lang/ghc/pkg-descr
@@ -13,4 +13,4 @@ generational garbage collector, a space and time profiler, comprehensive
set of libraries and an interactive system for convenient, quick
development.
-WWW: http://www.haskell.org/ghc/
+WWW: http://www.haskell.org/ghc/
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index eafd160eaa70..a8f2fe1f03c1 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-brainfuck
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= brainfuck
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
index 9f05a9589311..c4f906d5d150 100644
--- a/lang/hs-epic/Makefile
+++ b/lang/hs-epic/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-epic
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= epic
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-epic/pkg-descr b/lang/hs-epic/pkg-descr
index 82fe95df65b9..a87859ab72a4 100644
--- a/lang/hs-epic/pkg-descr
+++ b/lang/hs-epic/pkg-descr
@@ -7,4 +7,4 @@ can be invoked either as a library or an application.
[2] http://www.e-pig.org/
[3] http://idris-lang.org/
-WWW: http://www.dcs.st-and.ac.uk/~eb/epic.php
+WWW: http://www.dcs.st-and.ac.uk/~eb/epic.php
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index a5b901ecc00c..0017c10296ae 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for: hs-unlambda
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= unlambda
-PORTVERSION= 0.1
-PORTREVISION= 6
+PORTVERSION= 0.1.3
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Unlambda interpreter written in Haskell
+COMMENT= Unlambda interpreter
LICENSE= GPLv2
diff --git a/lang/hs-unlambda/distinfo b/lang/hs-unlambda/distinfo
index 75adfd6b8c89..046bf6851089 100644
--- a/lang/hs-unlambda/distinfo
+++ b/lang/hs-unlambda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unlambda-0.1.tar.gz) = f1ede8570bd18c4947d776c68d429a9e86559f141b0aed4614dfa8bf0b2fb676
-SIZE (cabal/unlambda-0.1.tar.gz) = 9275
+SHA256 (cabal/unlambda-0.1.3.tar.gz) = 09c1a0aa5ff464bc81dba3be4c6cabe25d89b8a057ca2c8eaa470df1e0bc8c32
+SIZE (cabal/unlambda-0.1.3.tar.gz) = 9549
diff --git a/lang/hs-unlambda/pkg-descr b/lang/hs-unlambda/pkg-descr
index 9c1aee34f9ba..a55ddaa38c2a 100644
--- a/lang/hs-unlambda/pkg-descr
+++ b/lang/hs-unlambda/pkg-descr
@@ -1,4 +1,4 @@
-This is an interpreter of the Unlambda language,
-written in the pure, lazy, functional language Haskell.
+This is an interpreter of the Unlambda language, written in the pure,
+lazy, functional language Haskell.
WWW: http://hackage.haskell.org/package/unlambda
diff --git a/mail/Makefile b/mail/Makefile
index 161033d51274..c5549848dbeb 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -193,6 +193,7 @@
SUBDIR += hs-email-validate
SUBDIR += hs-mime
SUBDIR += hs-mime-mail
+ SUBDIR += hs-mime-types
SUBDIR += ifile
SUBDIR += ilohamail
SUBDIR += ilohamail-devel
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 98ffe71658f0..68322a475d23 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-email-validate
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= email-validate
-PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTVERSION= 0.3.2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index 043f3437930e..1d31c58a5155 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/email-validate-0.2.8.tar.gz) = 0dcf3b2186c6bf5681b5a12448b12db58b48fbac7710dddb3464cd1faa0d9f11
-SIZE (cabal/email-validate-0.2.8.tar.gz) = 6086
+SHA256 (cabal/email-validate-0.3.2.tar.gz) = 18d6c65b52f41b6b107d6d4c5ee8b95eff8b4a0ea2be07d8b13b061701cd5033
+SIZE (cabal/email-validate-0.3.2.tar.gz) = 41930
diff --git a/mail/hs-email-validate/pkg-descr b/mail/hs-email-validate/pkg-descr
index 54468d93b220..265414ff3c8e 100644
--- a/mail/hs-email-validate/pkg-descr
+++ b/mail/hs-email-validate/pkg-descr
@@ -1,3 +1,3 @@
Validating an email address string against RFC 5322.
-WWW: http://porg.es/blog/email-address-validation-simpler-faster-more-correct
+WWW: http://porg.es/blog/email-address-validation-simpler-faster-more-correct
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 9525165044f4..6ea7870ccf0f 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-mime-mail
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= mime-mail
-PORTVERSION= 0.4.1.1
-PORTREVISION= 2
+PORTVERSION= 0.4.1.2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo
index 9274db6c9b84..a0beb43ffe7d 100644
--- a/mail/hs-mime-mail/distinfo
+++ b/mail/hs-mime-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-mail-0.4.1.1.tar.gz) = c41b2e8a5893f1e3ff49d357ec427d9c82692822291444615a6a4aed0d83ba05
-SIZE (cabal/mime-mail-0.4.1.1.tar.gz) = 5959
+SHA256 (cabal/mime-mail-0.4.1.2.tar.gz) = 9efbb13ae7cd452388e080f08514e55bfa9ae54c8a044eb5048fd7fef64fbc05
+SIZE (cabal/mime-mail-0.4.1.2.tar.gz) = 5943
diff --git a/mail/hs-mime-mail/pkg-descr b/mail/hs-mime-mail/pkg-descr
index c45a8c80689c..8453044bb1f5 100644
--- a/mail/hs-mime-mail/pkg-descr
+++ b/mail/hs-mime-mail/pkg-descr
@@ -4,4 +4,4 @@ and the ability to send bytestrings via the sendmail executable. You
can also use any other library you wish to send via different methods,
eg directly to SMTP.
-WWW: http://github.com/snoyberg/mime-mail
+WWW: http://github.com/snoyberg/mime-mail
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
new file mode 100644
index 000000000000..440b0f9ec698
--- /dev/null
+++ b/mail/hs-mime-types/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= mime-types
+PORTVERSION= 0.1.0.0
+CATEGORIES= mail haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Basic mime-type handling types and functions
+
+LICENSE= MIT
+
+USE_CABAL= text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
new file mode 100644
index 000000000000..110219f10c56
--- /dev/null
+++ b/mail/hs-mime-types/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/mime-types-0.1.0.0.tar.gz) = 37f0b99e3ddcde95693c1b4586b6d7f905390dd5a8c90199f75f5b82f2358375
+SIZE (cabal/mime-types-0.1.0.0.tar.gz) = 2720
diff --git a/mail/hs-mime-types/pkg-descr b/mail/hs-mime-types/pkg-descr
new file mode 100644
index 000000000000..87078e56c865
--- /dev/null
+++ b/mail/hs-mime-types/pkg-descr
@@ -0,0 +1,3 @@
+Basic mime-type handling types and functions.
+
+WWW: https://github.com/yesodweb/wai
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index cf1936448e27..daf0ed1e7366 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-mime
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= mime
-PORTVERSION= 0.3.3.2
+PORTVERSION= 0.3.4
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime/distinfo b/mail/hs-mime/distinfo
index 3f33de07639c..1d7413bf5498 100644
--- a/mail/hs-mime/distinfo
+++ b/mail/hs-mime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-0.3.3.2.tar.gz) = 7672ef547792f2314a5b28aa57f9793abc474257779a2fcc70c1d00d05f84164
-SIZE (cabal/mime-0.3.3.2.tar.gz) = 8828
+SHA256 (cabal/mime-0.3.4.tar.gz) = 9e4b77e95df4eeb7d247acf46c996785a974f248cfa8729300dbf816c5f09bce
+SIZE (cabal/mime-0.3.4.tar.gz) = 8884
diff --git a/mail/hs-mime/pkg-descr b/mail/hs-mime/pkg-descr
index 75d88e191180..82c488f42d9d 100644
--- a/mail/hs-mime/pkg-descr
+++ b/mail/hs-mime/pkg-descr
@@ -1,3 +1,3 @@
Working with MIME types.
-WWW: http://github.com/GaloisInc/mime
+WWW: http://github.com/GaloisInc/mime
diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile
index b528cb5daf6b..7d28ef0dbba0 100644
--- a/math/hs-Agda-executable/Makefile
+++ b/math/hs-Agda-executable/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-Agda-executable
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= Agda-executable
PORTVERSION= 2.3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-Agda-executable/pkg-descr b/math/hs-Agda-executable/pkg-descr
index 489ce5aca373..e6525337a1d7 100644
--- a/math/hs-Agda-executable/pkg-descr
+++ b/math/hs-Agda-executable/pkg-descr
@@ -2,4 +2,4 @@ This package provides a command-line program for type-checking and compiling
Agda programs. The program can also generate hyperlinked, highlighted HTML
files from Agda sources.
-WWW: http://wiki.portal.chalmers.se/agda/
+WWW: http://wiki.portal.chalmers.se/agda/
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 4077c6d640bd..6aaa8cf9d2c7 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-Agda
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= Agda
PORTVERSION= 2.3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -34,7 +30,7 @@ OPTIONS_DEFINE= USE_LOCALE EPIC
USE_LOCALE_DESC= Use encoding specified by the locale
EPIC_DESC= Install the Epic compiler
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MUSE_LOCALE}
CONFIGURE_ARGS+= --flags="use-locale"
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index e0c9851b621d..d451dea27c94 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,5 +1,5 @@
--- ./Agda.cabal.orig 2012-03-12 11:09:34.000000000 +0100
-+++ ./Agda.cabal 2012-05-12 19:53:25.000000000 +0200
++++ ./Agda.cabal 2012-10-03 22:53:16.000000000 +0200
@@ -71,13 +71,13 @@
if flag(use-locale)
build-depends: base >= 4.2 && < 4.6
@@ -10,9 +10,10 @@
if flag(epic)
build-depends: epic >= 0.1.13 && < 0.10
- build-depends: mtl == 2.0.*,
-+ build-depends: mtl >= 2.0,
- QuickCheck >= 2.3 && < 2.5,
+- QuickCheck >= 2.3 && < 2.5,
- haskell-src-exts >= 1.9.6 && < 1.12,
++ build-depends: mtl >= 2.0,
++ QuickCheck >= 2.3 && < 2.6,
+ haskell-src-exts >= 1.9.6,
containers >= 0.1 && < 0.5,
pretty >= 1.0 && < 1.2,
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs b/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs
new file mode 100644
index 000000000000..907f0bed5274
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs
@@ -0,0 +1,11 @@
+--- ./src/full/Agda/Termination/Lexicographic.hs.orig 2012-03-12 11:09:33.000000000 +0100
++++ ./src/full/Agda/Termination/Lexicographic.hs 2012-10-03 23:48:30.000000000 +0200
+@@ -230,7 +230,7 @@
+ , quickCheck' prop_fromDiagonals
+ , quickCheck' prop_newBehaviour
+ , quickCheckWith' stdArgs{ maxSuccess = 50
+- , maxDiscard = 200
++ , maxDiscardRatio = 200
+ , maxSize = 20
+ }
+ prop_lexOrder
diff --git a/math/hs-Agda/pkg-descr b/math/hs-Agda/pkg-descr
index eff01c4dd9ac..5c70fb2cc8f0 100644
--- a/math/hs-Agda/pkg-descr
+++ b/math/hs-Agda/pkg-descr
@@ -10,4 +10,4 @@ system for constructive mathematics developed by the Swedish logician Per
Martin-Lof. It has many similarities with other proof assistants based on
dependent types, such as Coq, Epigram and NuPRL.
-WWW: http://wiki.portal.chalmers.se/agda/
+WWW: http://wiki.portal.chalmers.se/agda/
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 9de383e9f574..1e37581f5b63 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-NumInstances
-# Date created: September 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= NumInstances
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-NumInstances/pkg-descr b/math/hs-NumInstances/pkg-descr
index 3716aa497416..eda28ea63958 100644
--- a/math/hs-NumInstances/pkg-descr
+++ b/math/hs-NumInstances/pkg-descr
@@ -1,3 +1,3 @@
Instances of numeric classes for functions and tuples.
-WWW: http://hackage.haskell.org/package/NumInstances
+WWW: http://hackage.haskell.org/package/NumInstances
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 6a8cb3e84322..3e9e07c0aba4 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-categories
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= categories
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Categories from category-extras
+COMMENT= Categories
LICENSE= BSD
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 86aae3f9be87..5307bec2f48e 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/categories-1.0.3.tar.gz) = 38c774fc4952f05d05e4b84c0e92ad6ccc0d5762ff82bb1971b387cba7f1f208
-SIZE (cabal/categories-1.0.3.tar.gz) = 7907
+SHA256 (cabal/categories-1.0.4.tar.gz) = fd18fa344f79c5659b593738484c4305421e356d9fe27d43d1a0abc16ddcbec6
+SIZE (cabal/categories-1.0.4.tar.gz) = 7916
diff --git a/math/hs-categories/pkg-descr b/math/hs-categories/pkg-descr
index 62cf9873fa92..6c6d662d48e1 100644
--- a/math/hs-categories/pkg-descr
+++ b/math/hs-categories/pkg-descr
@@ -1,3 +1,3 @@
Categories.
-WWW: http://github.com/ekmett/categories
+WWW: http://github.com/ekmett/categories
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
index b6856815cb11..c3172f0eb326 100644
--- a/math/hs-comonad-transformers/Makefile
+++ b/math/hs-comonad-transformers/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-comonad-tranformers
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= comonad-transformers
-PORTVERSION= 2.1.2
+PORTVERSION= 3.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,8 +9,8 @@ COMMENT= Comonad transformers
LICENSE= BSD
-USE_CABAL= comonad>=1.1.1.5 contravariant>=0.2.0.1 distributive>=0.2.2 \
- semigroupoids>=1.3.1.2 semigroups>=0.8.3.1 transformers>=0.2
+USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 distributive>=0.2.2 \
+ semigroupoids>=3.0 semigroups>=0.8.3.1 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad-transformers/distinfo b/math/hs-comonad-transformers/distinfo
index 683bf19cd96c..8adf3da15462 100644
--- a/math/hs-comonad-transformers/distinfo
+++ b/math/hs-comonad-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-transformers-2.1.2.tar.gz) = 3a6e568490baa8211236e2a43985ea2a4e9527a75ac2e4d00d2f776c5dd4177a
-SIZE (cabal/comonad-transformers-2.1.2.tar.gz) = 6235
+SHA256 (cabal/comonad-transformers-3.0.tar.gz) = 447ced0e4ccf9e7b008b9f487d82095f13cf6548d7c01c4363b8fe9683e951ae
+SIZE (cabal/comonad-transformers-3.0.tar.gz) = 6319
diff --git a/math/hs-comonad-transformers/pkg-descr b/math/hs-comonad-transformers/pkg-descr
index 91498c00028b..d2ac6c6de823 100644
--- a/math/hs-comonad-transformers/pkg-descr
+++ b/math/hs-comonad-transformers/pkg-descr
@@ -1,3 +1,3 @@
Comonad transformers.
-WWW: http://github.com/ekmett/comonad-transformers/ \ No newline at end of file
+WWW: http://github.com/ekmett/comonad-transformers/
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index ed7d226b69aa..992378a57508 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,21 +1,15 @@
-# New ports collection makefile for: hs-comonad
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= comonad
-PORTVERSION= 1.1.1.6
-PORTREVISION= 1
+PORTVERSION= 3.0.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 comonads
+COMMENT= Haskell 98 compatible comonads
LICENSE= BSD
-USE_CABAL= semigroups>=0.8.3.1 transformers>=0.2
+USE_CABAL= semigroups>=0.8.3 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 470dba875ca8..9eafde869ed7 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-1.1.1.6.tar.gz) = e5690ff7cb9f9b33ff46ce1107e6d074427a21b3a2d07b4475bf8e348ebae0e9
-SIZE (cabal/comonad-1.1.1.6.tar.gz) = 4358
+SHA256 (cabal/comonad-3.0.0.2.tar.gz) = 113aca5618a478d25ce2f71718e5226f41bd0a953d4b1c906cab5543c80a0707
+SIZE (cabal/comonad-3.0.0.2.tar.gz) = 4287
diff --git a/math/hs-comonad/pkg-descr b/math/hs-comonad/pkg-descr
index 14fda49fad14..dbfe091539f6 100644
--- a/math/hs-comonad/pkg-descr
+++ b/math/hs-comonad/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 compatible comonads.
-WWW: http://github.com/ekmett/comonad/ \ No newline at end of file
+WWW: http://github.com/ekmett/comonad/
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index ab1baa2a2c64..c0dfb0b8ed67 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-contravariant
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= contravariant
PORTVERSION= 0.2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-contravariant/pkg-descr b/math/hs-contravariant/pkg-descr
index b99ff0039d98..1bf600d0adf2 100644
--- a/math/hs-contravariant/pkg-descr
+++ b/math/hs-contravariant/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 contravariant functors.
-WWW: http://github.com/ekmett/contravariant/ \ No newline at end of file
+WWW: http://github.com/ekmett/contravariant/
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index 27fd1c45d9af..1eef8f7d54ef 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-data-lens-template
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= data-lens-template
-PORTVERSION= 2.1.5
-PORTREVISION= 1
+PORTVERSION= 2.1.7
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/distinfo b/math/hs-data-lens-template/distinfo
index ec905f0a38cf..3338afcfd07e 100644
--- a/math/hs-data-lens-template/distinfo
+++ b/math/hs-data-lens-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-template-2.1.5.tar.gz) = ac371f9448bfe16767808735c2f1653d7679d49b90f843c163533459fca22926
-SIZE (cabal/data-lens-template-2.1.5.tar.gz) = 3316
+SHA256 (cabal/data-lens-template-2.1.7.tar.gz) = 897046267245481834d4aa972de77af9c09fd4b861c9ddb609806bfacadc1d81
+SIZE (cabal/data-lens-template-2.1.7.tar.gz) = 3332
diff --git a/math/hs-data-lens-template/pkg-descr b/math/hs-data-lens-template/pkg-descr
index 79c2c21226e9..b65b50f489cc 100644
--- a/math/hs-data-lens-template/pkg-descr
+++ b/math/hs-data-lens-template/pkg-descr
@@ -1,3 +1,3 @@
Automatically derive Lenses for your data type for use with Data.Lens.
-WWW: http://github.com/ekmett/data-lens-template/
+WWW: http://github.com/ekmett/data-lens-template/
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index a176f79f1be2..3665a7f5687d 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-data-lens
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= data-lens
-PORTVERSION= 2.10.0
-PORTREVISION= 1
+PORTVERSION= 2.10.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/distinfo b/math/hs-data-lens/distinfo
index 6087d1d94b1c..1899c71726cb 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-2.10.0.tar.gz) = f315bc3013c0af6e2a79f5f9ec391afefcf0d7520a0158f9347f4fd555a27978
-SIZE (cabal/data-lens-2.10.0.tar.gz) = 5974
+SHA256 (cabal/data-lens-2.10.2.tar.gz) = 6591e2f4712d262c49eea32788699eec6cab929c074496504b0057980ba464d7
+SIZE (cabal/data-lens-2.10.2.tar.gz) = 6012
diff --git a/math/hs-data-lens/pkg-descr b/math/hs-data-lens/pkg-descr
index b599b6ab5fe6..fea8146d8fec 100644
--- a/math/hs-data-lens/pkg-descr
+++ b/math/hs-data-lens/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 lenses.
-WWW: http://github.com/ekmett/data-lens/
+WWW: http://github.com/roconnor/data-lens/
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 1e73736f0a58..148ff33c9e89 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-distributive
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= distributive
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/pkg-descr b/math/hs-distributive/pkg-descr
index b881ff3d34c7..af14ab605ad6 100644
--- a/math/hs-distributive/pkg-descr
+++ b/math/hs-distributive/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 distributive functors -- dual to Traversable.
-WWW: http://github.com/ekmett/distributive/ \ No newline at end of file
+WWW: http://github.com/ekmett/distributive/
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index da31ad843827..d42e2d6bba0f 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-erf
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 96c87a844274..55b863f8d55f 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-ieee754
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= ieee754
PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/pkg-descr b/math/hs-ieee754/pkg-descr
index 614a09e9b446..bae95aafb448 100644
--- a/math/hs-ieee754/pkg-descr
+++ b/math/hs-ieee754/pkg-descr
@@ -2,4 +2,4 @@ Utilities for dealing with IEEE floating point numbers, ported from the
Tango math library; approximate and exact equality comparisons for general
types.
-WWW: http://github.com/patperry/hs-ieee754
+WWW: http://github.com/patperry/hs-ieee754
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index f6dc7faaf478..5b3e6f7ab231 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -1,16 +1,11 @@
-# New ports collection makefile for: hs-math-functions
-# Date created: Feb 2, 2012
-# Whom: Wen Heping<wen@FreeBSD.org>
-#
+# Created by: Wen Heping <wen@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= math-functions
-PORTVERSION= 0.1.1.1
-PORTREVISION= 2
+PORTVERSION= 0.1.1.2
CATEGORIES= math haskell
-MAINTAINER= wen@FreeBSD.org
+MAINTAINER= haskell@FreeBSD.org
COMMENT= Special mathematical functions and Chebyshev polynomials
LICENSE= BSD
diff --git a/math/hs-math-functions/distinfo b/math/hs-math-functions/distinfo
index 247175aa28bf..7c5014508022 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/math-functions-0.1.1.1.tar.gz) = ff449d313417c1366d20c77a968a05129ea6e85820a9a28271de7c809a77a688
-SIZE (cabal/math-functions-0.1.1.1.tar.gz) = 15096
+SHA256 (cabal/math-functions-0.1.1.2.tar.gz) = 3b192313ff99bcdde0fce04de41fafa111e321c424e480223f6feffe0f310927
+SIZE (cabal/math-functions-0.1.1.2.tar.gz) = 16338
diff --git a/math/hs-math-functions/pkg-descr b/math/hs-math-functions/pkg-descr
index 35201804f179..efb668ac39fe 100644
--- a/math/hs-math-functions/pkg-descr
+++ b/math/hs-math-functions/pkg-descr
@@ -2,4 +2,4 @@ This library provides implementations of special mathematical functions
and Chebyshev polynomials. These functions are often useful in statistical
and numerical computing.
-WWW: https://github.com/bos/math-functions
+WWW: https://github.com/bos/math-functions
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index 302b0b7a054f..f98d85452521 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-mwc-random
-# Date created: January 03 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= mwc-random
-PORTVERSION= 0.12.0.0
-PORTREVISION= 1
+PORTVERSION= 0.12.0.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +10,7 @@ COMMENT= Fast, high quality pseudo random number generation
LICENSE= BSD
-USE_CABAL= primitive vector>=0.6.0.2
+USE_CABAL= primitive vector>=0.7
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR}
diff --git a/math/hs-mwc-random/distinfo b/math/hs-mwc-random/distinfo
index 7397e7c70054..3cbf5a63cc03 100644
--- a/math/hs-mwc-random/distinfo
+++ b/math/hs-mwc-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mwc-random-0.12.0.0.tar.gz) = 79c7b7224e5aa587c6e4ca9c1518c8ec894716f2f44048bf886eb1698bfb2f30
-SIZE (cabal/mwc-random-0.12.0.0.tar.gz) = 18142
+SHA256 (cabal/mwc-random-0.12.0.1.tar.gz) = ec78bdcdf87ed4ea390a20337f04dd551dbd62fc1846cd7f466a862162f704eb
+SIZE (cabal/mwc-random-0.12.0.1.tar.gz) = 19471
diff --git a/math/hs-mwc-random/pkg-descr b/math/hs-mwc-random/pkg-descr
index bf47d9d572c2..fb6751afe0fa 100644
--- a/math/hs-mwc-random/pkg-descr
+++ b/math/hs-mwc-random/pkg-descr
@@ -7,4 +7,4 @@ also extremely fast, between 2 and 3 times faster than the Mersenne Twister.
Compared to the mersenne-random package, this package has a more convenient
API, is faster, and supports more statistical distributions.
-WWW: https://github.com/bos/mwc-random
+WWW: https://github.com/bos/mwc-random
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 6b9be33d58d8..4535847372cb 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-pointed
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pointed
-PORTVERSION= 2.1.0.2
-PORTREVISION= 1
+PORTVERSION= 3.0.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,8 +9,8 @@ COMMENT= Haskell 98 pointed and copointed data
LICENSE= BSD
-USE_CABAL= comonad>=1.1.1.5 comonad-transformers>=2.1 data-default>=0.4 \
- semigroupoids>=1.3.1.2 semigroups>=0.8.3.1 stm>=2.1.2.1 \
+USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 data-default>=0.4 \
+ semigroupoids>=3.0 semigroups>=0.8.3.1 stm>=2.1.2.1 \
transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 291b08d25732..9c4505a73987 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pointed-2.1.0.2.tar.gz) = 54bc4646d6b5ed5cfe4c603a4f4a6d5830f3731c3954614f287b58d7bd0b073d
-SIZE (cabal/pointed-2.1.0.2.tar.gz) = 2958
+SHA256 (cabal/pointed-3.0.1.tar.gz) = fbcde1ac290f111c39c150737d612bf6b2a2241a870672bc01e35140f8a9f9c6
+SIZE (cabal/pointed-3.0.1.tar.gz) = 2941
diff --git a/math/hs-pointed/pkg-descr b/math/hs-pointed/pkg-descr
index 8135440a27e6..1a41b00150b8 100644
--- a/math/hs-pointed/pkg-descr
+++ b/math/hs-pointed/pkg-descr
@@ -1,3 +1,3 @@
Haskell 98 pointed and copointed data.
-WWW: http://github.com/ekmett/pointed/
+WWW: http://github.com/ekmett/pointed/
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index ed338b99f4aa..51b1e03ddd5a 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-probability
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= probability
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-probability/pkg-descr b/math/hs-probability/pkg-descr
index f83d11bdd4a4..abdae4083dba 100644
--- a/math/hs-probability/pkg-descr
+++ b/math/hs-probability/pkg-descr
@@ -3,4 +3,4 @@ terms of their distributions by using a monad. The monad is similar to
the List monad for non-deterministic computations, but extends the List
monad by a measure of probability. Small interface to R plotting.
-WWW: http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming
+WWW: http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index 3c6f0b643aed..79b7b69a747c 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-semigroupoids
-# Date created: July 16, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= semigroupoids
-PORTVERSION= 1.3.4
+PORTVERSION= 3.0.0.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +9,7 @@ COMMENT= Haskell 98 semigroupoids: Category sans id
LICENSE= BSD
-USE_CABAL= comonad>=1.1.1.5 contravariant>=0.2.0.1 semigroups>=0.8.3.1 \
+USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 semigroups>=0.8.3.1 \
transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 01bff810a34b..4d32c8f8e662 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroupoids-1.3.4.tar.gz) = f0e2ac2d7fe1513f46040f043f02ce289096bf8865701c78998dead5acbcd16e
-SIZE (cabal/semigroupoids-1.3.4.tar.gz) = 10383
+SHA256 (cabal/semigroupoids-3.0.0.1.tar.gz) = d14017b00f96c632d1cdff41a117a289fd0b56af80678a66a8e9f2c8fdad9846
+SIZE (cabal/semigroupoids-3.0.0.1.tar.gz) = 11295
diff --git a/math/hs-semigroupoids/pkg-descr b/math/hs-semigroupoids/pkg-descr
index db52dfda1831..9a148ef70848 100644
--- a/math/hs-semigroupoids/pkg-descr
+++ b/math/hs-semigroupoids/pkg-descr
@@ -2,4 +2,4 @@ Provides a wide array of semigroupoids and operations for working with
semigroupoids. A Semigroupoid is a Category without the requirement of
identity arrows for every object in the category.
-WWW: http://github.com/ekmett/semigroupoids
+WWW: http://github.com/ekmett/semigroupoids
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 2d25fae23967..38a9398a986e 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-semigroups
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= semigroups
-PORTVERSION= 0.8.3.2
-PORTREVISION= 1
+PORTVERSION= 0.8.4.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index bd11955b3af3..e874457f890d 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.8.3.2.tar.gz) = ecd8b368215fbd697f6508dcac77b153ac02b9a1568694bdc886d998091d833c
-SIZE (cabal/semigroups-0.8.3.2.tar.gz) = 9392
+SHA256 (cabal/semigroups-0.8.4.1.tar.gz) = d6640f352517b2aafbabed77745324336c0dc6a0df8ce462c8d88ef7aa2a9b17
+SIZE (cabal/semigroups-0.8.4.1.tar.gz) = 10240
diff --git a/math/hs-semigroups/pkg-descr b/math/hs-semigroups/pkg-descr
index 9f0fe4632749..a39777336d68 100644
--- a/math/hs-semigroups/pkg-descr
+++ b/math/hs-semigroups/pkg-descr
@@ -5,4 +5,4 @@ element. It also (originally) generalized a group (a monoid with all
inverses) to a type where every element did not have to have an inverse,
thus the name semigroup.
-WWW: http://github.com/ekmett/semigroups/
+WWW: http://github.com/ekmett/semigroups/
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 0244f3f6cb59..6df0e00460d0 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-statistics
-# Date created: January 03 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= statistics
-PORTVERSION= 0.10.1.0
-PORTREVISION= 1
+PORTVERSION= 0.10.2.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 9ded011f2d1f..40dda681ee09 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/statistics-0.10.1.0.tar.gz) = 6c29cfb8da9745debb3372897a147eb87076806f58b5b402aa4c76cea0e5d73a
-SIZE (cabal/statistics-0.10.1.0.tar.gz) = 45762
+SHA256 (cabal/statistics-0.10.2.0.tar.gz) = 3ddd3c99ffb8cf9ac44e9fd9119bb5418502404d20444b58c2aa8a12177460eb
+SIZE (cabal/statistics-0.10.2.0.tar.gz) = 58362
diff --git a/math/hs-statistics/pkg-descr b/math/hs-statistics/pkg-descr
index e90d25803559..4fcdda303a70 100644
--- a/math/hs-statistics/pkg-descr
+++ b/math/hs-statistics/pkg-descr
@@ -1,19 +1,20 @@
-This Haskell library provides a number of common functions and types
-useful in statistics. Our focus is on high performance, numerical
-robustness, and use of good algorithms. Where possible, we provide
-references to the statistical literature.
+This library provides a number of common functions and types useful in
+statistics. We focus on high performance, numerical robustness, and use
+of good algorithms. Where possible, we provide references to the
+statistical literature.
-The library's facilities can be divided into three broad categories:
+The library's facilities can be divided into four broad categories:
-Working with widely used discrete and continuous probability
-distributions. (There are dozens of exotic distributions in use; we
-focus on the most common.)
+* Working with widely used discrete and continuous probability
+ distributions. (There are dozens of exotic distributions in use; we
+ focus on the most common.)
-Computing with sample data: quantile estimation, kernel density
-estimation, bootstrap methods, and autocorrelation analysis.
+* Computing with sample data: quantile estimation, kernel density
+ estimation, histograms, bootstrap methods, significance testing, and
+ autocorrelation analysis.
-Random variate generation under several different distributions.
+* Random variate generation under several different distributions.
-Common statistical tests for significant differences between samples.
+* Common statistical tests for significant differences between samples.
-WWW: http://darcs.serpentine.com/statistics
+WWW: https://github.com/bos/statistics
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 03d767a88002..9fb3ea902015 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -1,21 +1,17 @@
-# New ports collection makefile for: hs-vector-space
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= vector-space
-PORTVERSION= 0.8.2
+PORTVERSION= 0.8.6
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Vector & affine spaces, linear maps, and derivatives in Haskell
+COMMENT= Vector & affine spaces, linear maps, and derivatives
LICENSE= BSD
FILE_LICENSE= COPYING
-USE_CABAL= Boolean>=0.0.1 MemoTrie>=0.5 NumInstances>=1.0
+USE_CABAL= Boolean>=0.1.0 MemoTrie>=0.5 NumInstances>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index c6940ad0ea7c..5177144420d0 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-space-0.8.2.tar.gz) = 4d8999b49d6b7fb81b9fdd92f4dceaa179f4d40367c0e80ae28979a67b6ff625
-SIZE (cabal/vector-space-0.8.2.tar.gz) = 13400
+SHA256 (cabal/vector-space-0.8.6.tar.gz) = 94b0e355e82cc8af180554ab05fbe6ff4f35a7fc888c3337d16f596f21167f0e
+SIZE (cabal/vector-space-0.8.6.tar.gz) = 13630
diff --git a/math/hs-vector-space/pkg-descr b/math/hs-vector-space/pkg-descr
index f7294fd2fb9d..f849c92dca50 100644
--- a/math/hs-vector-space/pkg-descr
+++ b/math/hs-vector-space/pkg-descr
@@ -4,4 +4,4 @@ of generalized derivatives. A generalized derivative is a linear
transformation rather than one of the common concrete representations
(scalars, vectors, matrices, etc).
-WWW: http://haskell.org/haskellwiki/vector-space
+WWW: http://hackage.haskell.org/package/vector-space
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
index 4c12e63b8781..56718ca1b45c 100644
--- a/multimedia/hs-gstreamer/Makefile
+++ b/multimedia/hs-gstreamer/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-gstreamer
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gstreamer
-PORTVERSION= 0.12.1.1
-PORTREVISION= 1
+PORTVERSION= 0.12.1.2
CATEGORIES= multimedia haskell
MAINTAINER= haskell@FreeBSD.org
@@ -19,6 +13,7 @@ LICENSE= LGPL21
FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
+
USE_CABAL= glib>=0.12 mtl
BUILD_DEPENDS+= gstreamer-plugins>=0.10:${PORTSDIR}/multimedia/gstreamer-plugins
diff --git a/multimedia/hs-gstreamer/distinfo b/multimedia/hs-gstreamer/distinfo
index f2c1d42b3ebd..22767b1207e0 100644
--- a/multimedia/hs-gstreamer/distinfo
+++ b/multimedia/hs-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gstreamer-0.12.1.1.tar.gz) = f662177dd537f4991a97129a594cc9cbfb71606fd3d3daa8810cb42bad538d13
-SIZE (cabal/gstreamer-0.12.1.1.tar.gz) = 92914
+SHA256 (cabal/gstreamer-0.12.1.2.tar.gz) = ad17476841141c40b23c6173cbea6581226aa81a225a973893aef9fd9ca163cd
+SIZE (cabal/gstreamer-0.12.1.2.tar.gz) = 92872
diff --git a/net/Makefile b/net/Makefile
index 27473ffbc180..11434615176d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -225,6 +225,8 @@
SUBDIR += hs-hostname
SUBDIR += hs-network
SUBDIR += hs-network-conduit
+ SUBDIR += hs-network-info
+ SUBDIR += hs-network-multicast
SUBDIR += hs-pcap
SUBDIR += hs-sendfile
SUBDIR += hs-simple-sendfile
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index f371bd9a4c4f..e24a74769540 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hostname
-# Date created: May 21, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
index b2e88fb460e7..d07e7ba4d77a 100644
--- a/net/hs-network-conduit/Makefile
+++ b/net/hs-network-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-network-conduit
-# Date created: April 8, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= network-conduit
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.6.1.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Stream socket data using conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.4 lifted-base>=0.1 monad-control>=0.3 \
+USE_CABAL= conduit>=0.5 lifted-base>=0.1 monad-control>=0.3 \
network>=2.3 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-network-conduit/distinfo b/net/hs-network-conduit/distinfo
index 762160c92fed..7d051e181f08 100644
--- a/net/hs-network-conduit/distinfo
+++ b/net/hs-network-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-conduit-0.4.0.1.tar.gz) = 7499cf5a05217e9cb38922ecd4a0d26c87553d2537bfe87b00d6db49b282ae76
-SIZE (cabal/network-conduit-0.4.0.1.tar.gz) = 4150
+SHA256 (cabal/network-conduit-0.6.1.1.tar.gz) = f6183be9112cd124e7c442a04f5bededd9b1e8107591275aadba6086839ea503
+SIZE (cabal/network-conduit-0.6.1.1.tar.gz) = 5762
diff --git a/net/hs-network-conduit/pkg-descr b/net/hs-network-conduit/pkg-descr
index 5ee39a4f06d3..601a30445ae9 100644
--- a/net/hs-network-conduit/pkg-descr
+++ b/net/hs-network-conduit/pkg-descr
@@ -1,3 +1,3 @@
Stream socket data using conduits.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
new file mode 100644
index 000000000000..eefe943ba238
--- /dev/null
+++ b/net/hs-network-info/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= network-info
+PORTVERSION= 0.2.0.3
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Access the local computer's basic network configuration
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-network-info/distinfo b/net/hs-network-info/distinfo
new file mode 100644
index 000000000000..b80aeea6f6ed
--- /dev/null
+++ b/net/hs-network-info/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/network-info-0.2.0.3.tar.gz) = 42e79146828b3e7dfeca884a4be4fe79f7a84bc4471d8cf1ecf7ea3c55a1dc12
+SIZE (cabal/network-info-0.2.0.3.tar.gz) = 5644
diff --git a/net/hs-network-info/pkg-descr b/net/hs-network-info/pkg-descr
new file mode 100644
index 000000000000..17d9f8557cd5
--- /dev/null
+++ b/net/hs-network-info/pkg-descr
@@ -0,0 +1,7 @@
+This library provides simple read-only access to the local computer's
+networking configuration. It is currently capable of getting a list of
+all the network interfaces and their respective IPv4, IPv6 and MAC addresses.
+network-info has been tested and is known to work on Ubuntu 10.10, Mac OS
+X 10.6.4 and Windows XP.
+
+WWW: http://github.com/jystic/network-info
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
new file mode 100644
index 000000000000..d9127786f83d
--- /dev/null
+++ b/net/hs-network-multicast/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= network-multicast
+PORTVERSION= 0.0.7
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple multicast library
+
+USE_CABAL= network
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-network-multicast/distinfo b/net/hs-network-multicast/distinfo
new file mode 100644
index 000000000000..dfa48152f1bd
--- /dev/null
+++ b/net/hs-network-multicast/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/network-multicast-0.0.7.tar.gz) = 8360edb6d575493331a92f03950e0039cad9ab09bf40bceaf821b2f3187914a3
+SIZE (cabal/network-multicast-0.0.7.tar.gz) = 2886
diff --git a/net/hs-network-multicast/pkg-descr b/net/hs-network-multicast/pkg-descr
new file mode 100644
index 000000000000..16f9a03ff3fa
--- /dev/null
+++ b/net/hs-network-multicast/pkg-descr
@@ -0,0 +1,4 @@
+The "Network.Multicast" module is for sending UDP datagrams over multicast
+(class D) addresses.
+
+WWW: http://hackage.haskell.org/package/network-multicast
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index d3f999010e23..5ced1aa5dce5 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-network
-# Date created: 2010-05-14
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= network
-PORTVERSION= 2.3.0.13
-PORTREVISION= 1
+PORTVERSION= 2.3.1.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index a22580ae624e..bc8e4d138dcc 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-2.3.0.13.tar.gz) = 0747e9091dd5ba220c31f77116c9edfe9ac6726090d58e55221371b63f1b8577
-SIZE (cabal/network-2.3.0.13.tar.gz) = 133948
+SHA256 (cabal/network-2.3.1.0.tar.gz) = d47c7fd9d08575acf9ff76661f9e6c0abf7fcf1280972d419f84b142272fe2ba
+SIZE (cabal/network-2.3.1.0.tar.gz) = 137476
diff --git a/net/hs-network/pkg-descr b/net/hs-network/pkg-descr
index 17c74ccea430..7543c0e97117 100644
--- a/net/hs-network/pkg-descr
+++ b/net/hs-network/pkg-descr
@@ -1,3 +1,3 @@
Low-level networking interface.
-WWW: http://github.com/haskell/network
+WWW: http://github.com/haskell/network
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index 4c2c9f792b67..61fc89193c2a 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-pcap
-# Date created: 17 May 2010
-# Whom: Ju Pengfei <jupengfei@gmail.com>
-#
+# Created by: Ju Pengfei <jupengfei@gmail.com>
# $FreeBSD$
-#
PORTNAME= pcap
-PORTVERSION= 0.4.5.1
-PORTREVISION= 4
+PORTVERSION= 0.4.5.2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +10,6 @@ COMMENT= A system-independent interface for user-level packet capture
LICENSE= BSD
-CABAL_SETUP= Setup.lhs
USE_CABAL= network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-pcap/distinfo b/net/hs-pcap/distinfo
index 23bc2b6f4559..b6c6b6e7e93b 100644
--- a/net/hs-pcap/distinfo
+++ b/net/hs-pcap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pcap-0.4.5.1.tar.gz) = b21f220ecdd854f3bf371dec9c082f626e2757c11495d00e41dd8b63b67e6c5c
-SIZE (cabal/pcap-0.4.5.1.tar.gz) = 48534
+SHA256 (cabal/pcap-0.4.5.2.tar.gz) = e7e92e6ff4bffa22102335a38dabb97fd0771fdf3b75d45cd7c1708c85e1cd5f
+SIZE (cabal/pcap-0.4.5.2.tar.gz) = 49414
diff --git a/net/hs-pcap/pkg-descr b/net/hs-pcap/pkg-descr
index cfed7e63d855..c21ab1a63c6a 100644
--- a/net/hs-pcap/pkg-descr
+++ b/net/hs-pcap/pkg-descr
@@ -1,3 +1,3 @@
A system-independent interface for user-level packet capture.
-WWW: http://hackage.haskell.org/package/pcap
+WWW: https://github.com/bos/pcap
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 08677529df54..3f2b9bed682e 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-sendfile
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= sendfile
-PORTVERSION= 0.7.6
-PORTREVISION= 1
+PORTVERSION= 0.7.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/distinfo b/net/hs-sendfile/distinfo
index c738d5e56d78..5cb44a3e7d9e 100644
--- a/net/hs-sendfile/distinfo
+++ b/net/hs-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/sendfile-0.7.6.tar.gz) = ffe88cf69780bc302229387058620c5fca6f93bef1884eae71e70d7d40b60b73
-SIZE (cabal/sendfile-0.7.6.tar.gz) = 10656
+SHA256 (cabal/sendfile-0.7.8.tar.gz) = b47be35bd1f8f9f55fdf6df0c89c74996502091f1fe501e97a84903c6364c977
+SIZE (cabal/sendfile-0.7.8.tar.gz) = 10659
diff --git a/net/hs-sendfile/pkg-descr b/net/hs-sendfile/pkg-descr
index 57f6373b1301..8412a9943894 100644
--- a/net/hs-sendfile/pkg-descr
+++ b/net/hs-sendfile/pkg-descr
@@ -4,4 +4,4 @@ in haskell is provided. Currently supported platforms: Windows 2000+
(Native), Linux 2.6+ (Native), FreeBSD (Native), OS-X 10.5+ (Native),
Everything else (Portable Haskell code).
-WWW: http://patch-tag.com/r/mae/sendfile
+WWW: http://hub.darcs.net/stepcut/sendfile
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 3d38b5153ed7..fc16ce0f8d6d 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-simple-sendfile
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.4
+PORTVERSION= 0.2.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index 22153a59e893..705f85bdcc4e 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-sendfile-0.2.4.tar.gz) = 7d5de17f701813f9b717c39a22178bd1d299ae332307651ead05abb2e6aef1b0
-SIZE (cabal/simple-sendfile-0.2.4.tar.gz) = 7013
+SHA256 (cabal/simple-sendfile-0.2.8.tar.gz) = f2846af0a582b5bd1c933f6ea74783693fae646a00dd6f538380781644459c86
+SIZE (cabal/simple-sendfile-0.2.8.tar.gz) = 7172
diff --git a/net/hs-simple-sendfile/pkg-descr b/net/hs-simple-sendfile/pkg-descr
index 2d6dc4799e4e..3365cbb9165a 100644
--- a/net/hs-simple-sendfile/pkg-descr
+++ b/net/hs-simple-sendfile/pkg-descr
@@ -1,4 +1,4 @@
Cross-platform library for the sendfile() system call. This library tries
to call minimum system calls which are the bottleneck of web servers.
-WWW: http://hackage.haskell.org/package/simple-sendfile
+WWW: http://hackage.haskell.org/package/simple-sendfile
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index cf1123f9190d..4844248fad1b 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-socks
-# Date created: April 8, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= socks
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.4.2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 network>=2.3
+USE_CABAL= cereal>=0.3.1 network>=2.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-socks/distinfo b/net/hs-socks/distinfo
index 1405d9ca2d66..235da18514f6 100644
--- a/net/hs-socks/distinfo
+++ b/net/hs-socks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/socks-0.4.1.tar.gz) = 56368996d0ad748d9495e5967ce94aaf863c93594908573c5e9c0597098b574d
-SIZE (cabal/socks-0.4.1.tar.gz) = 5777
+SHA256 (cabal/socks-0.4.2.tar.gz) = 19711104679ab984ca66bb226e70fc9e40a602201a190a1496b3c828a5e870d9
+SIZE (cabal/socks-0.4.2.tar.gz) = 5779
diff --git a/net/hs-socks/pkg-descr b/net/hs-socks/pkg-descr
index 2560ac25fb17..906e7954fd1d 100644
--- a/net/hs-socks/pkg-descr
+++ b/net/hs-socks/pkg-descr
@@ -1,3 +1,3 @@
Socks proxy (version 5) implementation.
-WWW: http://github.com/vincenthz/hs-socks
+WWW: http://github.com/vincenthz/hs-socks
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index ca08e5d74cdf..962a9377557c 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: porte
-# Date created: November 4, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 14688ac3d1f5..94e4ed334468 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-hscolour
-# Date created: February 22 2008
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= hscolour
-PORTVERSION= 1.20.2
+PORTVERSION= 1.20.3
PORTEPOCH= 1
CATEGORIES= print haskell
@@ -20,7 +16,6 @@ CABAL_SETUP= Setup.hs
EXECUTABLE= HsColour
-.include <bsd.port.options.mk>
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo
index d9ab1f68a974..156c5fd9a68d 100644
--- a/print/hs-hscolour/distinfo
+++ b/print/hs-hscolour/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
-SIZE (cabal/hscolour-1.20.2.tar.gz) = 25722
+SHA256 (cabal/hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
+SIZE (cabal/hscolour-1.20.3.tar.gz) = 25810
diff --git a/print/hs-hscolour/pkg-descr b/print/hs-hscolour/pkg-descr
index 68195cc9163b..af34f30061b9 100644
--- a/print/hs-hscolour/pkg-descr
+++ b/print/hs-hscolour/pkg-descr
@@ -8,4 +8,4 @@ It currently has six output formats:
- LaTeX,
- and mIRC chat codes.
-WWW: http://www.cs.york.ac.uk/fp/darcs/hscolour/
+WWW: http://code.haskell.org/~malcolm/hscolour/
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index c339b505dbe5..15eceb1f37ac 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-bio
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= bio
PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/science/hs-bio/pkg-descr b/science/hs-bio/pkg-descr
index d00fd7938f2f..8ebf118ce115 100644
--- a/science/hs-bio/pkg-descr
+++ b/science/hs-bio/pkg-descr
@@ -10,4 +10,4 @@ sequence quality. Also Blast output parsing. Partly implemented single
linkage clustering, and multiple alignment. Reading Gene Ontology (GO)
annotations (GOA) and definitions hierarchy.
-WWW: http://biohaskell.org/Libraries/Bio
+WWW: http://biohaskell.org/Libraries/Bio
diff --git a/security/Makefile b/security/Makefile
index b691755efb3c..8a6d626ec650 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -190,6 +190,7 @@
SUBDIR += hs-RSA
SUBDIR += hs-SHA
SUBDIR += hs-certificate
+ SUBDIR += hs-cipher-aes
SUBDIR += hs-clientsession
SUBDIR += hs-cprng-aes
SUBDIR += hs-crypto-api
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 40d91f535e73..94b6c6c72962 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-Crypto
-# Date created: July 5, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= Crypto
-PORTVERSION= 4.2.5
-PORTREVISION= 1
+PORTVERSION= 4.2.5.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,7 @@ COMMENT= Collects together existing Haskell cryptographic functions
FILE_LICENSE= ReadMe.tex
CABAL_SETUP= Setup.hs
-USE_CABAL= QuickCheck>=2.4.0.1 HUnit random
+USE_CABAL= HUnit QuickCheck>=2.4.0.1 random
EXECUTABLE= HMACTest QuickTest RSATest SHA1Test SymmetricTest WordListTest
diff --git a/security/hs-Crypto/distinfo b/security/hs-Crypto/distinfo
index 989ac2a02f3c..99ef37f7fdc9 100644
--- a/security/hs-Crypto/distinfo
+++ b/security/hs-Crypto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Crypto-4.2.5.tar.gz) = 68754f0827f067707a1bf3d62f61e2b42f05ebf0c560a31a442a622974446473
-SIZE (cabal/Crypto-4.2.5.tar.gz) = 57486
+SHA256 (cabal/Crypto-4.2.5.1.tar.gz) = 6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66
+SIZE (cabal/Crypto-4.2.5.1.tar.gz) = 56474
diff --git a/security/hs-Crypto/pkg-descr b/security/hs-Crypto/pkg-descr
index 55c7064eaa62..e911c81ea9b2 100644
--- a/security/hs-Crypto/pkg-descr
+++ b/security/hs-Crypto/pkg-descr
@@ -3,4 +3,4 @@ Word128, Word192 and Word256 and Beyond, PKCS5 Padding, Various Encryption
Modes e.g. Cipher Block Chaining all in one package, with HUnit and
QuickCheck tests, and examples.
-WWW: http://hackage.haskell.org/package/Crypto
+WWW: http://hackage.haskell.org/package/Crypto
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 7c2706ae7181..f345db2502a4 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-HsOpenSSL
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= HsOpenSSL
-PORTVERSION= 0.10.3.2
+PORTVERSION= 0.10.3.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 0b09f356191a..5c62f550dc87 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HsOpenSSL-0.10.3.2.tar.gz) = ee647a59161b79f32b943878abe65ee7c5a623dfe5af5444cf1b2ac43fa5b496
-SIZE (cabal/HsOpenSSL-0.10.3.2.tar.gz) = 62941
+SHA256 (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 4519afea3bf551ea314247149df4b6bd7db5c56823424e17e2f42d0645b3a211
+SIZE (cabal/HsOpenSSL-0.10.3.3.tar.gz) = 62767
diff --git a/security/hs-HsOpenSSL/pkg-descr b/security/hs-HsOpenSSL/pkg-descr
index 740ce6965371..91b18e5ea9cc 100644
--- a/security/hs-HsOpenSSL/pkg-descr
+++ b/security/hs-HsOpenSSL/pkg-descr
@@ -8,4 +8,4 @@ saner than HsOpenSSL especially for initialisation and error handlings.
So PHO (the initial author of HsOpenSSL) highly encourages you to use
and improve the tls package instead as long as possible.
-WWW: https://github.com/phonohawk/HsOpenSSL
+WWW: https://github.com/phonohawk/HsOpenSSL
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 30aef7812354..11a45a1d0854 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-RSA
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= RSA
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.2.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,7 @@ COMMENT= Implementation of RSA, using the padding schemes of PKCS#1 v2.1
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= crypto-api>=0.10 crypto-pubkey-types monadcryptorandom SHA
+USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 monadcryptorandom SHA
OPTIONS_DEFINE= MD5 BINARY
OPTIONS_DEFAULT= MD5 BINARY
@@ -24,7 +18,7 @@ OPTIONS_DEFAULT= MD5 BINARY
MD5_DESC= Include support for using MD5
BINARY_DESC= Use the binary package for serialization
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MMD5}
CONFIGURE_ARGS+= --flags="IncludeMD5"
diff --git a/security/hs-RSA/distinfo b/security/hs-RSA/distinfo
index 0a358bd288cd..7d51cf257bbb 100644
--- a/security/hs-RSA/distinfo
+++ b/security/hs-RSA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/RSA-1.2.1.0.tar.gz) = 8a053ddce835c5ec75e69147f7522a132c68c21235fb696c7c0d67e2651fa593
-SIZE (cabal/RSA-1.2.1.0.tar.gz) = 12187
+SHA256 (cabal/RSA-1.2.2.0.tar.gz) = 55845a812a48bc8e0764f8ff3e06a58814da32d61105c798bf976a6040b08a74
+SIZE (cabal/RSA-1.2.2.0.tar.gz) = 12208
diff --git a/security/hs-RSA/pkg-descr b/security/hs-RSA/pkg-descr
index 275de8ba78e9..b2bd24f25762 100644
--- a/security/hs-RSA/pkg-descr
+++ b/security/hs-RSA/pkg-descr
@@ -4,4 +4,4 @@ not necessarily the fastest ones on the planet. Particularly key generation.
The algorithms included are based of RFC 3447, or the Public-Key Cryptography
Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
-WWW: http://hackage.haskell.org/package/RSA
+WWW: http://hackage.haskell.org/package/RSA
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index b696fd0b73a9..e9a51d64de1f 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-SHA
-# Date created: January 8, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= SHA
-PORTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -21,7 +15,7 @@ OPTIONS_DEFINE= EXE
EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
CONFIGURE_ARGS+= --flags="-Test"
diff --git a/security/hs-SHA/distinfo b/security/hs-SHA/distinfo
index 2fa92f4543d2..d849fae1b8a4 100644
--- a/security/hs-SHA/distinfo
+++ b/security/hs-SHA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/SHA-1.5.0.1.tar.gz) = 0f2dd56aee5db5bfbee45ea19a64ddaf8bd2107dbe456bd3b44ea8e92128d2db
-SIZE (cabal/SHA-1.5.0.1.tar.gz) = 2714086
+SHA256 (cabal/SHA-1.6.1.tar.gz) = fdb9924aa31493ad198e3b3498a8204cc7013e0ef86215faf1c4e435a7166aec
+SIZE (cabal/SHA-1.6.1.tar.gz) = 2714264
diff --git a/security/hs-SHA/pkg-descr b/security/hs-SHA/pkg-descr
index 53efdd7237b7..4b4ad15e38e2 100644
--- a/security/hs-SHA/pkg-descr
+++ b/security/hs-SHA/pkg-descr
@@ -5,4 +5,4 @@ and RFC test vectors for the various functions. While some attention has
been paid to performance, these do not presently reach the speed of
well-tuned libraries, like OpenSSL.
-WWW: http://hackage.haskell.org/package/SHA
+WWW: http://hackage.haskell.org/package/SHA
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index c732c661bb31..edfe2000799b 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-certificate
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= certificate
-PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,17 +11,19 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= asn1-data>=0.6.1.3 crypto-pubkey-types>=0.1 mtl pem>=0.1
+USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.1 cryptohash mtl \
+ pem>=0.1
OPTIONS_DEFINE= EXECUTABLE
+OPTIONS_DEFAULT=
EXECUTABLE_DESC= Build the executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="executable"
-USE_CABAL+= cmdargs text>=0.11 cryptohash cryptocipher>=0.3.0
+USE_CABAL+= cmdargs text>=0.11 cryptocipher>=0.3.0
EXECUTABLE+= certificate
.else
CONFIGURE_ARGS+= --flags="-executable"
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index 5bf49ac92bfc..70d387caa957 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/certificate-1.2.3.tar.gz) = ea58605935d00b191e6fb31e79cec486129bc527ec19d1c0911b1475c430c476
-SIZE (cabal/certificate-1.2.3.tar.gz) = 13844
+SHA256 (cabal/certificate-1.3.3.tar.gz) = 0267809fa087e14f1097e22895b7566e703ed953c8090ed35bd631d3fa907d10
+SIZE (cabal/certificate-1.3.3.tar.gz) = 14811
diff --git a/security/hs-certificate/pkg-descr b/security/hs-certificate/pkg-descr
index 1aa954888f16..86aed60434e8 100644
--- a/security/hs-certificate/pkg-descr
+++ b/security/hs-certificate/pkg-descr
@@ -2,4 +2,4 @@ Certificates and Key reader/writer. At the moment only X509 certificate
and unencrypted private key are supported, but will include PGP
certificate and pkcs8 private keys.
-WWW: http://github.com/vincenthz/hs-certificate
+WWW: http://github.com/vincenthz/hs-certificate
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
new file mode 100644
index 000000000000..67b6ee6eadcf
--- /dev/null
+++ b/security/hs-cipher-aes/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cipher-aes
+PORTVERSION= 0.1.5
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast AES cipher implementation with advanced mode of operations
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
new file mode 100644
index 000000000000..53143ba658b9
--- /dev/null
+++ b/security/hs-cipher-aes/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cipher-aes-0.1.5.tar.gz) = 760e49b229443a44f36de0bb8a8acdadb2c87791fe5867f26a7a7a0e055e1858
+SIZE (cabal/cipher-aes-0.1.5.tar.gz) = 27390
diff --git a/security/hs-cipher-aes/pkg-descr b/security/hs-cipher-aes/pkg-descr
new file mode 100644
index 000000000000..4cbde4b35121
--- /dev/null
+++ b/security/hs-cipher-aes/pkg-descr
@@ -0,0 +1,13 @@
+Fast AES cipher implementation with advanced mode of operations. The modes
+of operations available are ECB (Electronic code book), CBC (Cipher block
+chaining), CTR (Counter), XTS (XEX with ciphertext stealing), GCM (Galois
+Counter Mode). The AES implementation uses AES-NI when available (on x86
+and x86-64 architecture), but fallback gracefully to a software C
+implementation. The software implementation uses S-Boxes, which might
+suffer for cache timing issues. However do notes that most other known
+software implementations, including very popular one (openssl, gnutls)
+also uses same implementation. If it matters for your case, you should
+make sure you have AES-NI available, or you'll need to use a different
+implementation.
+
+WWW: http://github.com/vincenthz/hs-cipher-aes
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index c04a5389deef..2b231aaed57f 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-clientsession
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= clientsession
-PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTVERSION= 0.8.0.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index c44ca3f6e59f..97266eb163a8 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.7.5.tar.gz) = 794748fdc009493a72cd591e8ea3624f2932789f2eaccdbd39a4016d00a65fe0
-SIZE (cabal/clientsession-0.7.5.tar.gz) = 6858
+SHA256 (cabal/clientsession-0.8.0.1.tar.gz) = bbe77263b6c12a3cf72ad3d9c1465deca8d938edb2c6dd159c8a5c3f7909d264
+SIZE (cabal/clientsession-0.8.0.1.tar.gz) = 7024
diff --git a/security/hs-clientsession/pkg-descr b/security/hs-clientsession/pkg-descr
index 5a0cc3f39994..99e7df406587 100644
--- a/security/hs-clientsession/pkg-descr
+++ b/security/hs-clientsession/pkg-descr
@@ -2,4 +2,4 @@ Achieves security through AES-CTR encryption and Skein-MAC-512-256
authentication. Uses Base64 encoding to avoid any issues with
characters.
-WWW: http://github.com/yesodweb/clientsession/tree/master
+WWW: http://github.com/yesodweb/clientsession/tree/master
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index 0ccca95a953b..b193b828259e 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cprng-aes
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cprng-aes
-PORTVERSION= 0.2.3
-PORTREVISION= 2
+PORTVERSION= 0.2.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,8 +10,8 @@ COMMENT= Crypto Pseudo Random Number Generator using AES
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3.0 crypto-api>=0.8 cryptocipher>=0.2.5 entropy>=0.2 \
- random
+USE_CABAL= cereal>=0.3.0 cipher-aes>=0.1 crypto-api>=0.8 cryptocipher \
+ entropy>=0.2 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index 312a61e58b6a..f46175c95e23 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cprng-aes-0.2.3.tar.gz) = c35a07a941069e4bc3530f1ca4912a3717b20c62600dfcee3c7c3b35d687d7f7
-SIZE (cabal/cprng-aes-0.2.3.tar.gz) = 3596
+SHA256 (cabal/cprng-aes-0.2.4.tar.gz) = b2688c576c15a936e73f25334ec1202d4a199f13987c2a0d0caa5c73a4276166
+SIZE (cabal/cprng-aes-0.2.4.tar.gz) = 3832
diff --git a/security/hs-cprng-aes/pkg-descr b/security/hs-cprng-aes/pkg-descr
index 4e9630d7c273..085a7fbcbb97 100644
--- a/security/hs-cprng-aes/pkg-descr
+++ b/security/hs-cprng-aes/pkg-descr
@@ -1,4 +1,4 @@
Simple crypto pseudo-random-number-generator with really good randomness
property.
-WWW: http://github.com/vincenthz/hs-cprng-aes
+WWW: http://github.com/vincenthz/hs-cprng-aes
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index 390fb3c78a63..df5c86dbb702 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-crypto-api
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-api
PORTVERSION= 0.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/pkg-descr b/security/hs-crypto-api/pkg-descr
index f64fd4a3ff8a..c8b4a72f7dd2 100644
--- a/security/hs-crypto-api/pkg-descr
+++ b/security/hs-crypto-api/pkg-descr
@@ -6,4 +6,4 @@ the Classes module. Any concepts or functions of general use to more
than one cryptographic algorithm (ex: padding) is within scope of this
package.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: http://trac.haskell.org/crypto-api/wiki
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 66c28dbc9bdf..8b0d26f188d2 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-crypto-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-conduit
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 conduit>=0.4 crypto-api>=0.9 transformers>=0.2
+USE_CABAL= cereal>=0.3 conduit>=0.5 crypto-api>=0.9 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index afa0c91bfae4..72d3f10c9db3 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.3.2.tar.gz) = 2d92fe4200034843772319632e0d5c092aafe5d4f7c2d16109972ec681a1c625
-SIZE (cabal/crypto-conduit-0.3.2.tar.gz) = 6945
+SHA256 (cabal/crypto-conduit-0.4.1.tar.gz) = 9be3468c1a7d8a7c7e2004b1408414c1cc308db2fc3e8a8ca669b98119b7bfbd
+SIZE (cabal/crypto-conduit-0.4.1.tar.gz) = 6954
diff --git a/security/hs-crypto-conduit/pkg-descr b/security/hs-crypto-conduit/pkg-descr
index 6d2112e37e78..3d70763093e3 100644
--- a/security/hs-crypto-conduit/pkg-descr
+++ b/security/hs-crypto-conduit/pkg-descr
@@ -2,4 +2,4 @@ This package contains everything that you need to use a cryptographic
package that supports the crypto-api package using conduits from the
conduit package.
-WWW: https://github.com/meteficha/crypto-conduit
+WWW: https://github.com/meteficha/crypto-conduit
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 3de98969aef0..16d934a36db2 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-crypto-pubkey-types
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= crypto-pubkey-types
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,5 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= crypto-api>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index 619685758bb0..6f1057c42934 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-types-0.1.1.tar.gz) = 2bce552b0aa45f2457e4d6ab369777114465b0a9fba455e64ad0766a03f81432
-SIZE (cabal/crypto-pubkey-types-0.1.1.tar.gz) = 2307
+SHA256 (cabal/crypto-pubkey-types-0.2.0.tar.gz) = b82746801c1bba43173bf26f609245b70111fde6b3d77826b7ce85caba9f3fab
+SIZE (cabal/crypto-pubkey-types-0.2.0.tar.gz) = 2364
diff --git a/security/hs-crypto-pubkey-types/pkg-descr b/security/hs-crypto-pubkey-types/pkg-descr
index af2fce852dae..eab1c8ae32b6 100644
--- a/security/hs-crypto-pubkey-types/pkg-descr
+++ b/security/hs-crypto-pubkey-types/pkg-descr
@@ -1,3 +1,3 @@
Generic cryptography public keys algorithm types.
-WWW: http://github.com/vincenthz/hs-crypto-pubkey-types
+WWW: http://github.com/vincenthz/hs-crypto-pubkey-types
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 68301998eee3..ac9d1e3a75d5 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-cryptocipher
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cryptocipher
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.6
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal cpu>=0.1 crypto-api>=0.5 crypto-pubkey-types>=0.1 \
+USE_CABAL= cereal cpu>=0.1 crypto-api>=0.5 crypto-pubkey-types>=0.2 \
primitive tagged vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 488d0654b58a..2d2307a208fc 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptocipher-0.3.5.tar.gz) = 3a25ee19403089a38b4402cd38149c100b2ef6475a1eabc1b42d149a720e0c0b
-SIZE (cabal/cryptocipher-0.3.5.tar.gz) = 46567
+SHA256 (cabal/cryptocipher-0.3.6.tar.gz) = dadc3c6ec17ab05cfa177a901f20b28b93a3e88bf8afe4cf57cd021b01a74a64
+SIZE (cabal/cryptocipher-0.3.6.tar.gz) = 43901
diff --git a/security/hs-cryptocipher/pkg-descr b/security/hs-cryptocipher/pkg-descr
index 61d6e70ca041..f825dbfb4f09 100644
--- a/security/hs-cryptocipher/pkg-descr
+++ b/security/hs-cryptocipher/pkg-descr
@@ -1,3 +1,3 @@
Symmetrical Block, Stream, and PubKey Ciphers.
-WWW: http://github.com/vincenthz/hs-cryptocipher
+WWW: http://github.com/vincenthz/hs-cryptocipher
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index c8b2f6fed56b..3856df03bd5f 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cryptohash
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cryptohash
-PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTVERSION= 0.7.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index 16ae388f8e42..9650349b4b7c 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptohash-0.7.5.tar.gz) = 0fe7c6a46d9b8c38e0a4756350eeb47a87f7804586d57047978057518598a1a3
-SIZE (cabal/cryptohash-0.7.5.tar.gz) = 39149
+SHA256 (cabal/cryptohash-0.7.9.tar.gz) = 1f264146aac46599ce90151caab21b65ecee7dd15a4122f1ae23653a8b612bdf
+SIZE (cabal/cryptohash-0.7.9.tar.gz) = 59641
diff --git a/security/hs-cryptohash/pkg-descr b/security/hs-cryptohash/pkg-descr
index f60c7732bff3..09fe1ebf7571 100644
--- a/security/hs-cryptohash/pkg-descr
+++ b/security/hs-cryptohash/pkg-descr
@@ -1,8 +1,6 @@
A collection of crypto hashes, with a practical incremental and one-pass,
pure APIs, with performance close to the fastest implementations available
-in others languages.
+in others languages. The implementations are made in C with a haskell FFI
+wrapper that hide the C implementation.
-The implementations are made in C with a haskell FFI wrapper that hide the
-C implementation.
-
-WWW: http://github.com/vincenthz/hs-cryptohash
+WWW: http://github.com/vincenthz/hs-cryptohash
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 1baa1a644594..42604d59f842 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-digest-ghc
-# Date created: January 22, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= digest
-PORTVERSION= 0.0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.0.1.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/distinfo b/security/hs-digest/distinfo
index e5d2a836dd9d..567e7d6cbbf8 100644
--- a/security/hs-digest/distinfo
+++ b/security/hs-digest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/digest-0.0.1.1.tar.gz) = 7bb8b85959cfb3c6539aa2f2104c14aec9758a3a5d6039aba975299fdcd704d4
-SIZE (cabal/digest-0.0.1.1.tar.gz) = 3781
+SHA256 (cabal/digest-0.0.1.2.tar.gz) = 641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11
+SIZE (cabal/digest-0.0.1.2.tar.gz) = 3790
diff --git a/security/hs-digest/pkg-descr b/security/hs-digest/pkg-descr
index 3b66ffa2fdbf..cb183080d59a 100644
--- a/security/hs-digest/pkg-descr
+++ b/security/hs-digest/pkg-descr
@@ -2,4 +2,4 @@ This package provides efficient cryptographic hash implementations for
strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
they are implemented as FFI bindings to efficient code from zlib.
-WWW: http://hackage.haskell.org/package/digest
+WWW: http://hackage.haskell.org/package/digest
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 00e91591ce46..ada20191254a 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-entropy
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= entropy
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/pkg-descr b/security/hs-entropy/pkg-descr
index 9446ad8adef8..628e96257a25 100644
--- a/security/hs-entropy/pkg-descr
+++ b/security/hs-entropy/pkg-descr
@@ -3,4 +3,4 @@ A platform independent method to obtain cryptographically strong entropy
for cryptographically strong (number-theoretically sound) PRNGs should
see the DRBG package too!
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: http://trac.haskell.org/crypto-api/wiki
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index cb30acb9fac3..86a7f8ba77a7 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-monadcryptorandom
-# Date created: April 7, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= monadcryptorandom
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= A monad for using CryptoRandomGen
LICENSE= BSD
-USE_CABAL= crypto-api>=0.2 mtl>=2.0 transformers>=0.2
+USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 557b944c7007..2d574a5e3a0b 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monadcryptorandom-0.4.1.tar.gz) = e169e92973095d009c2775ba998f361662d4c2c41d6661407f6ba44ab2fba307
-SIZE (cabal/monadcryptorandom-0.4.1.tar.gz) = 3938
+SHA256 (cabal/monadcryptorandom-0.5.tar.gz) = 4b70ceb0dee5df63a7c2dde8c77b0002505b6c33382a6075e8b5d6ed5e4d4ba7
+SIZE (cabal/monadcryptorandom-0.5.tar.gz) = 4116
diff --git a/security/hs-monadcryptorandom/pkg-descr b/security/hs-monadcryptorandom/pkg-descr
index 67c1c1b033cc..13394c7ae8f2 100644
--- a/security/hs-monadcryptorandom/pkg-descr
+++ b/security/hs-monadcryptorandom/pkg-descr
@@ -1,3 +1,3 @@
A monad for using CryptoRandomGen.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: https://github.com/TomMD/monadcryptorandom
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 799cf6c8f721..412d22d99ffb 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-pem
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pem
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/pkg-descr b/security/hs-pem/pkg-descr
index fab65351ae0a..cf6783557b20 100644
--- a/security/hs-pem/pkg-descr
+++ b/security/hs-pem/pkg-descr
@@ -1,3 +1,3 @@
Privacy Enhanced Mail (PEM) format reader and writer.
-WWW: http://github.com/vincenthz/hs-pem
+WWW: http://github.com/vincenthz/hs-pem
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index baa58982c89a..06e0a5d66352 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-pureMD5
-# Date created: 2010-08-17
-# Whom: Ashish SHUKLA <ashish@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= pureMD5
-PORTVERSION= 2.1.0.3
-PORTREVISION= 2
+PORTVERSION= 2.1.2.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell implementation of MD5 algorithm
+COMMENT= A Haskell-only implementation of MD5 digest (hash) yalgorithm
LICENSE= BSD
diff --git a/security/hs-pureMD5/distinfo b/security/hs-pureMD5/distinfo
index 87dda0c23755..f91dff9b45e3 100644
--- a/security/hs-pureMD5/distinfo
+++ b/security/hs-pureMD5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pureMD5-2.1.0.3.tar.gz) = 3102d2ddd9084faf0a25d168b150aeca02aad9bba62d80f9b8ec13fccdd21472
-SIZE (cabal/pureMD5-2.1.0.3.tar.gz) = 6087
+SHA256 (cabal/pureMD5-2.1.2.1.tar.gz) = 6768174686d5eaef76b487f6f8160a932c48012668fbe542e7aba489134956ff
+SIZE (cabal/pureMD5-2.1.2.1.tar.gz) = 5824
diff --git a/security/hs-pureMD5/pkg-descr b/security/hs-pureMD5/pkg-descr
index 20a9cc538e38..b2e68477642f 100644
--- a/security/hs-pureMD5/pkg-descr
+++ b/security/hs-pureMD5/pkg-descr
@@ -1,3 +1,4 @@
-An unrolled implementation of MD5 purely in Haskell.
+A Haskell-only implementation of the MD5 digest (hash) algorithm. This
+now supports the crypto-api class interface.
-WWW: http://hackage.haskell.org/package/pureMD5
+WWW: http://hackage.haskell.org/package/pureMD5
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index ce87c046a09a..9a2dfd635a43 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-pwstore-fast
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pwstore-fast
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,6 +10,7 @@ COMMENT= Secure password storage
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-pwstore-fast/distinfo b/security/hs-pwstore-fast/distinfo
index ae315517b12c..357088dd3a9a 100644
--- a/security/hs-pwstore-fast/distinfo
+++ b/security/hs-pwstore-fast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pwstore-fast-2.2.tar.gz) = caa44e13f2746f9cf0efb3b2bf0194064b52675a28d3c14ddc4d31234bde690d
-SIZE (cabal/pwstore-fast-2.2.tar.gz) = 6565
+SHA256 (cabal/pwstore-fast-2.3.tar.gz) = 7cc5f483e3d2e2e5e0c9f0b6f0e91eccc97eb6ed96b7e9ce00e55d0a80259404
+SIZE (cabal/pwstore-fast-2.3.tar.gz) = 6739
diff --git a/security/hs-pwstore-fast/pkg-descr b/security/hs-pwstore-fast/pkg-descr
index 9cd7d764fe0b..d9cb994be0fe 100644
--- a/security/hs-pwstore-fast/pkg-descr
+++ b/security/hs-pwstore-fast/pkg-descr
@@ -5,4 +5,4 @@ Haskell library, pwstore-purehaskell has the exact same API, but uses
only pure Haskell. It is about 25 times slower than this package, but
still quite usable.
-WWW: https://github.com/PeterScott/pwstore
+WWW: https://github.com/PeterScott/pwstore
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 9cfb15ab670b..ef50324cbe03 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-skein
-# Date created: November 19, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= skein
-PORTVERSION= 0.1.0.7
-PORTREVISION= 1
+PORTVERSION= 0.1.0.10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index 3fdc8ccd16df..a2bf2a0269b9 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-0.1.0.7.tar.gz) = e2c5f4b45a2649f78e4e53adb08203f26e3f39a0a34597a06460e078c25dd08f
-SIZE (cabal/skein-0.1.0.7.tar.gz) = 116710
+SHA256 (cabal/skein-0.1.0.10.tar.gz) = 6c269a0f7cfafb2026846b089353fba168257628d84342ceffaa62d2bdf0d163
+SIZE (cabal/skein-0.1.0.10.tar.gz) = 117764
diff --git a/security/hs-skein/pkg-descr b/security/hs-skein/pkg-descr
index 7a3c2ddcd7af..5229e86d9116 100644
--- a/security/hs-skein/pkg-descr
+++ b/security/hs-skein/pkg-descr
@@ -8,4 +8,4 @@ a message authentication code (Skein-MAC).
[1] http://www.skein-hash.info/
-WWW: http://patch-tag.com/r/felipe/skein
+WWW: https://github.com/meteficha/skein
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index 8195250b1ece..a02c85e230c6 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tls-extra
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tls-extra
-PORTVERSION= 0.4.6
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +11,9 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= certificate>=1.2.0 crypto-api>=0.5 cryptocipher>=0.3.0 \
- cryptohash>=0.6 mtl network>=2.3 pem>=0.1.0 text>=0.5 \
- tls>=0.9.4 vector
+USE_CABAL= certificate>=1.3.0 cipher-aes>=0.1 crypto-api>=0.5 \
+ cryptocipher>=0.3.0 cryptohash>=0.6 mtl network>=2.3 \
+ pem>=0.1.0 text>=0.5 tls>=1.0.0 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls-extra/distinfo b/security/hs-tls-extra/distinfo
index ae37792d1f87..f9556f9308fa 100644
--- a/security/hs-tls-extra/distinfo
+++ b/security/hs-tls-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-extra-0.4.6.tar.gz) = d69a28f0c350e729c46493bbd433e514765051c0f5a3d8f1607e9e6c492c85f6
-SIZE (cabal/tls-extra-0.4.6.tar.gz) = 7790
+SHA256 (cabal/tls-extra-0.5.0.tar.gz) = 28cf154074aa9ed1c5259818b5b54394a5222a230e6b78993c140f2b292ec4e4
+SIZE (cabal/tls-extra-0.5.0.tar.gz) = 8199
diff --git a/security/hs-tls-extra/pkg-descr b/security/hs-tls-extra/pkg-descr
index 5ef31d0472f3..88ac47cafde3 100644
--- a/security/hs-tls-extra/pkg-descr
+++ b/security/hs-tls-extra/pkg-descr
@@ -1,3 +1,3 @@
A set of extra definitions, default values and helpers for the tls.
-WWW: http://github.com/vincenthz/hs-tls-extra
+WWW: http://github.com/vincenthz/hs-tls-extra
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 510a2db20a54..1f7ec25ea6f5 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-tls
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tls
-PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,22 +11,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 certificate>=1.2.0 crypto-api>=0.5 \
- cryptocipher>=0.3.0 cryptohash>=0.6 mtl
-
-OPTIONS_DEFINE= EXECUTABLE
-
-EXECUTABLE_DESC= Build the executables
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-USE_CABAL+= cmdargs cprng-aes>=0.2.3 network
-EXECUTABLE+= stunnel checkciphers retrievecertificate simpleclient
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-api>=0.5 \
+ cryptocipher>=0.3.0 cryptohash>=0.6 mtl network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index dae33b41c938..2e8b794a94c2 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-0.9.5.tar.gz) = be446af7097014e4827fbff80df7d607a4b3322d1ce69586b08694d87d8d6ed9
-SIZE (cabal/tls-0.9.5.tar.gz) = 32807
+SHA256 (cabal/tls-1.0.2.tar.gz) = e55472857aea73a4ea719604c983dcb0c3e31beb0aa10d0bc1fc3e2213826b3a
+SIZE (cabal/tls-1.0.2.tar.gz) = 46390
diff --git a/security/hs-tls/pkg-descr b/security/hs-tls/pkg-descr
index acdf7dfc3426..b7cd3db8b79c 100644
--- a/security/hs-tls/pkg-descr
+++ b/security/hs-tls/pkg-descr
@@ -1,12 +1,8 @@
Native Haskell TLS and SSL protocol implementation for server and
-client.
+client. This provides a high-level implementation of a sensitive
+security protocol, eliminating a common set of security issues through
+the use of the advanced type system, high level constructions and common
+Haskell features. Currently implement the SSL3.0, TLS1.0, TLS1.1 and
+TLS1.2 protocol, with only RSA supported for Key Exchange.
-This provides a high-level implementation of a sensitive security
-protocol, eliminating a common set of security issues through the use of
-the advanced type system, high level constructions and common Haskell
-features.
-
-Currently implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol, with
-only RSA supported for Key Exchange.
-
-WWW: http://github.com/vincenthz/hs-tls
+WWW: http://github.com/vincenthz/hs-tls
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index b202dbfc1da0..6690ea69ed75 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-angel
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= angel
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.3.3
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-angel/distinfo b/sysutils/hs-angel/distinfo
index 641b228c0d5b..0528b517c802 100644
--- a/sysutils/hs-angel/distinfo
+++ b/sysutils/hs-angel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/angel-0.3.2.tar.gz) = e6ae7fb12294dd9c7839edc4eddf37a565b81afdf058ee939fba054f162b5c5e
-SIZE (cabal/angel-0.3.2.tar.gz) = 7008
+SHA256 (cabal/angel-0.3.3.tar.gz) = c8bf34b915719ff0f64a272a5245cad42e49572116471ac30d9fd36d99a8edeb
+SIZE (cabal/angel-0.3.3.tar.gz) = 7119
diff --git a/sysutils/hs-angel/pkg-descr b/sysutils/hs-angel/pkg-descr
index d2d9913f9fe5..28ebfd150f52 100644
--- a/sysutils/hs-angel/pkg-descr
+++ b/sysutils/hs-angel/pkg-descr
@@ -3,4 +3,4 @@ to djb's `daemontools` or the Ruby project `god`. It's goals are to keep
a set of services running, and to facilitate the easy configuration and
restart of those services.
-WWW: http://github.com/jamwt/Angel
+WWW: http://github.com/jamwt/Angel
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 849f3b63c5d3..88217125e013 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-cpu
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cpu
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-cpu/pkg-descr b/sysutils/hs-cpu/pkg-descr
index 9595e75423fb..58e518e160f7 100644
--- a/sysutils/hs-cpu/pkg-descr
+++ b/sysutils/hs-cpu/pkg-descr
@@ -1,4 +1,4 @@
Lowlevel cpu routines to get basic properties of the cpu platform, like
endianness and architecture.
-WWW: http://github.com/vincenthz/hs-cpu
+WWW: http://github.com/vincenthz/hs-cpu
diff --git a/textproc/Makefile b/textproc/Makefile
index 9ad9301e5bf6..94d32e14a356 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -248,6 +248,7 @@
SUBDIR += hs-csv
SUBDIR += hs-double-conversion
SUBDIR += hs-feed
+ SUBDIR += hs-hexpat
SUBDIR += hs-highlighting-kate
SUBDIR += hs-hs-bibutils
SUBDIR += hs-html
@@ -274,7 +275,6 @@
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
SUBDIR += hs-xml-types
- SUBDIR += hs-xml2html
SUBDIR += hs-xmlhtml
SUBDIR += hs-yaml
SUBDIR += hsb-aspell
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 31a0cf3390c6..d9fed3b6dedc 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-Diff
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= Diff
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 9fcfe19caaf7..f8552fe9f029 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-HStringTemplate
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= HStringTemplate
-PORTVERSION= 0.6.8
-PORTREVISION= 2
+PORTVERSION= 0.6.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD
-USE_CABAL= parsec syb text utf8-string
+USE_CABAL= blaze-builder mtl parsec syb syb-with-class text utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 2d84fb089aa2..d95bedbb3588 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.6.8.tar.gz) = 79d26c2057efb1a9d546a43af2912cd5f921adf29b7d078335e82cb1c7dacbbb
-SIZE (cabal/HStringTemplate-0.6.8.tar.gz) = 16144
+SHA256 (cabal/HStringTemplate-0.6.12.tar.gz) = 371c0603eb85c47376394476e3999bd481af164dec5ba483bb5d12bdb0005d0a
+SIZE (cabal/HStringTemplate-0.6.12.tar.gz) = 16091
diff --git a/textproc/hs-HStringTemplate/pkg-descr b/textproc/hs-HStringTemplate/pkg-descr
index 2dff0d8f5b0f..169da7830160 100644
--- a/textproc/hs-HStringTemplate/pkg-descr
+++ b/textproc/hs-HStringTemplate/pkg-descr
@@ -1,3 +1,3 @@
A port of the Java library by Terrence Parr.
-WWW: http://hackage.haskell.org/package/HStringTemplate
+WWW: http://hackage.haskell.org/package/HStringTemplate
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index ea3e03c592ab..eb20245f12d9 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -1,11 +1,9 @@
-# New ports collection makefile for: HaXml
-# Date created: 01 June 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
# $FreeBSD$
PORTNAME= HaXml
PORTVERSION= 1.23.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/pkg-descr b/textproc/hs-HaXml/pkg-descr
index e3dc887ec5a4..35a25ac6d1d5 100644
--- a/textproc/hs-HaXml/pkg-descr
+++ b/textproc/hs-HaXml/pkg-descr
@@ -1,4 +1,4 @@
Haskell utilities for parsing, filtering, transforming and generating XML
documents.
-WWW: http://www.cs.york.ac.uk/fp/HaXml/
+WWW: http://www.cs.york.ac.uk/fp/HaXml/
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 8393537d4c43..4066ec2f8c4d 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,21 +1,15 @@
-# New ports collection makefile for: hs-attoparsec-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec-conduit
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.5.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Turn attoparsec parsers into sinks
+COMMENT= Consume attoparsec parsers via conduit
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 conduit>=0.4 text>=0.11 transformers>=0.2.2
+USE_CABAL= attoparsec>=0.10 conduit>=0.5 text>=0.11 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
index 7d056d8a3d5a..f8731ccef533 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-0.4.0.1.tar.gz) = 6ca6b22b2c636ed34d6dd89fe0196ad17c97b8f3625b65ddba380dc295ea01e4
-SIZE (cabal/attoparsec-conduit-0.4.0.1.tar.gz) = 2950
+SHA256 (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = bc7947c9a57e46098f024efb7d35e4644528a6fb4749af4ccfaa8e84ebd965d8
+SIZE (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = 3779
diff --git a/textproc/hs-attoparsec-conduit/pkg-descr b/textproc/hs-attoparsec-conduit/pkg-descr
index 31922b9f7832..2111049bda72 100644
--- a/textproc/hs-attoparsec-conduit/pkg-descr
+++ b/textproc/hs-attoparsec-conduit/pkg-descr
@@ -1,3 +1,3 @@
-Turn attoparsec parsers into sinks.
+Consume attoparsec parsers via conduit.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 87886216a5f5..ae723758bc31 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-attoparsec-enumerator
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3
-PORTREVISION= 2
+PORTVERSION= 0.3.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index f819b61c5be5..252241cfe23a 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.tar.gz) = bb70595659c02b8394fa1901b156ee7602b184defcbdff817bc9db5d4366d8e9
-SIZE (cabal/attoparsec-enumerator-0.3.tar.gz) = 2496
+SHA256 (cabal/attoparsec-enumerator-0.3.1.tar.gz) = a78a9f6ade2ae43659243b1a9e925a8c1bc2c05d94e894ca853a32b887880682
+SIZE (cabal/attoparsec-enumerator-0.3.1.tar.gz) = 2498
diff --git a/textproc/hs-attoparsec-enumerator/pkg-descr b/textproc/hs-attoparsec-enumerator/pkg-descr
index c85ac9009c0d..bdb70e667e13 100644
--- a/textproc/hs-attoparsec-enumerator/pkg-descr
+++ b/textproc/hs-attoparsec-enumerator/pkg-descr
@@ -2,4 +2,4 @@ This library allows an Attoparsec parser to receive input incrementally from
an enumerator. This could be used for parsing large files, or implementing
binary network protocols.
-WWW: http://john-millikin.com/software/attoparsec-enumerator/
+WWW: http://john-millikin.com/software/attoparsec-enumerator/
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 5dfec35101ec..dfc1c913f5dc 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-attoparsec
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec
PORTVERSION= 0.10.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/pkg-descr b/textproc/hs-attoparsec/pkg-descr
index 3eecb81e7145..dd1cb996de25 100644
--- a/textproc/hs-attoparsec/pkg-descr
+++ b/textproc/hs-attoparsec/pkg-descr
@@ -2,4 +2,4 @@ A fast parser combinator library, aimed particularly at dealing
efficiently with network protocols and complicated text/binary file
formats.
-WWW: https://github.com/bos/attoparsec
+WWW: https://github.com/bos/attoparsec
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index d1422c654381..3016b84c42dc 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-blaze-html
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-html
-PORTVERSION= 0.5.0.0
+PORTVERSION= 0.5.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 5283e4557fbf..01b89de0a932 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.5.0.0.tar.gz) = 924ffc5a5d0d8f5695c8e63217859d6f2e7b0a53c938798ee0a62e098a6bdb31
-SIZE (cabal/blaze-html-0.5.0.0.tar.gz) = 66175
+SHA256 (cabal/blaze-html-0.5.1.1.tar.gz) = 82aa58b0ba1a9cf872f3aae8ac1c09dc36e6e6f40b3a2bfa4efe6a02afb334fc
+SIZE (cabal/blaze-html-0.5.1.1.tar.gz) = 77442
diff --git a/textproc/hs-blaze-html/pkg-descr b/textproc/hs-blaze-html/pkg-descr
index 371105dddd90..f9c8d7c1c85f 100644
--- a/textproc/hs-blaze-html/pkg-descr
+++ b/textproc/hs-blaze-html/pkg-descr
@@ -1,3 +1,3 @@
A blazingly fast HTML combinator library for the Haskell programming language.
-WWW: http://jaspervdj.be/blaze
+WWW: http://jaspervdj.be/blaze
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 562c8085dcc1..64321689a6d5 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-blaze-markup
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.0
-PORTREVISION= 1
+PORTVERSION= 0.5.1.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index aa16f7dd1cfc..195c2548b4f2 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.0.tar.gz) = ea8c196ba6773893d3da54ad6c70a0be7b63b5f523b66fdef2528fa0f8ef006f
-SIZE (cabal/blaze-markup-0.5.1.0.tar.gz) = 11856
+SHA256 (cabal/blaze-markup-0.5.1.2.tar.gz) = 15467d380656a8afc46568a54ed032ed7b3ffff8a877bb676e239d3256651cc7
+SIZE (cabal/blaze-markup-0.5.1.2.tar.gz) = 11892
diff --git a/textproc/hs-blaze-markup/pkg-descr b/textproc/hs-blaze-markup/pkg-descr
index 221c1fb3872a..b15b3a5b0385 100644
--- a/textproc/hs-blaze-markup/pkg-descr
+++ b/textproc/hs-blaze-markup/pkg-descr
@@ -1,4 +1,4 @@
Core modules of a blazingly fast markup combinator library for the Haskell
programming language.
-WWW: http://jaspervdj.be/blaze
+WWW: http://jaspervdj.be/blaze
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 01ed8bb20920..7111a68f8f7d 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: bytestring-csv
-# Date created: November 25, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 0933149266ec..7163e87893bc 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-case-insensitive
-# Date created: May 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= case-insensitive
-PORTVERSION= 0.4.0.1
-PORTREVISION= 2
+PORTVERSION= 0.4.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 54d511e29a9a..2cbbcc389e2e 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-0.4.0.1.tar.gz) = 072bc80e59d64105e61bb157b5b3276dcad92df2095e88ee11f4de20ebbf8c97
-SIZE (cabal/case-insensitive-0.4.0.1.tar.gz) = 3207
+SHA256 (cabal/case-insensitive-0.4.0.3.tar.gz) = ee57c6fbe4a57ec1ebcd93a75df3b9ed2023249636e36e0bdc35c6eeb8ebeed2
+SIZE (cabal/case-insensitive-0.4.0.3.tar.gz) = 3350
diff --git a/textproc/hs-case-insensitive/pkg-descr b/textproc/hs-case-insensitive/pkg-descr
index 2c357a8e0fd5..1554215766a6 100644
--- a/textproc/hs-case-insensitive/pkg-descr
+++ b/textproc/hs-case-insensitive/pkg-descr
@@ -3,4 +3,4 @@ be parameterised by a string-like type like: 'String', 'ByteString', 'Text',
etc. Comparisons of values of the resulting type will be insensitive to
cases.
-WWW: http://hackage.haskell.org/package/case-insensitive
+WWW: https://github.com/basvandijk/case-insensitive
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 34477a87324f..4bae8c548bd4 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-citeproc-hs
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,15 +9,16 @@ COMMENT= A Citation Style Language implementation in Haskell
LICENSE= BSD
-USE_CABAL= json mtl pandoc-types>=1.8 utf8-string xml
+USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-OPTIONS_DEFINE= BIBUTILS NETWORK
-OPTIONS_DEFAULT= BIBUTILS NETWORK
+OPTIONS_DEFINE= BIBUTILS HEXPAT NETWORK
+OPTIONS_DEFAULT= BIBUTILS HEXPAT NETWORK
BIBUTILS_DESC= Use Chris Putnam's Bibutils
+HEXPAT_DESC= Use hexpat to parse XML
NETWORK_DESC= Use network and HTTP to retrieve CSL file
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MBIBUTILS}
CONFIGURE_ARGS+= --flags="bibutils"
@@ -32,6 +27,13 @@ USE_CABAL+= hs-bibutils>=0.3
CONFIGURE_ARGS+= --flags="-bibutils"
.endif
+.if ${PORT_OPTIONS:MHEXPAT}
+CONFIGURE_ARGS+= --flags="hexpat"
+USE_CABAL+= hexpat>=0.20.2
+.else
+CONFIGURE_ARGS+= --flags="-hexpat"
+.endif
+
.if ${PORT_OPTIONS:MNETWORK}
CONFIGURE_ARGS+= --flags="network"
USE_CABAL+= HTTP>=4000.0.9 network>=2
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 06dd33d80602..0a07dc5af690 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.4.tar.gz) = db0aa3f34991c0e90bd04b4a6752048eeb36fef24693dfbb44cd2d48eb75869f
-SIZE (cabal/citeproc-hs-0.3.4.tar.gz) = 100279
+SHA256 (cabal/citeproc-hs-0.3.6.tar.gz) = 02173cb7e217b9cd962147ca7ffcf02ff4f7112ba1f5bc1bdce1bd138762bc7f
+SIZE (cabal/citeproc-hs-0.3.6.tar.gz) = 104345
diff --git a/textproc/hs-citeproc-hs/pkg-descr b/textproc/hs-citeproc-hs/pkg-descr
index bf6b6b9a0b62..f55261280c22 100644
--- a/textproc/hs-citeproc-hs/pkg-descr
+++ b/textproc/hs-citeproc-hs/pkg-descr
@@ -4,4 +4,4 @@ Language (CSL) [1].
[1] http://xbiblio.sourceforge.net/
-WWW: http://gorgias.mine.nu/repos/citeproc-hs/
+WWW: http://gorgias.mine.nu/repos/citeproc-hs/
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 1a11c013ad01..7218e58b1ba1 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-csv
-# Date created: 11 August 2011
-# Whom: Kaspars Bankovskis <kaspars@bankovskis.lv>
-#
+# Created by: Kaspars Bankovskis <kaspars@bankovskis.lv>
# $FreeBSD$
-#
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index fc38c0dcff9e..87a8a6e2fe2b 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-double-conversion
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= double-conversion
-PORTVERSION= 0.2.0.4
-PORTREVISION= 2
+PORTVERSION= 0.2.0.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index 4ecdfec0cdfc..87cdcc72fa6c 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/double-conversion-0.2.0.4.tar.gz) = 3da5f0c17875b2cbca805439e901f90fac97e25312a5e173820a083f85452b03
-SIZE (cabal/double-conversion-0.2.0.4.tar.gz) = 6833347
+SHA256 (cabal/double-conversion-0.2.0.5.tar.gz) = 0eaaa0469bbd11d40b724c47aa2b45ae1d95948d6c0a8b7c53b460eb345243fc
+SIZE (cabal/double-conversion-0.2.0.5.tar.gz) = 6830329
diff --git a/textproc/hs-double-conversion/pkg-descr b/textproc/hs-double-conversion/pkg-descr
index 6da6186995bc..71059e5abe4d 100644
--- a/textproc/hs-double-conversion/pkg-descr
+++ b/textproc/hs-double-conversion/pkg-descr
@@ -11,4 +11,4 @@ to be due to the cost of allocating ByteString values via malloc.)
As a final note, be aware that the bytestring-show package is about 50%
slower than simply using show.
-WWW: http://github.com/mailrank/double-conversion
+WWW: https://github.com/bos/double-conversion
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 1c642641e2c2..e43fd92d51aa 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-feed
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= feed
PORTVERSION= 0.3.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
new file mode 100644
index 000000000000..8a2cae492cbb
--- /dev/null
+++ b/textproc/hs-hexpat/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= hexpat
+PORTVERSION= 0.20.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= XML parser/formatter based on expat
+
+LICENSE= BSD
+
+USE_CABAL= List>=0.4.2 text>=0.5 transformers utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
new file mode 100644
index 000000000000..2c2f97f160dc
--- /dev/null
+++ b/textproc/hs-hexpat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hexpat-0.20.3.tar.gz) = 3aeff6da3ea6abf2ec529d48f3774f8dea386fc2c66a662d89dedcca3603b08d
+SIZE (cabal/hexpat-0.20.3.tar.gz) = 133330
diff --git a/textproc/hs-hexpat/pkg-descr b/textproc/hs-hexpat/pkg-descr
new file mode 100644
index 000000000000..c62d6b3191c6
--- /dev/null
+++ b/textproc/hs-hexpat/pkg-descr
@@ -0,0 +1,6 @@
+This package provides a general purpose Haskell XML library using Expat
+to do its parsing (a fast stream-oriented XML parser written in C). It
+is extensible to any string type, with String, ByteString and Text
+provided out of the box.
+
+WWW: http://haskell.org/haskellwiki/Hexpat/
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 785258e3fa42..0431537e0ed1 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: highlighting-kate
-# Date created: December 16, 2008
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTVERSION= 0.5.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -21,7 +15,7 @@ OPTIONS_DEFINE= EXECUTABLE
EXECUTABLE_DESC= Build the Highlight executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="executable"
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index ab2f7328d4ca..2a9a6f3845b8 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.1.tar.gz) = 5282ed3e2a35d37e92484835e126d0c82020aa4308121049cd49b3f372380f50
-SIZE (cabal/highlighting-kate-0.5.1.tar.gz) = 617979
+SHA256 (cabal/highlighting-kate-0.5.3.3.tar.gz) = 5680414b3ca5a332f096b66bfebdfa7df185b4d2c4b58583dc644da096a05d22
+SIZE (cabal/highlighting-kate-0.5.3.3.tar.gz) = 639766
diff --git a/textproc/hs-highlighting-kate/pkg-descr b/textproc/hs-highlighting-kate/pkg-descr
index eacf2cf1c96d..0cf8ce4c11f6 100644
--- a/textproc/hs-highlighting-kate/pkg-descr
+++ b/textproc/hs-highlighting-kate/pkg-descr
@@ -1,5 +1,5 @@
-The highlighting-kate is a syntax highlighting library for Haskell with
-support for over 50 languages. The syntax parsers are automatically
+The highlighting-kate is a syntax highlighting library with support for
+nearly one hundred languages. The syntax parsers are automatically
generated from Kate syntax descriptions [1], so any syntax supported by
Kate can be added. An (optional) command-line program is provided,
along with a utility for generating new parsers from Kate XML syntax
@@ -7,4 +7,4 @@ descriptions.
[1] http://kate-editor.org/
-WWW: http://github.com/jgm/highlighting-kate
+WWW: http://github.com/jgm/highlighting-kate
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 7f8cff63d31e..864c263f01c5 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hs-bibutils
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hs-bibutils
-PORTVERSION= 4.12
-PORTREVISION= 4
+PORTVERSION= 4.15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index a1580d1ba1c7..e7aad05bca5f 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.12.tar.gz) = 67949b90a3810774a40c77f87fffdb6cf740194f8afa521260651ead92897d2a
-SIZE (cabal/hs-bibutils-4.12.tar.gz) = 409820
+SHA256 (cabal/hs-bibutils-4.15.tar.gz) = e9a75f9922667e6dd16556433d52b32a12061dc1fbe3b2dde5a9c3ea4dc45bc0
+SIZE (cabal/hs-bibutils-4.15.tar.gz) = 422396
diff --git a/textproc/hs-hs-bibutils/pkg-descr b/textproc/hs-hs-bibutils/pkg-descr
index 822de78e8f51..1cfc23fb94f2 100644
--- a/textproc/hs-hs-bibutils/pkg-descr
+++ b/textproc/hs-hs-bibutils/pkg-descr
@@ -2,13 +2,4 @@ Haskell bindings to Chris Putnam's bibutils, a library that
interconverts between various bibliography formats using a common
MODS-format XML intermediate.
-hs-bibutils is available under the GNU GPL license. See the LICENSE file
-for details.
-
-For more details about bibutils, please check:
-<http://www.scripps.edu/~cdputnam/software/bibutils/>.
-
-The original API documentation is available here:
-<http://www.scripps.edu/~cdputnam/software/bibutils/library_specs.html>.
-
-WWW: http://code.haskell.org/hs-bibutils
+WWW: http://gorgias.mine.ru/repos/hs-bibutils/
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index a1e91906847a..2e0580653a28 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-html-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= html-conduit
-PORTVERSION= 0.0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.0.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +11,9 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= conduit>=0.4 filesystem-conduit>=0.4 resourcet>=0.3 \
- system-filepath>=0.4 tagstream-conduit>=0.3 text \
- transformers xml-conduit>=0.7 xml-types>=0.3
+USE_CABAL= conduit>=0.5 filesystem-conduit>=0.5 resourcet>=0.3 \
+ system-filepath>=0.4 tagstream-conduit>=0.4 text \
+ transformers xml-conduit>=1.0 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index 3bb2ed927126..af6d2c66e5cd 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-0.0.1.tar.gz) = 87866c66961b457450b5b739e485113ae3c238a2e594b4215e16666184bc9f6d
-SIZE (cabal/html-conduit-0.0.1.tar.gz) = 3285
+SHA256 (cabal/html-conduit-0.1.0.4.tar.gz) = e8c4a66e4a093cf19e50fbf9d2bc278a025e2c1060525d48692afc660a3a41bc
+SIZE (cabal/html-conduit-0.1.0.4.tar.gz) = 3797
diff --git a/textproc/hs-html-conduit/pkg-descr b/textproc/hs-html-conduit/pkg-descr
index 7947a18ad839..ac066c344fec 100644
--- a/textproc/hs-html-conduit/pkg-descr
+++ b/textproc/hs-html-conduit/pkg-descr
@@ -3,4 +3,4 @@ balances mismatched tags, so that there shouldn't be any parse failures.
It does not handle a full HTML document rendering, such as adding missing
html and head tags.
-WWW: https://github.com/snoyberg/xml
+WWW: https://github.com/snoyberg/xml
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 011c63ad3710..ca5a4abe2286 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-html
-# Date created: August 18, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 726749fc13b7..230d817c76df 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-charproperties
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-charproperties
PORTVERSION= 9.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 03a88b42a359..9857cc3772ee 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-regex-xmlschema
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 0051ca814e11..73c840f414da 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-unicode
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index cde796afcb1b..5d69dce1f762 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hxt
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hxt
-PORTVERSION= 9.2.2
-PORTREVISION= 1
+PORTVERSION= 9.3.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index 0b5121077ce6..252398aba52d 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.2.2.tar.gz) = d9e8d0b82d64775a1529d3747adfe820852a743e386ce75b080b040cf5959045
-SIZE (cabal/hxt-9.2.2.tar.gz) = 226885
+SHA256 (cabal/hxt-9.3.1.1.tar.gz) = bea0544c7945b6a268ee340be0fe0699335182602454f9565a4227d277411ff4
+SIZE (cabal/hxt-9.3.1.1.tar.gz) = 228205
diff --git a/textproc/hs-hxt/files/patch-hxt.cabal b/textproc/hs-hxt/files/patch-hxt.cabal
new file mode 100644
index 000000000000..1ce1d1ce667e
--- /dev/null
+++ b/textproc/hs-hxt/files/patch-hxt.cabal
@@ -0,0 +1,11 @@
+--- ./hxt.cabal.orig 2012-09-26 12:02:16.000000000 +0200
++++ ./hxt.cabal 2012-10-20 00:32:05.000000000 +0200
+@@ -182,7 +182,7 @@
+ parsec >= 2.1 && < 4,
+ HUnit >= 1.2 && < 2,
+ mtl >= 2 && < 3,
+- network >= 2.4 && < 3,
++ network >= 2.3 && < 2.4,
+ deepseq >= 1.1 && < 2,
+ bytestring >= 0.9 && < 1,
+ binary >= 0.5 && < 1,
diff --git a/textproc/hs-hxt/pkg-descr b/textproc/hs-hxt/pkg-descr
index 4e0f5a7d2d9b..780e0f33b4a9 100644
--- a/textproc/hs-hxt/pkg-descr
+++ b/textproc/hs-hxt/pkg-descr
@@ -9,4 +9,4 @@ defined data. The library make extensive use of the arrow approach for
processing XML. Since version 8.5 XPath and XSLT have been moved to
separate packages hxt-xpath and hxt-xslt.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 346b306827e0..0ce27f946034 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -1,14 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for: lhs2TeX
-# Date created: April 24, 2007
-# Whom: mainland@apeiron.net
-#
+# Created by: mainland@apeiron.net
# $FreeBSD$
-#
PORTNAME= lhs2tex
-PORTVERSION= 1.17
-PORTREVISION= 4
+PORTVERSION= 1.18.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,8 @@ COMMENT= Preprocessor for typesetting Haskell sources with LaTeX
LICENSE= GPLv2
CABAL_SETUP= Setup.hs
-USE_CABAL= regex-compat
+USE_CABAL= mtl regex-compat
+
BUILD_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
RUN_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index fb52aa0d782f..d894389f8582 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lhs2tex-1.17.tar.gz) = 2cf7495b951f44454a73d1be32617ffeba9b938af3e0c2a171a4f6524d1889f4
-SIZE (cabal/lhs2tex-1.17.tar.gz) = 662684
+SHA256 (cabal/lhs2tex-1.18.1.tar.gz) = dccae22231a1db64cddc38b6f7ac98ac4d5677f03df2f548b2efe9a5e63e9648
+SIZE (cabal/lhs2tex-1.18.1.tar.gz) = 661053
diff --git a/textproc/hs-lhs2tex/pkg-descr b/textproc/hs-lhs2tex/pkg-descr
index 0c58501a3309..e3f034d7643e 100644
--- a/textproc/hs-lhs2tex/pkg-descr
+++ b/textproc/hs-lhs2tex/pkg-descr
@@ -1,3 +1,3 @@
Preprocessor for typesetting Haskell sources with LaTeX.
-WWW: http://www.andres-loeh.de/lhs2tex/
+WWW: http://www.andres-loeh.de/lhs2tex/
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 8d3c49f6553f..b6d901d4ad4f 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-libxml
-# Date created: May 22, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index d1f53c5653a8..6964052303c8 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-pandoc-types
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pandoc-types
PORTVERSION= 1.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/pkg-descr b/textproc/hs-pandoc-types/pkg-descr
index 9a4e3110b976..02a03c0c452e 100644
--- a/textproc/hs-pandoc-types/pkg-descr
+++ b/textproc/hs-pandoc-types/pkg-descr
@@ -5,4 +5,4 @@ split off, so that other packages can use them without drawing in all of
pandoc's dependencies, and pandoc itself can depend on packages (like
citeproc-hs) that use them.
-WWW: http://johnmacfarlane.net/pandoc
+WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7da972edbf3c..7fff03286452 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: pandoc
-# Date created: 9 February 2007
-# Whom: John MacFarlane <jgm@berkeley.edu>
-#
+# Created by: John MacFarlane <jgm@berkeley.edu>
# $FreeBSD$
-#
PORTNAME= pandoc
-PORTVERSION= 1.9.4.2
+PORTVERSION= 1.9.4.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,11 +14,11 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4.3.0 citeproc-hs>=0.3.4 \
- highlighting-kate>=0.5.1 HTTP>=4000.0.5 json>=0.4 mtl>=1.1 \
- network>=2 pandoc-types>=1.9.0.2 parsec>=3.1 random>=1 \
- syb>=0.1 tagsoup>=0.12.5 temporary>=1.1 texmath>=0.6.0.2 \
- utf8-string>=0.3 xml>=1.3.12 zip-archive>=0.1.1.7 \
- zlib>=0.5
+ highlighting-kate>=0.5.0.2 HTTP>=4000.0.5 json>=0.4 \
+ mtl>=1.1 network>=2 pandoc-types>=1.9.0.2 parsec>=3.1 \
+ random>=1 syb>=0.1 tagsoup>=0.12.5 temporary>=1.1 \
+ texmath>=0.6.0.2 utf8-string>=0.3 xml>=1.3.12 \
+ zip-archive>=0.1.1.7 zlib>=0.5
MAN1= pandoc.1
MAN5= pandoc_markdown.5
@@ -34,7 +30,7 @@ OPTIONS_DEFAULT= EXECUTABLE LIBRARY
EXECUTABLE_DESC= Build the pandoc executable
LIBRARY_DESC= Build the pandoc library
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="exectuable"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 641f1c6d050a..b064335c32a1 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.4.2.tar.gz) = 535380d76be30747e264950ca1df96bc3d480a5917ab5a54fcd0d7b84cc722ff
-SIZE (cabal/pandoc-1.9.4.2.tar.gz) = 575099
+SHA256 (cabal/pandoc-1.9.4.5.tar.gz) = cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816
+SIZE (cabal/pandoc-1.9.4.5.tar.gz) = 574992
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 091750ce1d47..27c5e204c9f7 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,20 +1,18 @@
---- ./Setup.hs.orig 2012-05-13 05:04:40.000000000 +0200
-+++ ./Setup.hs 2012-05-15 16:22:31.000000000 +0200
-@@ -7,7 +7,7 @@
+--- ./Setup.hs.orig 2012-10-21 23:06:41.000000000 +0200
++++ ./Setup.hs 2012-10-23 18:33:48.000000000 +0200
+@@ -6,7 +6,7 @@
+ import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
- import Distribution.Simple.GHC (ghcPackageDbOptions)
--import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
+-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
++import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
import Distribution.Simple.Utils (installOrdinaryFiles)
- import Control.Exception ( bracket_ )
- import Control.Monad ( unless )
-@@ -86,7 +86,7 @@
+ import Prelude hiding (catch)
+ import System.Process ( rawSystem )
+@@ -49,5 +49,5 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
- installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+ installOrdinaryFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> manDir)
(zip (repeat manDir) manpages)
-
- -- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 400d102d4c2f..4c16865ec933 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -15,4 +15,4 @@ set of writers, which convert this native representation into a target
format. Thus, adding an input or output format requires only adding a
reader or writer.
-WWW: http://johnmacfarlane.net/pandoc
+WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index e8428dd25dd4..492a95656c14 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-parsec-ghc
-# Date created: 2010-05-14
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= parsec
-PORTVERSION= 3.1.2
-PORTREVISION= 1
+PORTVERSION= 3.1.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 1c0f16ecaca1..92c2d95c54f4 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.2.tar.gz) = 90f124b91f5e4ff04ddd4dc7f43aeda1273b8caec6a58ec13b90ca22854c1652
-SIZE (cabal/parsec-3.1.2.tar.gz) = 27733
+SHA256 (cabal/parsec-3.1.3.tar.gz) = 9f14bb4da77eb9b0e4dbe8112559ed49409b0af8e9aef5d08941dd97e37fc4a8
+SIZE (cabal/parsec-3.1.3.tar.gz) = 27866
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index 4516bfbef0fe..c2e9c7f00317 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -5,4 +5,4 @@ also fast. It is defined as a monad transformer that can be stacked
on arbitrary monads, and it is also parametric in the input stream
type.
-WWW: http://legacy.cs.uu.nl/daan/parsec.html
+WWW: http://legacy.cs.uu.nl/daan/parsec.html
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 7b534590afd6..ead43e343706 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-polyparse-ghc
-# Date created: January 23, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= polyparse
PORTVERSION= 1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/pkg-descr b/textproc/hs-polyparse/pkg-descr
index 51dccc62c066..d01bbdceae5f 100644
--- a/textproc/hs-polyparse/pkg-descr
+++ b/textproc/hs-polyparse/pkg-descr
@@ -4,4 +4,4 @@ arbitrary token type, running state, lazy parsing, and so on. Finally,
Text.Parse is a proposed replacement for the standard Read class, for
better deserialisation of Haskell values from Strings.
-WWW: http://code.haskell.org/~malcolm/polyparse/
+WWW: http://code.haskell.org/~malcolm/polyparse/
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index ad4c7c05f759..406bbe51853c 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-regex-base
-# Date created: 2010-08-10
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/pkg-descr b/textproc/hs-regex-base/pkg-descr
index 3f18aae62cb5..f1d4c2808f27 100644
--- a/textproc/hs-regex-base/pkg-descr
+++ b/textproc/hs-regex-base/pkg-descr
@@ -1,3 +1,3 @@
Interface API for regex-posix,pcre,parsec,tdfa,dfa.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://sourceforge.net/projects/lazy-regex
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index fdbfbc6815a5..32ae29953b64 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-regex-compat
-# Date created: August 18, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 69d4f072419d..3febeec8f8dc 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-regex-pcre-builtin
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-pcre-builtin
-PORTVERSION= 0.94.2.1.7.7
-PORTREVISION= 4
+PORTVERSION= 0.94.4.3.8.31
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,10 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= regex-base>=0.93
+LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 8c905be73268..69c2ed0a0bc8 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-pcre-builtin-0.94.2.1.7.7.tar.gz) = 1ac5ae23a47d7a595f023e37c4acf9403b1e8db3525c8679bfcb8546a3eb9fb0
-SIZE (cabal/regex-pcre-builtin-0.94.2.1.7.7.tar.gz) = 223037
+SHA256 (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 40d465882053af482b41c653c122fd26c279282a4388519413c98a36c8a76d79
+SIZE (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 287858
diff --git a/textproc/hs-regex-pcre-builtin/pkg-descr b/textproc/hs-regex-pcre-builtin/pkg-descr
index 992288feddec..f18a0b4df0e2 100644
--- a/textproc/hs-regex-pcre-builtin/pkg-descr
+++ b/textproc/hs-regex-pcre-builtin/pkg-descr
@@ -1,3 +1,4 @@
-The PCRE backend to accompany regex-base, see <http://www.pcre.org>.
+The PCRE backend to accompany regex-base, with bundled code from
+<http://www.pcre.org>.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index f6efc91c315f..85164e98800d 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-regex-posix
-# Date created: 2010-08-10
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-posix
-PORTVERSION= 0.95.1
-PORTREVISION= 2
+PORTVERSION= 0.95.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= The posix regex backend for regex-base
+COMMENT= Replaces/enhances Text.Regex
LICENSE= BSD
diff --git a/textproc/hs-regex-posix/distinfo b/textproc/hs-regex-posix/distinfo
index bfeb4440f394..682ee5aeb002 100644
--- a/textproc/hs-regex-posix/distinfo
+++ b/textproc/hs-regex-posix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-posix-0.95.1.tar.gz) = 74ed145b1a5b3c766a2694a58661f1d5e03a8dee283c5ddb9d689cff16efef0a
-SIZE (cabal/regex-posix-0.95.1.tar.gz) = 42808
+SHA256 (cabal/regex-posix-0.95.2.tar.gz) = 56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e
+SIZE (cabal/regex-posix-0.95.2.tar.gz) = 42916
diff --git a/textproc/hs-regex-posix/pkg-descr b/textproc/hs-regex-posix/pkg-descr
index 65d42af19f1c..7e6a8fd06da4 100644
--- a/textproc/hs-regex-posix/pkg-descr
+++ b/textproc/hs-regex-posix/pkg-descr
@@ -1,3 +1,3 @@
The posix regex backend for regex-base.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://sourceforge.net/projects/lazy-regex
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 397cc570f57b..d3b04482e263 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: stringsearch
-# Date created: November 1, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.3
-PORTREVISION= 2
+PORTVERSION= 0.3.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Boyer-Moore/Knuth-Morris-Pratt string search library
+COMMENT= Fast searching, splitting and replacing of ByteStrings
LICENSE= BSD
FILE_LICENSE= LICENCE
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index c656a2f07031..ade02142f724 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.3.tar.gz) = ffe983c4142f3f816e4b6f1e4ded0c51011b412c6f38a6e9a60f292f7fa01ab8
-SIZE (cabal/stringsearch-0.3.6.3.tar.gz) = 38998
+SHA256 (cabal/stringsearch-0.3.6.4.tar.gz) = 2ba4faa9759037c622091625d1d6b04d4401472d79f023631d6f8d8e2ce8e099
+SIZE (cabal/stringsearch-0.3.6.4.tar.gz) = 40116
diff --git a/textproc/hs-stringsearch/pkg-descr b/textproc/hs-stringsearch/pkg-descr
index 35e9b67bc1fe..7734f556919f 100644
--- a/textproc/hs-stringsearch/pkg-descr
+++ b/textproc/hs-stringsearch/pkg-descr
@@ -1,5 +1,8 @@
-This library provides Boyer-Moore and Knuth-Morris-Pratt string search
-implementations for Haskell bytestrings (with support for all strict and
-lazy ByteString permutations).
+This package provides several functions to quickly search for substrings
+in strict or lazy ByteStrings. It also provides functions for breaking or
+splitting on substrings and replacing all occurrences of a substring (the
+first in case of overlaps) with another. GHC before 6.10 are no longer
+supported, other compilers only if they support BangPatterns. If you need
+it to work with other compilers, send a feature request.
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch
+WWW: https://bitbucket.org/dafis/stringsearch
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a236688357d3..017f0617fad1 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -1,21 +1,17 @@
-# New ports collection makefile for: hs-tagsoup
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= tagsoup
-PORTVERSION= 0.12.6
-PORTREVISION= 2
+PORTVERSION= 0.12.8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for extracting information from HTML documents
+COMMENT= Parsing and extracting information from HTML/XML documents
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= text
INSTALL_PORTDATA= cd ${WRKSRC} && \
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 4b83d790d9df..ef2bb76593e1 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.12.6.tar.gz) = 65d35a8bbf6a55d4a602f4a756feec0fc410f589e2a8b9e2662e8c2095fe2de0
-SIZE (cabal/tagsoup-0.12.6.tar.gz) = 30467
+SHA256 (cabal/tagsoup-0.12.8.tar.gz) = a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515
+SIZE (cabal/tagsoup-0.12.8.tar.gz) = 30647
diff --git a/textproc/hs-tagsoup/pkg-descr b/textproc/hs-tagsoup/pkg-descr
index ffe056a8afa3..9ef9450aa8bc 100644
--- a/textproc/hs-tagsoup/pkg-descr
+++ b/textproc/hs-tagsoup/pkg-descr
@@ -1,8 +1,7 @@
-TagSoup is a Haskell library for extracting information out of
-unstructured HTML code, sometimes known as tag-soup. The HTML does not
-have to be well formed, or render properly within any particular
-framework. This library is for situations where the author of the HTML
-is not cooperating with the person trying to extract the information, but
-is also not trying to hide the information.
+TagSoup is a library for parsing HTML/XML. It supports the HTML 5
+specification, and can be used to parse either well-formed XML, or
+unstructured and malformed HTML from the web. The library also provides
+useful functions to extract information from an HTML document, making it
+ideal for screen-scraping.
-WWW: http://community.haskell.org/~ndm/tagsoup/
+WWW: http://community.haskell.org/~ndm/tagsoup/
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 66f5b528609f..1519a853ea28 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,24 +1,18 @@
-# New ports collection makefile for: hs-tagstream-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tagstream-conduit
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.5.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= streamlined html tag parser
+COMMENT= Streamlined HTML tag parser
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= attoparsec blaze-builder blaze-builder-conduit>=0.4 \
- conduit>=0.4
+USE_CABAL= attoparsec blaze-builder blaze-builder-conduit>=0.5 \
+ conduit>=0.5 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index b7827564c630..104114dd36b7 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.3.2.tar.gz) = ae66739ab4b7999f0f8476c68c21e31d780c5d7d2803f7e1ac17a17fb2b3c8cc
-SIZE (cabal/tagstream-conduit-0.3.2.tar.gz) = 6543
+SHA256 (cabal/tagstream-conduit-0.5.3.tar.gz) = b4590928ccefed3e099a0b4e7b8a8d47eee7e907aa544f81bcb9a6b25623e321
+SIZE (cabal/tagstream-conduit-0.5.3.tar.gz) = 6963
diff --git a/textproc/hs-tagstream-conduit/pkg-descr b/textproc/hs-tagstream-conduit/pkg-descr
index 2c664793c988..c7bf5cca10e4 100644
--- a/textproc/hs-tagstream-conduit/pkg-descr
+++ b/textproc/hs-tagstream-conduit/pkg-descr
@@ -3,4 +3,4 @@ parse unstructured and malformed HTML from the web. It also provides an
Enumeratee which can parse streamline html, which means it consumes constant
memory.
-WWW: http://github.com/yihuang/tagstream-conduit
+WWW: http://github.com/yihuang/tagstream-conduit
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index ce9c7049ab1f..6c7f0e90a986 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-texmath
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= texmath
-PORTVERSION= 0.6.0.6
-PORTREVISION= 1
+PORTVERSION= 0.6.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -23,7 +18,7 @@ OPTIONS_DEFINE= CGI
CGI_DESC= Compile CGI executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MCGI}
CONFIGURE_ARGS+= --flags="cgi"
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 0126b8f14fb9..e737c29c24ad 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.0.6.tar.gz) = 939c144a6ebd46a8bb35a079b2f6a4ae499185bd26f1f2e57394c4a777fab773
-SIZE (cabal/texmath-0.6.0.6.tar.gz) = 41544
+SHA256 (cabal/texmath-0.6.1.1.tar.gz) = 5fe16f60c6dc282be989fb91e5074ccc5c785883612e2f6d88edc8bb650ad31b
+SIZE (cabal/texmath-0.6.1.1.tar.gz) = 43980
diff --git a/textproc/hs-texmath/pkg-descr b/textproc/hs-texmath/pkg-descr
index 1c372b3fc827..7d16c9cba352 100644
--- a/textproc/hs-texmath/pkg-descr
+++ b/textproc/hs-texmath/pkg-descr
@@ -3,4 +3,4 @@ to presentation MathML (which can be used in HTML) or OMML (Office Math
Markup Language, used in Microsoft Office). It supports basic LaTeX and
AMS extensions, and it can parse and apply LaTeX macros.
-WWW: http://github.com/jgm/texmath
+WWW: http://github.com/jgm/texmath
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index 45c4bd4c608f..c4e0a72b8da4 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-xhtml
-# Date created: September 15, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xhtml
PORTVERSION= 3000.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xhtml/pkg-descr b/textproc/hs-xhtml/pkg-descr
index ee9b3d2fe100..e548a9ec0e64 100644
--- a/textproc/hs-xhtml/pkg-descr
+++ b/textproc/hs-xhtml/pkg-descr
@@ -1,4 +1,4 @@
This package provides combinators for producing XHTML 1.0, including the
Strict, Transitional and Frameset variants.
-WWW: https://github.com/haskell/xhtml
+WWW: https://github.com/haskell/xhtml
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 283449caa44e..f18d89c628d1 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-xml-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xml-conduit
-PORTVERSION= 0.7.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,11 +9,11 @@ COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=0.4 blaze-builder>=0.2 \
- blaze-builder-conduit>=0.4 conduit>=0.4 data-default>=0.2 \
- failure>=0.1 monad-control>=0.3 resourcet>=0.3 \
- system-filepath>=0.4 text>=0.7 transformers>=0.2 \
- xml-types>=0.3.1
+USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=0.5 blaze-builder>=0.2 \
+ blaze-builder-conduit>=0.5 blaze-html>=0.5 blaze-markup>=0.5 \
+ conduit>=0.5 data-default failure>=0.1 monad-control>=0.3 \
+ resourcet>=0.3 system-filepath>=0.4 text>=0.7 \
+ transformers>=0.2 xml-types>=0.3.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 0be5183d52a5..7ee915e68518 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-0.7.0.3.tar.gz) = 7bef1e2a5e5b1c2dcc994b0c6eaf4f88e73b8cadec88a13eb573b22e2b6a6c90
-SIZE (cabal/xml-conduit-0.7.0.3.tar.gz) = 26522
+SHA256 (cabal/xml-conduit-1.0.3.3.tar.gz) = dfe2775aad74b68a6e8a06bc12645bb53118577c97c836df44b22f5637c9814b
+SIZE (cabal/xml-conduit-1.0.3.3.tar.gz) = 29317
diff --git a/textproc/hs-xml-conduit/pkg-descr b/textproc/hs-xml-conduit/pkg-descr
index 516e508c72ea..da7b64288cce 100644
--- a/textproc/hs-xml-conduit/pkg-descr
+++ b/textproc/hs-xml-conduit/pkg-descr
@@ -18,4 +18,4 @@ broken up into the following modules:
* Text.XML.Stream.Render: Streaming renderer.
-WWW: http://github.com/snoyberg/xml
+WWW: http://github.com/snoyberg/xml
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index b7bea36c4a57..429f138fe46d 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-xml-types
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xml-types
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index e3e2379b9956..d0f9971573a2 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.2.tar.gz) = 268d604d33aecb2b6bbc5e2ed2b160828bc89dee58e2d677760677686cd030aa
-SIZE (cabal/xml-types-0.3.2.tar.gz) = 3600
+SHA256 (cabal/xml-types-0.3.3.tar.gz) = 963d3a195e3407b151692173422d3ec09a7e143fd08ed35503cc6a5cff836c4b
+SIZE (cabal/xml-types-0.3.3.tar.gz) = 3606
diff --git a/textproc/hs-xml-types/pkg-descr b/textproc/hs-xml-types/pkg-descr
index 8b9ad8230997..19bec3592292 100644
--- a/textproc/hs-xml-types/pkg-descr
+++ b/textproc/hs-xml-types/pkg-descr
@@ -1,4 +1,4 @@
Basic types for representing XML.
-WWW: http://john-millikin.com/software/haskell-xml/
+WWW: http://john-millikin.com/software/haskell-xml/
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index da6c9186e8bc..e842370dc424 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-xml
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= xml
PORTVERSION= 1.3.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml2html/Makefile b/textproc/hs-xml2html/Makefile
deleted file mode 100644
index 4ce5561ff14e..000000000000
--- a/textproc/hs-xml2html/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for: hs-xml2html
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= xml2html
-PORTVERSION= 0.1.2.3
-PORTREVISION= 1
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= blaze-html instances for xml-conduit types
-
-LICENSE= BSD
-
-USE_CABAL= blaze-html>=0.5 blaze-markup>=0.5.1 text>=0.5 xml-conduit>=0.5
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-xml2html/distinfo b/textproc/hs-xml2html/distinfo
deleted file mode 100644
index 980421fa594b..000000000000
--- a/textproc/hs-xml2html/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/xml2html-0.1.2.3.tar.gz) = 4b8a4adff8256c1101cb4d1ddb3faf9ad409a2729853de54148058129e4a1f0a
-SIZE (cabal/xml2html-0.1.2.3.tar.gz) = 2449
diff --git a/textproc/hs-xml2html/pkg-descr b/textproc/hs-xml2html/pkg-descr
deleted file mode 100644
index 0a8284f1907c..000000000000
--- a/textproc/hs-xml2html/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-blaze-html instances for xml-conduit types.
-
-WWW: http://github.com/snoyberg/xml
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index dc1406cfc2a9..123270d6370e 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-xmlhtml
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xmlhtml
-PORTVERSION= 0.2.0.2
+PORTVERSION= 0.2.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index 28a339af3d64..f788a0990a01 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.0.2.tar.gz) = 42cf86f94dcb56b7b1841d2d3bf18948066350e5753616ddb80a67cb46c71437
-SIZE (cabal/xmlhtml-0.2.0.2.tar.gz) = 124199
+SHA256 (cabal/xmlhtml-0.2.0.3.tar.gz) = 6b07154e09ce6ed1c4b9f984de35a58ea832b215a9d266390b807dd546d57c0d
+SIZE (cabal/xmlhtml-0.2.0.3.tar.gz) = 120231
diff --git a/textproc/hs-xmlhtml/pkg-descr b/textproc/hs-xmlhtml/pkg-descr
index 956508bc29d2..e1b4a7989886 100644
--- a/textproc/hs-xmlhtml/pkg-descr
+++ b/textproc/hs-xmlhtml/pkg-descr
@@ -12,4 +12,4 @@ not the HTML 5 node structure, but rather something closer to the physical
structure. For example, omitted start tags are not inserted (and so, their
corresponding end tags must also be omitted).
-WWW: http://hackage.haskell.org/package/xmlhtml
+WWW: http://hackage.haskell.org/package/xmlhtml
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 68a4de53a476..034d89ef7a58 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-yaml
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yaml
-PORTVERSION= 0.7.0.3
+PORTVERSION= 0.8.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +9,7 @@ COMMENT= Low-level binding to the libyaml C library
LICENSE= BSD
-USE_CABAL= aeson>=0.5 attoparsec conduit>=0.4 resourcet>=0.3 text \
+USE_CABAL= aeson>=0.5 attoparsec conduit>=0.5 resourcet>=0.3 text \
transformers>=0.1 unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 205e628ed699..48741591b15a 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.7.0.3.tar.gz) = b912937cae8b2ea729312386b6576e0bc6de46dde535990a8a7c5c8bc8d33df1
-SIZE (cabal/yaml-0.7.0.3.tar.gz) = 65242
+SHA256 (cabal/yaml-0.8.1.1.tar.gz) = 67a4e3bd1319e920724669d32947452663dcb620862f821ed9084be00a105558
+SIZE (cabal/yaml-0.8.1.1.tar.gz) = 65977
diff --git a/textproc/hs-yaml/pkg-descr b/textproc/hs-yaml/pkg-descr
index 96fa4ac60528..cb96676ec9f3 100644
--- a/textproc/hs-yaml/pkg-descr
+++ b/textproc/hs-yaml/pkg-descr
@@ -1,7 +1,6 @@
-Provides support for parsing and emitting Yaml documents.
-
-This package includes the full libyaml C library version 0.1.2 by Kirill
-Simonov in the package so you don't need to worry about any non-Haskell
+Provides support for parsing and emitting Yaml documents. This package
+includes the full libyaml C library version 0.1.2 by Kirill Simonov in
+the package so you don't need to worry about any non-Haskell
dependencies.
-WWW: http://github.com/snoyberg/yaml/
+WWW: http://github.com/snoyberg/yaml/
diff --git a/www/Makefile b/www/Makefile
index 06bee090fe6f..b5435e9a98ee 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -283,6 +283,7 @@
SUBDIR += horde3-wicked
SUBDIR += hotcrp
SUBDIR += hs-HTTP
+ SUBDIR += hs-activehs
SUBDIR += hs-authenticate
SUBDIR += hs-cgi
SUBDIR += hs-cookie
@@ -297,6 +298,7 @@
SUBDIR += hs-hjsmin
SUBDIR += hs-http-conduit
SUBDIR += hs-http-date
+ SUBDIR += hs-http-reverse-proxy
SUBDIR += hs-http-server
SUBDIR += hs-http-types
SUBDIR += hs-oeis
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 57aa23b922f4..a54291edd46d 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-HTTP
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= HTTP
-PORTVERSION= 4000.2.3
-PORTREVISION= 1
+PORTVERSION= 4000.2.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 1bba87af8362..ae66c473fc49 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.3.tar.gz) = 00f59f751a53a0cd766d59cffb3a97fc001189797861ce4aa28d4bea672efafc
-SIZE (cabal/HTTP-4000.2.3.tar.gz) = 60708
+SHA256 (cabal/HTTP-4000.2.5.tar.gz) = 67dd0e6b5b97657dcef8d906d329f73243b75b33ffeb90454783b0e9e70f320e
+SIZE (cabal/HTTP-4000.2.5.tar.gz) = 66587
diff --git a/www/hs-HTTP/pkg-descr b/www/hs-HTTP/pkg-descr
index 0e98e315a884..0f391dc0f467 100644
--- a/www/hs-HTTP/pkg-descr
+++ b/www/hs-HTTP/pkg-descr
@@ -15,4 +15,4 @@ of a type class, letting you pick the representation of requests and
responses that best fits your use. Some pre-packaged, common instances
are provided for you (ByteString, String.)
-WWW: https://github.com/haskell/HTTP
+WWW: https://github.com/haskell/HTTP
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
new file mode 100644
index 000000000000..2319979f8ee1
--- /dev/null
+++ b/www/hs-activehs/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME= activehs
+PORTVERSION= 0.3.0.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell code presentation tool
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= activehs-base>=0.2 Agda>=2.3.0.1 blaze-html>=0.5 \
+ blaze-markup>=0.5.1.0 cmdargs>=0.7 data-pprint>=0.2 \
+ dia-base>=0.1 dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
+ highlighting-kate>=0.5 hint>=0.3.3.2 hoogle>=4.2.11 mtl>=2.0 \
+ pandoc>=1.8 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
+ snap-core>=0.6 snap-server>=0.6 split>=0.1 syb>=0.2 \
+ text>=0.11 utf8-string>=0.3 xhtml>=3000.2
+
+STANDALONE= yes
+EXECUTABLE= activehs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-activehs/distinfo b/www/hs-activehs/distinfo
new file mode 100644
index 000000000000..bb773e290fc4
--- /dev/null
+++ b/www/hs-activehs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/activehs-0.3.0.1.tar.gz) = 860556c074cde2dad353cf4ca68a47271947e574c4680c237e79fe8bbb8c5627
+SIZE (cabal/activehs-0.3.0.1.tar.gz) = 35745
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
new file mode 100644
index 000000000000..5bbbc9570646
--- /dev/null
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -0,0 +1,10 @@
+--- ./activehs.cabal.orig 2012-10-10 11:22:11.000000000 +0200
++++ ./activehs.cabal 2012-11-03 20:34:38.000000000 +0100
+@@ -77,6 +77,7 @@
+ utf8-string >= 0.3 && < 0.4,
+ xhtml >= 3000.2 && < 3000.3,
+ blaze-html >= 0.4 && < 0.6,
++ blaze-markup == 0.5.1.*,
+ pureMD5 >= 2.1 && < 2.2,
+ deepseq >= 1.1 && < 1.4,
+ split >= 0.1 && < 0.3,
diff --git a/www/hs-activehs/pkg-descr b/www/hs-activehs/pkg-descr
new file mode 100644
index 000000000000..24d9095c701c
--- /dev/null
+++ b/www/hs-activehs/pkg-descr
@@ -0,0 +1,4 @@
+ActiveHs is a Haskell source code presentation tool, developed for education
+purposes.
+
+WWW: http://hackage.haskell.org/package/activehs
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 44c33f7e9aec..fb1e94735016 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-authenticate
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= authenticate
-PORTVERSION= 1.2.1.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,11 +9,11 @@ COMMENT= Authentication methods for Haskell web applications
LICENSE= BSD
-USE_CABAL= aeson>=0.5 attoparsec blaze-builder blaze-builder-conduit>=0.4 \
- case-insensitive>=0.2 conduit>=0.4 http-conduit>=1.4 \
+USE_CABAL= aeson>=0.5 attoparsec blaze-builder blaze-builder-conduit>=0.5 \
+ case-insensitive>=0.2 conduit>=0.5 http-conduit>=1.5 \
http-types>=0.6 monad-control>=0.3 network resourcet>=0.3 \
tagsoup>=0.12 text transformers>=0.1 unordered-containers \
- xml-conduit>=0.7
+ xml-conduit>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index e1ad3650b2a5..90f12bb9fd90 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/authenticate-1.2.1.1.tar.gz) = a4786e41ca90972db15aedfc202a24ad24bf5caac6a6254a7ef420f551d4df4d
-SIZE (cabal/authenticate-1.2.1.1.tar.gz) = 8400
+SHA256 (cabal/authenticate-1.3.2.tar.gz) = 35b531dea3acdd66abfd95684184062bd47da91e35a7920df8de0a0662766faf
+SIZE (cabal/authenticate-1.3.2.tar.gz) = 8436
diff --git a/www/hs-authenticate/pkg-descr b/www/hs-authenticate/pkg-descr
index 5c5aee257036..de76ead464df 100644
--- a/www/hs-authenticate/pkg-descr
+++ b/www/hs-authenticate/pkg-descr
@@ -1,4 +1,4 @@
Focus is on third-party authentication methods, such as OpenID, rpxnow
and Facebook.
-WWW: http://github.com/yesodweb/authenticate
+WWW: http://github.com/yesodweb/authenticate
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 00e89775a5aa..8a8d67e281d8 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-cgi
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= cgi
PORTVERSION= 3001.1.7.4
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= www haskell
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index ece285a160f3..05d435464eaa 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-cookie
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= cookie
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.4.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index f9d05eb28b65..464c7d760854 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cookie-0.4.0.tar.gz) = 2859ea1ee91b11c28e3eee80cdc1ea16f7847d447b4ab4f2f5201aa1bd357fee
-SIZE (cabal/cookie-0.4.0.tar.gz) = 3246
+SHA256 (cabal/cookie-0.4.0.1.tar.gz) = 73967e5d4a0fe43248db582ace5f0f4cb8c7085748ea90e1dc312f3e137e6506
+SIZE (cabal/cookie-0.4.0.1.tar.gz) = 3230
diff --git a/www/hs-cookie/pkg-descr b/www/hs-cookie/pkg-descr
index 8756dbfd6cc4..a448f2ff4d93 100644
--- a/www/hs-cookie/pkg-descr
+++ b/www/hs-cookie/pkg-descr
@@ -1,3 +1,3 @@
HTTP cookie parsing and rendering.
-WWW: http://github.com/snoyberg/cookie
+WWW: http://github.com/snoyberg/cookie
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 3eb85e63020f..4977f575a590 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-css-text
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= css-text
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/pkg-descr b/www/hs-css-text/pkg-descr
index 3c5057faf71e..a9034e887a5d 100644
--- a/www/hs-css-text/pkg-descr
+++ b/www/hs-css-text/pkg-descr
@@ -1,3 +1,3 @@
CSS parser and renderer.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index fe9bb4a3e4ac..78796f437d3c 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-fastcgi
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 0ae61ee37db1..b7e216ad6e3d 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-gitit
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gitit
-PORTVERSION= 0.10.0.1
+PORTVERSION= 0.10.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index 5c8024471c3a..9f02bbdeb847 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.0.1.tar.gz) = 0e09600998b0b2899c37e8b0c0ac65408ee52d263963441d2dd068200f96a437
-SIZE (cabal/gitit-0.10.0.1.tar.gz) = 206735
+SHA256 (cabal/gitit-0.10.0.2.tar.gz) = 3180e38c2d1b35cd1e215ac95a57c5e4b0cfbfae4d8c57bdba585102cba0d832
+SIZE (cabal/gitit-0.10.0.2.tar.gz) = 207370
diff --git a/www/hs-gitit/files/patch-gitit.cabal b/www/hs-gitit/files/patch-gitit.cabal
new file mode 100644
index 000000000000..227467ec4ac2
--- /dev/null
+++ b/www/hs-gitit/files/patch-gitit.cabal
@@ -0,0 +1,11 @@
+--- ./gitit.cabal.orig 2012-11-02 07:32:54.000000000 +0100
++++ ./gitit.cabal 2012-12-01 14:12:27.000000000 +0100
+@@ -148,7 +148,7 @@
+ random,
+ network >= 2.1.0.0 && < 2.5,
+ utf8-string >= 0.3 && < 0.4,
+- SHA > 1 && < 1.6,
++ SHA > 1 && < 1.7,
+ HTTP >= 4000.0 && < 4000.3,
+ HStringTemplate >= 0.6 && < 0.7,
+ old-locale >= 1,
diff --git a/www/hs-gitit/pkg-descr b/www/hs-gitit/pkg-descr
index 14882da515ef..70c5fb097742 100644
--- a/www/hs-gitit/pkg-descr
+++ b/www/hs-gitit/pkg-descr
@@ -15,4 +15,4 @@ Notable features include:
* a library, Network.Gitit, that makes it simple to include a gitit
wiki in any happstack application.
-WWW: http://gitit.net/
+WWW: http://gitit.net/
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 267820df6ced..d3244672e0b7 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hS3
-# Date created: July 5, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hS3
PORTVERSION= 0.5.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hS3/pkg-descr b/www/hs-hS3/pkg-descr
index ee5d651de831..97e7acd51b46 100644
--- a/www/hs-hS3/pkg-descr
+++ b/www/hs-hS3/pkg-descr
@@ -2,4 +2,4 @@ This is the Haskell S3 library. It provides an interface to Amazon's Simple
Storage Service (S3), allowing Haskell developers to reliably store and
retrieve arbitrary amounts of data from anywhere on the Internet.
-WWW: http://gregheartsfield.com/hS3/
+WWW: http://gregheartsfield.com/hS3/
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
index 32f446c13de4..11b6247464fb 100644
--- a/www/hs-hamlet/Makefile
+++ b/www/hs-hamlet/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-hamlet
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hamlet
-PORTVERSION= 1.0.1.4
+PORTVERSION= 1.1.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +10,7 @@ COMMENT= Haml-like template files that are compile-time checked
LICENSE= MIT
USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1 \
- failure>=0.1 parsec>=2 shakespeare>=1.0 text>=0.7
+ failure>=0.1 parsec>=2 shakespeare>=1.0.1 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
index 06f63a88b1e9..5f427ce77339 100644
--- a/www/hs-hamlet/distinfo
+++ b/www/hs-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hamlet-1.0.1.4.tar.gz) = 6723b04128ef95e705c0d0c388c8e6b3256f690fdc8c60ed2d5fc1cc49b97a67
-SIZE (cabal/hamlet-1.0.1.4.tar.gz) = 17926
+SHA256 (cabal/hamlet-1.1.1.1.tar.gz) = e876398ec043d1651017abd8aed13db1ad119ac8d685436097c1e96b13dcb66f
+SIZE (cabal/hamlet-1.1.1.1.tar.gz) = 18864
diff --git a/www/hs-hamlet/pkg-descr b/www/hs-hamlet/pkg-descr
index 52e243ca4b38..6fa032658fb9 100644
--- a/www/hs-hamlet/pkg-descr
+++ b/www/hs-hamlet/pkg-descr
@@ -3,4 +3,4 @@ via Quasi-Quoting, and generating extremely efficient output code. The
syntax is white-space sensitive, and it helps you avoid cross-site
scripting issues and 404 errors.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 4f85586e1904..f19807419448 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-happstack-server
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= happstack-server
-PORTVERSION= 7.0.3
+PORTVERSION= 7.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -20,8 +15,8 @@ CABAL_SETUP= Setup.hs
USE_CABAL= base64-bytestring blaze-html hslogger>=1.0.2 html \
monad-control>=0.3 mtl>=2 network>=2.2.3 parsec \
sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
- transformers>=0.1.3 transformers-base>=0.4 utf8-string>=0.3.4 \
- xhtml zlib
+ threads>=0.5 time-compat transformers>=0.1.3 \
+ transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index f0d612cc001a..7065d2926b82 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.0.3.tar.gz) = 1e8367cb6c8a40ddddbdb092cded40820082f3c8b0a97c54860992056580251b
-SIZE (cabal/happstack-server-7.0.3.tar.gz) = 77031
+SHA256 (cabal/happstack-server-7.1.1.tar.gz) = eaac533246ee0b67c05a217b967e55a9e0118d1ada0b64aada3d163c47a22260
+SIZE (cabal/happstack-server-7.1.1.tar.gz) = 75704
diff --git a/www/hs-happstack-server/pkg-descr b/www/hs-happstack-server/pkg-descr
index da12cc633dd4..84c49f9e7ba8 100644
--- a/www/hs-happstack-server/pkg-descr
+++ b/www/hs-happstack-server/pkg-descr
@@ -2,4 +2,4 @@ Happstack Server provides an HTTP server and a rich set of functions for
routing requests, handling query parameters, generating responses,
working with cookies, serving files, and more.
-WWW: http://happstack.com/
+WWW: http://happstack.com/
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 496c2cd66ee1..79673d61ea32 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-happstack
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= happstack
-PORTVERSION= 7.0.0
-PORTREVISION= 1
+PORTVERSION= 7.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack/distinfo b/www/hs-happstack/distinfo
index 349893d51053..303e92e251b5 100644
--- a/www/hs-happstack/distinfo
+++ b/www/hs-happstack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-7.0.0.tar.gz) = c827d71becacc971f856f722bef0258af06b86e06dcc0cd4c6804aeca654b35c
-SIZE (cabal/happstack-7.0.0.tar.gz) = 2092
+SHA256 (cabal/happstack-7.0.1.tar.gz) = 7da517397291c571af0606a1468911fd8f724daef67c86a6dd6b2680a9e2128b
+SIZE (cabal/happstack-7.0.1.tar.gz) = 2092
diff --git a/www/hs-happstack/pkg-descr b/www/hs-happstack/pkg-descr
index 81624188c652..7e2e1d5c4c6e 100644
--- a/www/hs-happstack/pkg-descr
+++ b/www/hs-happstack/pkg-descr
@@ -1,3 +1,3 @@
The Haskell application server stack.
-WWW: http://happstack.com/
+WWW: http://happstack.com/
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index ee4e2b10ab60..6580f16d3218 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-heist
-# Date created: September 20, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= heist
-PORTVERSION= 0.8.1.1
+PORTVERSION= 0.8.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,8 +13,8 @@ CABAL_SETUP= Setup.hs
USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
blaze-html>=0.4 directory-tree MonadCatchIO-transformers>=0.2.1 \
- mtl>=2.0 random text>=0.10 transformers \
- unordered-containers>=0.1.4 vector>=0.9 xmlhtml>=0.1.6
+ mtl>=2.0 random text>=0.10 unordered-containers>=0.1.4 \
+ vector>=0.9 xmlhtml>=0.1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index cc7f86d52c0a..f708e5a60ab6 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.8.1.1.tar.gz) = 903a3be01427f915b86af3b0863abfd7ab703852005bd15b60d7a9a97f34a529
-SIZE (cabal/heist-0.8.1.1.tar.gz) = 38515
+SHA256 (cabal/heist-0.8.2.tar.gz) = 726684b48061495d7350bf018c6004214c185dc0ce2efbfb260524ecf67b557d
+SIZE (cabal/heist-0.8.2.tar.gz) = 38499
diff --git a/www/hs-heist/pkg-descr b/www/hs-heist/pkg-descr
index b5ef886b98a5..7dccb35001b5 100644
--- a/www/hs-heist/pkg-descr
+++ b/www/hs-heist/pkg-descr
@@ -1,3 +1,3 @@
An xhtml templating system.
-WWW: http://snapframework.com/
+WWW: http://snapframework.com/
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index be11b366e126..aa1debe8821e 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hjsmin
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hjsmin
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 7f2a4d172fcf..bc6e0bf2142b 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.2.tar.gz) = 4b6383b6f85cfc5da3d74e9e0f275edeff5a9a0bb274103a7a741150061ad313
-SIZE (cabal/hjsmin-0.1.2.tar.gz) = 12434
+SHA256 (cabal/hjsmin-0.1.3.tar.gz) = 8d7821562cc0107277af1867ddf79235c61b07e1708e5614467a4172aac6e753
+SIZE (cabal/hjsmin-0.1.3.tar.gz) = 12463
diff --git a/www/hs-hjsmin/pkg-descr b/www/hs-hjsmin/pkg-descr
index fc3ecbcf3fd8..a71a0e0d1a95 100644
--- a/www/hs-hjsmin/pkg-descr
+++ b/www/hs-hjsmin/pkg-descr
@@ -1,4 +1,4 @@
Reduces size of javascript files by stripping out extraneous whitespace
and other syntactic elements, without changing the semantics.
-WWW: http://github.com/alanz/hjsmin
+WWW: http://github.com/alanz/hjsmin
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 1285524f327f..73398bbb1918 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-http-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= http-conduit
-PORTVERSION= 1.4.1.10
+PORTVERSION= 1.8.4.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,15 +9,15 @@ COMMENT= HTTP client package with conduit interface and HTTPS support
LICENSE= BSD
-USE_CABAL= asn1-data>=0.5.1 attoparsec>=0.8.0.2 attoparsec-conduit>=0.4 \
+USE_CABAL= asn1-data>=0.5.1 attoparsec>=0.8.0.2 attoparsec-conduit>=0.5 \
base64-bytestring>=0.1 blaze-builder>=0.2.1 \
- blaze-builder-conduit>=0.4 case-insensitive>=0.2 \
- certificate>=1.2 conduit>=0.4.1 cookie>=0.4 cprng-aes>=0.2 \
- data-default>=0.3 failure>=0.1 http-types>=0.6 \
- lifted-base>=0.1 monad-control>=0.3 mtl network>=2.3 \
- regex-compat resourcet>=0.3 socks>=0.4 text tls>=0.9.3 \
- tls-extra>=0.4.5 transformers>=0.2 transformers-base>=0.4 \
- utf8-string>=0.3.4 void>=0.5.5 zlib-conduit>=0.4
+ blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
+ certificate>=1.3 conduit>=0.5 cookie>=0.4 cprng-aes>=0.2 \
+ data-default failure>=0.1 http-types>=0.6 lifted-base>=0.1 \
+ monad-control>=0.3 mtl network>=2.3 regex-compat \
+ resourcet>=0.3 socks>=0.4 text tls>=1.0.0 tls-extra>=0.5.0 \
+ transformers>=0.2 transformers-base>=0.4 utf8-string>=0.3.4 \
+ void>=0.5.5 zlib-conduit>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index 8e8aa833ccbd..4006518a520d 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.4.1.10.tar.gz) = 01e0f720c003866ff71af1f2dc85ffcfd29fe3eb59f9d2f1a87b13f817094028
-SIZE (cabal/http-conduit-1.4.1.10.tar.gz) = 27076
+SHA256 (cabal/http-conduit-1.8.4.3.tar.gz) = 79a44f3283972fb83358e56e0b57c8c1e9e06ca79dcc480a742deb5a45bc0cbd
+SIZE (cabal/http-conduit-1.8.4.3.tar.gz) = 32219
diff --git a/www/hs-http-conduit/pkg-descr b/www/hs-http-conduit/pkg-descr
index 7f158ee89239..e819f615fb29 100644
--- a/www/hs-http-conduit/pkg-descr
+++ b/www/hs-http-conduit/pkg-descr
@@ -2,4 +2,4 @@ This package uses attoparsec for parsing the actual contents of the HTTP
connection. It also provides higher-level functions which allow you to
avoid direct usage of conduits.
-WWW: http://www.yesodweb.com/book/http-conduit
+WWW: http://www.yesodweb.com/book/http-conduit
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 0baf2d26fb58..58a469fca52a 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-http-date
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= http-date
-PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTVERSION= 0.0.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-date/distinfo b/www/hs-http-date/distinfo
index b8e380fc3488..39c3031115d0 100644
--- a/www/hs-http-date/distinfo
+++ b/www/hs-http-date/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-date-0.0.2.tar.gz) = 72333b1686e5f34d7b8ca25d5c35d5d52afb2a666cc1aa4a637b710d8793d1a2
-SIZE (cabal/http-date-0.0.2.tar.gz) = 4810
+SHA256 (cabal/http-date-0.0.3.tar.gz) = d6ea5f7ba611ac2b3c534c1d57f03a1d3c5a596f613846e8031bb4f0bfa33e8a
+SIZE (cabal/http-date-0.0.3.tar.gz) = 4861
diff --git a/www/hs-http-date/pkg-descr b/www/hs-http-date/pkg-descr
index a75fd36eca0d..2c0edeebe7b1 100644
--- a/www/hs-http-date/pkg-descr
+++ b/www/hs-http-date/pkg-descr
@@ -1,3 +1,3 @@
Fast parser and formatter for HTTP Date.
-WWW: http://hackage.haskell.org/package/http-date
+WWW: http://hackage.haskell.org/package/http-date
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
new file mode 100644
index 000000000000..8c0f4ddf8b76
--- /dev/null
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= http-reverse-proxy
+PORTVERSION= 0.1.0.6
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Reverse proxy HTTP requests, either over raw sockets or with WAI
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 \
+ classy-prelude-conduit>=0.3 conduit>=0.5 http-conduit>=1.6 \
+ http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \
+ network network-conduit>=0.6 text>=0.11 wai>=1.3 \
+ warp>=1.3.4 word8>=0.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
new file mode 100644
index 000000000000..e349999924cb
--- /dev/null
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http-reverse-proxy-0.1.0.6.tar.gz) = 8885e3a350e8fb9d77b8b9e2bb2e729c16695f5c18fc55f60c532c54a3ff7079
+SIZE (cabal/http-reverse-proxy-0.1.0.6.tar.gz) = 5693
diff --git a/www/hs-http-reverse-proxy/pkg-descr b/www/hs-http-reverse-proxy/pkg-descr
new file mode 100644
index 000000000000..7f0be104ad09
--- /dev/null
+++ b/www/hs-http-reverse-proxy/pkg-descr
@@ -0,0 +1,5 @@
+Provides a simple means of reverse-proxying HTTP requests. The raw approach
+uses the same technique as leveraged by keter, whereas the WAI approach
+performs full request/response parsing via WAI and http-conduit.
+
+WWW: https://github.com/fpco/http-reverse-proxy
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 36f1b05cecb4..1fd31b3e6a8c 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-http-server
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= http-server
-PORTVERSION= 1
-PORTREVISION= 5
+PORTVERSION= 1.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,12 +11,17 @@ COMMENT= A library for writing Haskell web servers
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= HTTP>=4000.0.7 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
+USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-.if !defined(NOPORTEXAMPLES)
+OPTIONS_DEFINE= EXAMPLES
+OPTIONS_DEFAULT= EXAMPLES
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+
+.if ${PORT_OPTIONS:MEXAMPLES}
SUB_FILES= pkg-message
SHOW_PKGMSG= yes
.endif
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index 6ef714f0c53f..c31b5b77c8d6 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-server-1.tar.gz) = a724c4224c7bf000c7b498a7145efb5f2a4f7b8eab4033bc960c3f11026848b1
-SIZE (cabal/http-server-1.tar.gz) = 27654
+SHA256 (cabal/http-server-1.0.1.tar.gz) = 514541d73dab8269706c574ead7ac14e462ef2c7379decd7fc29f4ca38672749
+SIZE (cabal/http-server-1.0.1.tar.gz) = 28028
diff --git a/www/hs-http-server/files/patch-Network__HTTP__Server.hs b/www/hs-http-server/files/patch-Network__HTTP__Server.hs
deleted file mode 100644
index 0c736fa6a37d..000000000000
--- a/www/hs-http-server/files/patch-Network__HTTP__Server.hs
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./Network/HTTP/Server.hs.orig 2009-06-13 03:58:45.000000000 +0200
-+++ ./Network/HTTP/Server.hs 2012-05-13 21:03:32.137467690 +0200
-@@ -123,8 +123,9 @@
-
- client sock addr =
- do let name = ppSockAddr addr ""
-+ let port = ppSockPort addr
- logInfo lg 0 ("Accepted connection from " ++ name)
-- conn <- socketConnection name sock -- XXX: name?
-+ conn <- socketConnection name port sock -- XXX: name?
- setStreamHooks conn nullHooks { hook_close =
- logInfo lg 0 ("Closing connection to " ++ ppSockAddr addr "")
- }
diff --git a/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs b/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs
deleted file mode 100644
index d816ca0cf2f9..000000000000
--- a/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./Network/HTTP/Server/Utils.hs.orig 2009-06-13 03:58:45.000000000 +0200
-+++ ./Network/HTTP/Server/Utils.hs 2012-05-13 21:03:02.570464902 +0200
-@@ -48,11 +48,11 @@
-
- ppSockAddr :: SockAddr -> ShowS
- ppSockAddr (SockAddrInet port addr) = ppHostAddress addr
-- . showChar ':' . shows port
- #ifdef _OS_UNIX
--ppSockAddr (SockAddrInet6 port _ addr _) =
-- ppHostAddress6 addr . showChar ':' . shows port
-+ppSockAddr (SockAddrInet6 port _ addr _) = ppHostAddress6 addr
- ppSockAddr (SockAddrUnix sock) = showString "unix/" . showString sock
- #endif
-
--
-+ppSockPort :: SockAddr -> Int
-+ppSockPort (SockAddrInet port _) = fromIntegral port
-+ppSockPort (SockAddrInet6 port _ _ _) = fromIntegral port
diff --git a/www/hs-http-server/pkg-descr b/www/hs-http-server/pkg-descr
index f70d9d7ea9ca..283b50434178 100644
--- a/www/hs-http-server/pkg-descr
+++ b/www/hs-http-server/pkg-descr
@@ -1,3 +1,3 @@
A library for writing Haskell web servers.
-WWW: http://code.galois.com/
+WWW: http://code.galois.com/
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 42959dbb5090..77bd379a2cba 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-http-types
-# Date created: May 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= http-types
-PORTVERSION= 0.6.11
-PORTREVISION= 1
+PORTVERSION= 0.7.3.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index b341d4e88b83..75621a1c7f0d 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-types-0.6.11.tar.gz) = 0eee82084dde44f84e385f1ac85367abd1f612be4db97aebae165c8e59845df1
-SIZE (cabal/http-types-0.6.11.tar.gz) = 10644
+SHA256 (cabal/http-types-0.7.3.0.1.tar.gz) = 38a3a07fe8bf5b1433f5befc1d0e230c5a253ae0120e5038a55eb82bcb814de8
+SIZE (cabal/http-types-0.7.3.0.1.tar.gz) = 11762
diff --git a/www/hs-http-types/pkg-descr b/www/hs-http-types/pkg-descr
index 27029d467303..591ae86c0234 100644
--- a/www/hs-http-types/pkg-descr
+++ b/www/hs-http-types/pkg-descr
@@ -1,3 +1,3 @@
Generic HTTP types for Haskell (for both client and server code).
-WWW: https://github.com/aristidb/http-types
+WWW: https://github.com/aristidb/http-types
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 1057e59d7e72..5b5182e92e1b 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-oeis
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= oeis
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index e26ff19abfd3..2846afba8b3a 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-path-pieces
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= path-pieces
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo
index 4b382e44ea84..e1eabe9b9a6b 100644
--- a/www/hs-path-pieces/distinfo
+++ b/www/hs-path-pieces/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/path-pieces-0.1.1.tar.gz) = 5f6518f7b6d9cc483e3dfa93fff2aea140788eefa9e16f390c4cfcf79598d59f
-SIZE (cabal/path-pieces-0.1.1.tar.gz) = 2118
+SHA256 (cabal/path-pieces-0.1.2.tar.gz) = 4aada5c3651017f28f0f9676f9b79868aba8b23dc1991d0d7252b8802952bab3
+SIZE (cabal/path-pieces-0.1.2.tar.gz) = 2485
diff --git a/www/hs-path-pieces/pkg-descr b/www/hs-path-pieces/pkg-descr
index 1ddf3b60301d..611e067c883e 100644
--- a/www/hs-path-pieces/pkg-descr
+++ b/www/hs-path-pieces/pkg-descr
@@ -1,3 +1,3 @@
Components of paths.
-WWW: http://github.com/snoyberg/path-pieces
+WWW: http://hackage.haskell.org/package/path-pieces
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 410940c6dd85..b22801ce0595 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-recaptcha
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= recaptcha
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/pkg-descr b/www/hs-recaptcha/pkg-descr
index 9365c3849f96..519ba4a003f6 100644
--- a/www/hs-recaptcha/pkg-descr
+++ b/www/hs-recaptcha/pkg-descr
@@ -4,4 +4,4 @@ for using reCAPTCHA in Haskell web applications.
[1] http://recaptcha.net/
-WWW: http://github.com/jgm/recaptcha/tree/master
+WWW: http://github.com/jgm/recaptcha/tree/master
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index fda2ffe0411b..03a4afe41010 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -1,15 +1,11 @@
-# New ports collection makefile for: hs-scgi
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
# deprecated: use wai
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index 5c454c635dd9..146828a4339e 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-shakespeare-css
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= shakespeare-css
-PORTVERSION= 1.0.1.2
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Stick your Haskell variables into CSS at compile time
LICENSE= MIT
-USE_CABAL= parsec>=2 shakespeare>=1.0 text>=0.11.1.1
+USE_CABAL= parsec>=2 shakespeare>=1.0 text>=0.11.1.1 transformers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
index 9f3e22757f90..b3a1a09b78eb 100644
--- a/www/hs-shakespeare-css/distinfo
+++ b/www/hs-shakespeare-css/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-css-1.0.1.2.tar.gz) = 07baa4a4b021aabe9a428a5d9e0f1111b2feb18a44185469e48bfe629dfbb614
-SIZE (cabal/shakespeare-css-1.0.1.2.tar.gz) = 14038
+SHA256 (cabal/shakespeare-css-1.0.2.tar.gz) = 63b25d95bf33e95da4181e2eb5a253ed97d80cb0b213556090cb9f32284e530b
+SIZE (cabal/shakespeare-css-1.0.2.tar.gz) = 14735
diff --git a/www/hs-shakespeare-css/pkg-descr b/www/hs-shakespeare-css/pkg-descr
index 805d12b84434..55fb49f66ae5 100644
--- a/www/hs-shakespeare-css/pkg-descr
+++ b/www/hs-shakespeare-css/pkg-descr
@@ -8,4 +8,4 @@ need for closing brackets and semi-colons. Lucius does not care about
whitespace and is a strict superset of css. There are also some
significant conveniences added for css.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index f8d235e62ef4..6dd05212f075 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-shakespeare-i18n
-# Date created: December 31, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= shakespeare-i18n
PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-i18n/pkg-descr b/www/hs-shakespeare-i18n/pkg-descr
index 077f42d4e7e1..58ac2326e290 100644
--- a/www/hs-shakespeare-i18n/pkg-descr
+++ b/www/hs-shakespeare-i18n/pkg-descr
@@ -2,4 +2,4 @@ This package uses the same approach of type-safe URLs to create
translated content. It has a simple syntax for translators, while
allowing the full power of Haskell for applying complex grammar rules.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index 4cd170c97d64..74e6f7f2fb20 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-shakespeare-js
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= shakespeare-js
-PORTVERSION= 1.0.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= Stick your Haskell variables into JavaScript at compile time
LICENSE= MIT
-USE_CABAL= shakespeare>=1.0 text>=0.7
+USE_CABAL= aeson>=0.5 shakespeare>=1.0.2 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
index 6262a4ad92b5..4ecd49756aba 100644
--- a/www/hs-shakespeare-js/distinfo
+++ b/www/hs-shakespeare-js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-js-1.0.0.3.tar.gz) = a67defaea5079259591f9e6814d3dc6f9602e0e26bb372b020744745e5eea503
-SIZE (cabal/shakespeare-js-1.0.0.3.tar.gz) = 6191
+SHA256 (cabal/shakespeare-js-1.1.0.tar.gz) = 37412fe4e4ce4301393413c82fce2de70758e3ebb98563a360efee6e6a746165
+SIZE (cabal/shakespeare-js-1.1.0.tar.gz) = 6665
diff --git a/www/hs-shakespeare-js/pkg-descr b/www/hs-shakespeare-js/pkg-descr
index 6d6a9efdd526..81d5304b8def 100644
--- a/www/hs-shakespeare-js/pkg-descr
+++ b/www/hs-shakespeare-js/pkg-descr
@@ -8,4 +8,4 @@ language that compiles down to javascript. It expects a coffeescript
compiler in your path, and variable should be a ToCoffee instance. And
we even have a Roy template for the adventorous FP addicts.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index 702bb20272bf..9066ae0a35f3 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-shakespeare-text
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= shakespeare-text
-PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-text/distinfo b/www/hs-shakespeare-text/distinfo
index ca80d7c9caa9..c609aa2120cf 100644
--- a/www/hs-shakespeare-text/distinfo
+++ b/www/hs-shakespeare-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-text-1.0.0.2.tar.gz) = ccfd085ea86a2c417b68bf0ee4c374f3642876e7b9e82d066a0c997ea332dcb6
-SIZE (cabal/shakespeare-text-1.0.0.2.tar.gz) = 4606
+SHA256 (cabal/shakespeare-text-1.0.0.5.tar.gz) = 669c298fbb7a06b667299f9ca185f32645d36aec13d9af6fb70e403d48ffde9c
+SIZE (cabal/shakespeare-text-1.0.0.5.tar.gz) = 4597
diff --git a/www/hs-shakespeare-text/pkg-descr b/www/hs-shakespeare-text/pkg-descr
index 5966bc523b33..b9a7ea77dc4e 100644
--- a/www/hs-shakespeare-text/pkg-descr
+++ b/www/hs-shakespeare-text/pkg-descr
@@ -8,4 +8,4 @@ external file. It also has url/embeding interpolation, with @ and ^,
which are used in Yesod. This package also uses blaze-builder for efficiently
constructing strings.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index d3a6308e9e83..ecca6aebe408 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-shakespeare
-# Date created: December 25, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= shakespeare
-PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index 31febdc1e42e..2c82ce5ff7e1 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.0.2.tar.gz) = 2e31213807639b98ca540d569d3f3f4aef0f8656459f32e7ca63f2c20e4dd312
-SIZE (cabal/shakespeare-1.0.0.2.tar.gz) = 7785
+SHA256 (cabal/shakespeare-1.0.2.tar.gz) = f5b718aff05b7759950091d3250ab35867e42e2849c0f6435003396173f5f8d8
+SIZE (cabal/shakespeare-1.0.2.tar.gz) = 8817
diff --git a/www/hs-shakespeare/pkg-descr b/www/hs-shakespeare/pkg-descr
index 2c0d9f78b95a..4cbf2dfb5b0e 100644
--- a/www/hs-shakespeare/pkg-descr
+++ b/www/hs-shakespeare/pkg-descr
@@ -8,4 +8,4 @@ should stay out of templates and has its own minimal Haskell parser.
Packages that use this: shakespeare-js, shakespeare-css,
shakespeare-text, hamlet, and xml-hamlet.
-WWW: http://www.yesodweb.com/book/shakespearean-templates
+WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 4c09b2554707..9a925b5bcbb4 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-snap-core
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= snap-core
-PORTVERSION= 0.9.0
+PORTVERSION= 0.9.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,13 +11,13 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 base16-bytestring \
+USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
- bytestring-nums case-insensitive>=0.3 dlist>=0.5 \
- enumerator>=0.4.15 HUnit>=1.2 MonadCatchIO-transformers>=0.2.1 \
- mtl>=2.0 mwc-random>=0.10 regex-posix text>=0.11 \
- transformers>=0.2 unix-compat>=0.2 \
- unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1
+ case-insensitive>=0.3 enumerator>=0.4.15 HUnit>=1.2 \
+ MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
+ regex-posix>=0.95 text>=0.11 transformers>=0.2 \
+ unix-compat>=0.2 unordered-containers>=0.1.4.3 vector>=0.6 \
+ zlib-enum>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 870593652e02..958dd7999ecd 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-core-0.9.0.tar.gz) = 6769ecb9d26a9e7f0193b4a59a0b9096eea50d11fb24cd858d29509d765552bb
-SIZE (cabal/snap-core-0.9.0.tar.gz) = 89503
+SHA256 (cabal/snap-core-0.9.2.2.tar.gz) = 8ed60802fc131998027a026616d3e7f5850031def269effa4152c52b60846a6b
+SIZE (cabal/snap-core-0.9.2.2.tar.gz) = 91227
diff --git a/www/hs-snap-core/pkg-descr b/www/hs-snap-core/pkg-descr
index ba96f088ad09..9fa644f95778 100644
--- a/www/hs-snap-core/pkg-descr
+++ b/www/hs-snap-core/pkg-descr
@@ -18,4 +18,4 @@ the Snap framework, including:
- Early termination of the computation if you know early what you want to
return and want to prevent further monadic processing.
-WWW: http://snapframework.com/
+WWW: http://snapframework.com/
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index ec06ccccd913..f1196a93da88 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-snap-server
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= snap-server
-PORTVERSION= 0.9.0
+PORTVERSION= 0.9.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,29 +13,19 @@ CABAL_SETUP= Setup.hs
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
- bytestring-nums case-insensitive>=0.3 directory-tree>=0.10 \
- enumerator>=0.4.15 MonadCatchIO-transformers>=0.2.1 \
- mtl>=2 murmur-hash>=0.1 network>=2.3 snap-core>=0.9 \
- text>=0.11 transformers>=0.2 unix-compat>=0.2 vector>=0.7 \
- vector-algorithms>=0.4
+ case-insensitive>=0.3 directory-tree>=0.10 enumerator>=0.4.15 \
+ MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
+ snap-core>=0.9.2 text>=0.11 transformers>=0.2 unix-compat>=0.2
-OPTIONS_DEFINE= LIBEV OPENSSL
+OPTIONS_DEFINE= OPENSSL
-LIBEV_DESC= Use libev
OPENSSL_DESC= Enable HTTPS support using the HsOpenSSL library
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBEV}
-CONFIGURE_ARGS+= --flags="libev"
-USE_CABAL+= hlibev
-.else
-CONFIGURE_ARGS+= --flags="-libev"
-.endif
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS+= --flags="openssl"
-USE_CABAL+= HsOpenSSL
+USE_CABAL+= HsOpenSSL>=0.10
.else
CONFIGURE_ARGS+= --flags="-openssl"
.endif
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index a4ee2c005fe9..78c4e20ef49b 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-server-0.9.0.tar.gz) = 6a0f085da3741c1e0529f31d7d5d1b670b360fb7ddeacbd648dcea6778f0b28a
-SIZE (cabal/snap-server-0.9.0.tar.gz) = 58291
+SHA256 (cabal/snap-server-0.9.2.4.tar.gz) = f4c356f1b74681ed6bf807e5dc292fdc721352b64e15800d1c03e49626cd95cf
+SIZE (cabal/snap-server-0.9.2.4.tar.gz) = 56202
diff --git a/www/hs-snap-server/pkg-descr b/www/hs-snap-server/pkg-descr
index f85214532f41..3b8b6644db95 100644
--- a/www/hs-snap-server/pkg-descr
+++ b/www/hs-snap-server/pkg-descr
@@ -4,4 +4,4 @@ iteratee-based web server library written in Haskell. Together with the
"snap-core" library upon which it depends, it provides a clean and
efficient Haskell programming interface to the HTTP protocol.
-WWW: http://snapframework.com/
+WWW: http://snapframework.com/
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index bee7eb326b14..135cc89ed11f 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,31 +1,28 @@
-# New ports collection makefile for: hs-snap
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= snap
-PORTVERSION= 0.9.0.1
+PORTVERSION= 0.9.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Snap: project starter executable and glue code library
+COMMENT= Top-level package for the Snap Web Framework
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.7.3.6 \
+USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
configurator>=0.1 data-lens>=2.0.1 data-lens-template>=2.1 \
directory-tree>=0.10 hashable>=1.1 heist>=0.7 logict>=0.4.2 \
MonadCatchIO-transformers>=0.2 mtl>2.0 mwc-random>=0.8 \
- pwstore-fast>=2.2 snap-core>=0.9 snap-server>=0.9 stm>=2.2 \
- syb>=0.1 text>=0.11 transformers>=0.2 unordered-containers>=0.1.4 \
- utf8-string>=0.3 vector>=0.7.1 vector-algorithms>=0.4 \
- xmlhtml>=0.1
+ pwstore-fast>=2.3 snap-core>=0.9.2 snap-server>=0.9.2 \
+ stm>=2.2 syb>=0.1 text>=0.11 transformers>=0.2 \
+ unordered-containers>=0.1.4 utf8-string>=0.3 vector>=0.7.1 \
+ vector-algorithms>=0.4 xmlhtml>=0.1
EXECUTABLE= snap
+IGNORE_DYNAMIC= yes
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index 23f99634460a..4316ee27f426 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.9.0.1.tar.gz) = f05567d7adbdd7ff09a94034ce0f0b1a3e909968e7d06a0a1bba318cb7af7858
-SIZE (cabal/snap-0.9.0.1.tar.gz) = 72908
+SHA256 (cabal/snap-0.9.2.2.tar.gz) = 5cffd4c80b9afac3566192a631ae3e08aad808bd316a4ef9478d6595166289e2
+SIZE (cabal/snap-0.9.2.2.tar.gz) = 73548
diff --git a/www/hs-snap/pkg-descr b/www/hs-snap/pkg-descr
index a8dd1f4eead5..2a9aefd65097 100644
--- a/www/hs-snap/pkg-descr
+++ b/www/hs-snap/pkg-descr
@@ -1,3 +1,8 @@
-Snap Framework project starter executable and glue code library.
+This is the top-level package for the official Snap Framework libraries.
+It includes:
-WWW: http://snapframework.com/
+ * The Snaplets API
+ * The "snap" executable program for generating starter projects
+ * Snaplets for sessions, authentication, and templates
+
+WWW: http://snapframework.com/
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 06a77328f327..eb3d361fd7b8 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-url
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-url/pkg-descr b/www/hs-url/pkg-descr
index 828a28171cb4..df4194efd432 100644
--- a/www/hs-url/pkg-descr
+++ b/www/hs-url/pkg-descr
@@ -1,3 +1,3 @@
A library for working with URLs.
-WWW: http://www.haskell.org/haskellwiki/Url
+WWW: http://www.haskell.org/haskellwiki/Url
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 37943d19597b..319d5f45638c 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-wai-app-static
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wai-app-static
-PORTVERSION= 1.2.0.4
+PORTVERSION= 1.3.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,9 +9,11 @@ COMMENT= WAI application for static serving
LICENSE= MIT
-USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.4 \
- cryptohash>=0.7 file-embed>=0.0.3.1 http-date http-types>=0.6 \
- text>=0.7 transformers>=0.2.2 unix-compat>=0.2 wai>=1.2
+USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
+ blaze-markup>=0.5.1 cereal>=0.3.5 crypto-conduit>=0.4 \
+ cryptohash>=0.7 file-embed>=0.0.3.1 http-date http-types>=0.7 \
+ mime-types>=0.1 system-fileio>=0.3 system-filepath>=0.4 \
+ text>=0.7 transformers>=0.2.2 unix-compat>=0.2 wai>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index 7c8d75d321c5..2573234d210c 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-1.2.0.4.tar.gz) = d1b3af510a42d86265c92375e2b33c472b67eda68ccf60aefdf8ff3f479a491a
-SIZE (cabal/wai-app-static-1.2.0.4.tar.gz) = 14237
+SHA256 (cabal/wai-app-static-1.3.0.4.tar.gz) = d6464ab45fa458b32c62ee92bb1a3bcc7084d9d30e5f195417be481096e18fb5
+SIZE (cabal/wai-app-static-1.3.0.4.tar.gz) = 14841
diff --git a/www/hs-wai-app-static/pkg-descr b/www/hs-wai-app-static/pkg-descr
index a7fe70d6341b..1d2260eceb88 100644
--- a/www/hs-wai-app-static/pkg-descr
+++ b/www/hs-wai-app-static/pkg-descr
@@ -1,3 +1,3 @@
Also provides some helper functions and datatypes for use outside of WAI.
-WWW: http://www.yesodweb.com/book/wai
+WWW: http://www.yesodweb.com/book/wai
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index 3e9490905e61..8705256b0a68 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-wai-extra
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wai-extra
-PORTVERSION= 1.2.0.5
+PORTVERSION= 1.3.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,11 +9,12 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
-USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.4 \
- case-insensitive>=0.2 conduit>=0.4 data-default>=0.3 \
- fast-logger>=0.0.2 http-types>=0.6 network>=2.2.1.5 \
- resourcet>=0.3 stringsearch>=0.3 text>=0.7 transformers>=0.2.2 \
- wai>=1.2 zlib-conduit>=0.4
+USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
+ case-insensitive>=0.2 conduit>=0.5 data-default \
+ date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
+ network>=2.2.1.5 resourcet>=0.3 stringsearch>=0.3 \
+ text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \
+ wai-logger>=0.2 zlib-conduit>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index af8fa7612fc8..869860fcfbd9 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.2.0.5.tar.gz) = 36aa7669d839ddf3525b709ee4e3915c1edb7211e204a7f93a52c0c68c6d3f55
-SIZE (cabal/wai-extra-1.2.0.5.tar.gz) = 29726
+SHA256 (cabal/wai-extra-1.3.0.4.tar.gz) = 8cc9d864c88fc54644d10eae9c45d466afcb78fe9876c082099ddb7a234e20c5
+SIZE (cabal/wai-extra-1.3.0.4.tar.gz) = 30837
diff --git a/www/hs-wai-extra/pkg-descr b/www/hs-wai-extra/pkg-descr
index db6097409656..d549df211d86 100644
--- a/www/hs-wai-extra/pkg-descr
+++ b/www/hs-wai-extra/pkg-descr
@@ -1,3 +1,3 @@
The goal here is to provide common features without many dependencies.
-WWW: http://github.com/yesodweb/wai
+WWW: http://github.com/yesodweb/wai
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index dd4ca80542af..3f76adc2e788 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-wai-logger
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wai-logger
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,8 +11,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= blaze-builder byteorder case-insensitive fast-logger \
- http-types network wai
+USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \
+ fast-logger>=0.3 http-types network wai
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo
index be8459bc968b..29eb1efbf1ed 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-logger-0.1.4.tar.gz) = 6332ed7058c9abcd7f867c5c666495f672ca64306e0f85fc56924d2a09c66ce7
-SIZE (cabal/wai-logger-0.1.4.tar.gz) = 4263
+SHA256 (cabal/wai-logger-0.3.0.tar.gz) = d80b264861eaeef7b37d35a49dd1a720b286fabeaaa67da2637d9d8cbd64528c
+SIZE (cabal/wai-logger-0.3.0.tar.gz) = 3642
diff --git a/www/hs-wai-logger/pkg-descr b/www/hs-wai-logger/pkg-descr
index 2e0b719fcfab..355a0c051a56 100644
--- a/www/hs-wai-logger/pkg-descr
+++ b/www/hs-wai-logger/pkg-descr
@@ -1,3 +1,3 @@
A logging system for WAI.
-WWW: http://hackage.haskell.org/package/wai-logger
+WWW: http://hackage.haskell.org/package/wai-logger
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index f1791789c18a..9a84f50d6f14 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-wai-test
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wai-test
-PORTVERSION= 1.2.0.2
-PORTREVISION= 1
+PORTVERSION= 1.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,10 +9,10 @@ COMMENT= Unit test framework (built on HUnit) for WAI applications
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.4 \
- case-insensitive>=0.2 conduit>=0.4 cookie>=0.2 \
- http-types>=0.6 HUnit>=1.2 text>=0.7 transformers>=0.2.2 \
- wai>=1.2
+USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
+ case-insensitive>=0.2 conduit>=0.5 cookie>=0.2 \
+ http-types>=0.7 HUnit>=1.2 text>=0.7 transformers>=0.2.2 \
+ wai>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
index d459baf24cba..5ed97df95fe4 100644
--- a/www/hs-wai-test/distinfo
+++ b/www/hs-wai-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-test-1.2.0.2.tar.gz) = f23f5d691b71d8e4f833bd61cbc3ed0290c123a1b157c80d60108dff407a157d
-SIZE (cabal/wai-test-1.2.0.2.tar.gz) = 3203
+SHA256 (cabal/wai-test-1.3.0.tar.gz) = 80c8d48e37f40fd1d130b95483bd59a1e5ae39a069684db4ad016ac20a57c097
+SIZE (cabal/wai-test-1.3.0.tar.gz) = 3098
diff --git a/www/hs-wai-test/pkg-descr b/www/hs-wai-test/pkg-descr
index 192e9622160a..8d6862278088 100644
--- a/www/hs-wai-test/pkg-descr
+++ b/www/hs-wai-test/pkg-descr
@@ -1,3 +1,3 @@
Unit test framework (built on HUnit) for WAI applications.
-WWW: http://www.yesodweb.com/book/wai
+WWW: http://www.yesodweb.com/book/wai
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 3592c41dc2c6..7217e0357089 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-wai
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wai
-PORTVERSION= 1.2.0.3
+PORTVERSION= 1.3.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +9,7 @@ COMMENT= Web Application Interface
LICENSE= BSD
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.4 http-types>=0.6 \
+USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 http-types>=0.7 \
network>=2.2.1.5 text>=0.7 transformers>=0.2.2 vault>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 85956ecce842..a5893a25fcb8 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-1.2.0.3.tar.gz) = 37003dc5a67097880011fb57abe124acd784b28f519f61f5be1b959f04fb865e
-SIZE (cabal/wai-1.2.0.3.tar.gz) = 4387
+SHA256 (cabal/wai-1.3.0.1.tar.gz) = d42709d9b2bcf804bfcb92e36462d859d3ffbdee317ce6dd591272154ef7cb7c
+SIZE (cabal/wai-1.3.0.1.tar.gz) = 4380
diff --git a/www/hs-wai/pkg-descr b/www/hs-wai/pkg-descr
index 38d3bb1df568..92344cbcb9ed 100644
--- a/www/hs-wai/pkg-descr
+++ b/www/hs-wai/pkg-descr
@@ -1,4 +1,4 @@
Provides a common protocol for communication between web applications and
web servers.
-WWW: https://github.com/yesodweb/wai
+WWW: https://github.com/yesodweb/wai
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index f025bb6280db..b1714e4d31f7 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-warp
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= warp
-PORTVERSION= 1.2.2
+PORTVERSION= 1.3.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,11 +9,11 @@ COMMENT= A fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.4 \
- case-insensitive>=0.2 conduit>=0.4 http-types>=0.6 \
- lifted-base>=0.1 network>=2.3 network-conduit>=0.4 \
- simple-sendfile>=0.2.2 transformers>=0.2.2 unix-compat>=0.2 \
- wai>=1.2
+USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
+ case-insensitive>=0.2 conduit>=0.5 hashable http-types>=0.7 \
+ lifted-base>=0.1 network>=2.3 network-conduit>=0.5 \
+ simple-sendfile>=0.2.7 transformers>=0.2.2 unix-compat>=0.2 \
+ void wai>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 24ee292b05a1..197ed9f99ea8 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.2.2.tar.gz) = c0192bc664250ec47490539fe03b2e47f61a7831e88abeb822c58126a54b4a4a
-SIZE (cabal/warp-1.2.2.tar.gz) = 14119
+SHA256 (cabal/warp-1.3.5.tar.gz) = 9429e1d97667c98bbfc05ff36eb8a8e1b3b1da04ceb2fa658c9f5b70dbbeb143
+SIZE (cabal/warp-1.3.5.tar.gz) = 17566
diff --git a/www/hs-warp/pkg-descr b/www/hs-warp/pkg-descr
index 9a26dfc90cca..fbfdf2621a3c 100644
--- a/www/hs-warp/pkg-descr
+++ b/www/hs-warp/pkg-descr
@@ -1,3 +1,3 @@
The premier WAI handler.
-WWW: http://github.com/yesodweb/wai
+WWW: http://github.com/yesodweb/wai
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index a506ae9d558d..bc29409353fd 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-webkit
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= webkit
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index dacfe16c26d0..260b338d7453 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-xss-sanitize
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xss-sanitize
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/pkg-descr b/www/hs-xss-sanitize/pkg-descr
index 980d2bc63fae..231faf41b064 100644
--- a/www/hs-xss-sanitize/pkg-descr
+++ b/www/hs-xss-sanitize/pkg-descr
@@ -1,4 +1,4 @@
Run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent
XSS attacks.
-WWW: http://github.com/yesodweb/haskell-xss-sanitize
+WWW: http://github.com/yesodweb/haskell-xss-sanitize
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 6f60d16be9d3..b1b77e177eb3 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-auth
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-auth
-PORTVERSION= 1.0.2.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,13 +9,14 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
-USE_CABAL= aeson>=0.5 authenticate>=1.2 blaze-html>=0.5 blaze-markup>=0.5.1 \
- hamlet>=1.0 http-conduit>=1.4.1.1 lifted-base>=0.1 \
- mime-mail>=0.3 persistent>=0.9 persistent-template>=0.9 \
- pureMD5>=2.0 pwstore-fast>=2.2 random>=1.0.0.2 SHA>=1.4.1.3 \
- shakespeare-css>=1.0 text>=0.7 transformers>=0.2.2 \
- unordered-containers wai>=1.2 yesod-core>=1.0 yesod-form>=1.0 \
- yesod-json>=1.0 yesod-persistent>=1.0
+USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
+ blaze-markup>=0.5.1 hamlet>=1.1 http-conduit>=1.5 \
+ lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.0 \
+ persistent-template>=1.0 pureMD5>=2.0 pwstore-fast>=2.2 \
+ random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
+ shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
+ unordered-containers wai>=1.3 yesod-core>=1.1 yesod-form>=1.1 \
+ yesod-json>=1.1 yesod-persistent>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index e6b9ebba3e58..916879f1456b 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.0.2.1.tar.gz) = 796397582e4d54d4592a83ff32ff722569a326392e9cd3cec9307db4fc4e733a
-SIZE (cabal/yesod-auth-1.0.2.1.tar.gz) = 15268
+SHA256 (cabal/yesod-auth-1.1.2.tar.gz) = 86866b63163bbf0fc79743dd27cf57c04748ddd6b06f22791b5c834271be814b
+SIZE (cabal/yesod-auth-1.1.2.tar.gz) = 17477
diff --git a/www/hs-yesod-auth/pkg-descr b/www/hs-yesod-auth/pkg-descr
index 3ce2218ee91e..84cc25320cd6 100644
--- a/www/hs-yesod-auth/pkg-descr
+++ b/www/hs-yesod-auth/pkg-descr
@@ -1,3 +1,3 @@
Authentication for Yesod.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 1522135b4e15..56f63cfe373c 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-core
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-core
-PORTVERSION= 1.0.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,13 +11,14 @@ LICENSE= MIT
USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \
- clientsession>=0.7.3.1 conduit>=0.4 cookie>=0.4 failure>=0.2 \
- fast-logger>=0.0.2 hamlet>=1.0 http-types>=0.6.5 lifted-base>=0.1 \
- monad-control>=0.3 parsec>=2 path-pieces>=0.1 random>=1.0.0.2 \
- resourcet>=0.3 shakespeare>=1.0 shakespeare-css>=1.0 \
- shakespeare-i18n>=1.0 shakespeare-js>=1.0 text>=0.7 \
- transformers>=0.2.2 transformers-base>=0.4 vector>=0.9 wai>=1.2 \
- wai-extra>=1.2 wai-logger>=0.0.1 yesod-routes>=1.0
+ clientsession>=0.8 conduit>=0.5 cookie>=0.4 failure>=0.2 \
+ fast-logger>=0.2 hamlet>=1.1 http-types>=0.7 lifted-base>=0.1 \
+ monad-control>=0.3 monad-logger>=0.2.1 parsec>=2 \
+ path-pieces>=0.1.2 random>=1.0.0.2 resourcet>=0.3 \
+ shakespeare>=1.0 shakespeare-css>=1.0 shakespeare-i18n>=1.0 \
+ shakespeare-js>=1.0 text>=0.7 transformers>=0.2.2 \
+ transformers-base>=0.4 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
+ yesod-routes>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index ebb8df4df223..0684c8151f8b 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.0.1.2.tar.gz) = dfc05e399a0855930b3bbc0a2b0c2793d0ba5e900b442592643368b13bf02ab1
-SIZE (cabal/yesod-core-1.0.1.2.tar.gz) = 38371
+SHA256 (cabal/yesod-core-1.1.6.1.tar.gz) = ea3e68cdba6ce431c567178da2377ef0ddf4d5004559a1d69ab7bc7471bf675e
+SIZE (cabal/yesod-core-1.1.6.1.tar.gz) = 42497
diff --git a/www/hs-yesod-core/pkg-descr b/www/hs-yesod-core/pkg-descr
index ba839109250a..b243d4c6a8e3 100644
--- a/www/hs-yesod-core/pkg-descr
+++ b/www/hs-yesod-core/pkg-descr
@@ -3,4 +3,4 @@ application that have strong compile-time guarantees of correctness. It
also affords space efficient code and portability to many deployment
backends, from CGI to stand-alone serving.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
index 14232cef9436..a598f0af1d96 100644
--- a/www/hs-yesod-default/Makefile
+++ b/www/hs-yesod-default/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-default
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-default
-PORTVERSION= 1.0.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,9 +9,10 @@ COMMENT= Default config and main functions for your yesod application
LICENSE= MIT
-USE_CABAL= network-conduit>=0.4 shakespeare-css>=1.0 shakespeare-js>=1.0 \
- text>=0.9 transformers>=0.2.2 unordered-containers \
- wai>=1.2 wai-extra>=1.2 warp>=1.2 yaml>=0.7 yesod-core>=1.0
+USE_CABAL= data-default hamlet>=1.1 network-conduit>=0.5 safe \
+ shakespeare-css>=1.0 shakespeare-js>=1.0 text>=0.9 \
+ transformers>=0.2.2 unordered-containers wai>=1.3 \
+ wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-core>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
index f32caaee7791..4a10c5d4bf3d 100644
--- a/www/hs-yesod-default/distinfo
+++ b/www/hs-yesod-default/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-default-1.0.1.1.tar.gz) = 603f6be4aba8116f356b71ac8270e5033bf52b502b6ff0951ea90bf87277674b
-SIZE (cabal/yesod-default-1.0.1.1.tar.gz) = 6778
+SHA256 (cabal/yesod-default-1.1.2.tar.gz) = 68d815aa0576b9318a2378b6bc572adeafbffad2127fd4356ac0afe3544b5f2b
+SIZE (cabal/yesod-default-1.1.2.tar.gz) = 6964
diff --git a/www/hs-yesod-default/pkg-descr b/www/hs-yesod-default/pkg-descr
index cd1a330d7267..5d7241f4fbd6 100644
--- a/www/hs-yesod-default/pkg-descr
+++ b/www/hs-yesod-default/pkg-descr
@@ -1,4 +1,4 @@
Convenient wrappers for your the configuration and execution of your yesod
application.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index d2ea4a88f1b6..4284fb3b10f6 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-form
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-form
-PORTVERSION= 1.0.0.4
-PORTREVISION= 1
+PORTVERSION= 1.2.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,11 +9,12 @@ COMMENT= Form handling support for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-html>=0.5 blaze-markup>=0.5.1 \
- data-default>=0.3 email-validate>=0.2.6 hamlet>=1.0 network>=2.2 \
- persistent>=0.9 shakespeare-css>=1.0 shakespeare-js>=1.0 \
- text>=0.9 transformers>=0.2.2 wai>=1.2 xss-sanitize>=0.3.0.1 \
- yesod-core>=1.0 yesod-persistent>=1.0
+USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
+ blaze-markup>=0.5.1 crypto-api>=0.8 data-default \
+ email-validate>=0.2.6 hamlet>=1.1 network>=2.2 \
+ persistent>=1.0 shakespeare-css>=1.0 shakespeare-js>=1.0 \
+ text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
+ yesod-core>=1.1 yesod-persistent>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 49ad50ccdb9e..2495348b39cb 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.0.0.4.tar.gz) = cde106258cefb064ce432edbac8266dee922e30fbe2a8189d03fe5e374b687f1
-SIZE (cabal/yesod-form-1.0.0.4.tar.gz) = 17067
+SHA256 (cabal/yesod-form-1.2.0.1.tar.gz) = f04ae02a241d999d157fe8ced31d4004cc6cd92db72903fb137a73944354ee8f
+SIZE (cabal/yesod-form-1.2.0.1.tar.gz) = 19549
diff --git a/www/hs-yesod-form/pkg-descr b/www/hs-yesod-form/pkg-descr
index 62fb646ded90..ddb4e10b0695 100644
--- a/www/hs-yesod-form/pkg-descr
+++ b/www/hs-yesod-form/pkg-descr
@@ -1,3 +1,3 @@
Form handling support for Yesod Web Framework.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
index bfa06475fd8b..87bd3c60080c 100644
--- a/www/hs-yesod-json/Makefile
+++ b/www/hs-yesod-json/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-json
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-json
-PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,10 +9,10 @@ COMMENT= Generate content for Yesod using the aeson package
LICENSE= MIT
-USE_CABAL= aeson>=0.5 attoparsec-conduit>=0.4 blaze-builder \
- conduit>=0.4 safe>=0.2 shakespeare-js>=1.0 text>=0.8 \
- transformers>=0.2.2 vector>=0.9 wai>=1.2 wai-extra>=1.2 \
- yesod-core>=1.0 yesod-routes>=1.0
+USE_CABAL= aeson>=0.5 attoparsec-conduit>=0.5 blaze-builder \
+ conduit>=0.5 safe>=0.2 shakespeare-js>=1.0 text>=0.8 \
+ transformers>=0.2.2 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
+ yesod-core>=1.1 yesod-routes>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-json/distinfo b/www/hs-yesod-json/distinfo
index d0f4615185e8..453f44cf20da 100644
--- a/www/hs-yesod-json/distinfo
+++ b/www/hs-yesod-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-json-1.0.0.1.tar.gz) = f06e330d9af14f1fb5f55e454da331fbda20f0babaaa4e930faa1f033c490236
-SIZE (cabal/yesod-json-1.0.0.1.tar.gz) = 3060
+SHA256 (cabal/yesod-json-1.1.2.tar.gz) = 2e6f60510f87685b902073c647e6ffd4efd78311251f4e5469bcbd8d0678726d
+SIZE (cabal/yesod-json-1.1.2.tar.gz) = 3185
diff --git a/www/hs-yesod-json/pkg-descr b/www/hs-yesod-json/pkg-descr
index e2cd1824acd1..3c3f7ba0c2bc 100644
--- a/www/hs-yesod-json/pkg-descr
+++ b/www/hs-yesod-json/pkg-descr
@@ -1,3 +1,3 @@
Generate content for Yesod using the aeson package.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 609ab4460463..b0d1162e0272 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-persistent
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-persistent
-PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,8 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= persistent>=0.9 persistent-template>=0.9 transformers>=0.2.2 \
- yesod-core>=1.0
+USE_CABAL= persistent>=1.0 persistent-template>=1.0 transformers>=0.2.2 \
+ yesod-core>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 5a5a5141c1db..39d9f7cdaa41 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.0.0.1.tar.gz) = bd1214a5944ad8c2ac3b7da360343c6aa9d194ca412505a85f45899e1eb991ec
-SIZE (cabal/yesod-persistent-1.0.0.1.tar.gz) = 1801
+SHA256 (cabal/yesod-persistent-1.1.0.tar.gz) = 52a9252b613b0b05c663bd3c83a2f0b6d96850f496f97420503d26ff04db0c31
+SIZE (cabal/yesod-persistent-1.1.0.tar.gz) = 1796
diff --git a/www/hs-yesod-persistent/pkg-descr b/www/hs-yesod-persistent/pkg-descr
index 512178d23527..bca41c3d7655 100644
--- a/www/hs-yesod-persistent/pkg-descr
+++ b/www/hs-yesod-persistent/pkg-descr
@@ -1,3 +1,3 @@
Some helpers for using Persistent from Yesod.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index 703d389a92ee..84a7168c1b04 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-yesod-platform
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-platform
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,50 +9,123 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.0.2_1 ansi-terminal==0.5.5_4 asn1-data==0.6.1.3_1 \
- attoparsec==0.10.2.0_1 attoparsec-conduit==0.4.0.1_1 \
- attoparsec-enumerator==0.3_2 authenticate==1.2.1.1_1 \
- base-unicode-symbols==0.2.2.3_2 base64-bytestring==0.1.2.0 \
- blaze-builder==0.3.1.0_2 blaze-builder-conduit==0.4.0.2_1 \
- blaze-html==0.5.0.0 blaze-markup==0.5.1.0_1 byteorder==1.0.3_2 \
- case-insensitive==0.4.0.1_2 cereal==0.3.5.2 certificate==1.2.3_1 \
- clientsession==0.7.5_1 conduit==0.4.2_1 cookie==0.4.0_1 \
- cprng-aes==0.2.3_2 cpu==0.1.1 crypto-api==0.10.2_1 \
- crypto-conduit==0.3.2_1 crypto-pubkey-types==0.1.1_1 \
- cryptocipher==0.3.5 cryptohash==0.7.5_1 css-text==0.1.1_2 \
- data-default==0.4.0_1 dlist==0.5_6 email-validate==0.2.8_1 \
- entropy==0.2.1_2 enumerator==0.4.19_1 failure==0.2.0.1_1 \
- fast-logger==0.0.2_2 file-embed==0.0.4.4_1 filesystem-conduit==0.4.0_1 \
- hamlet==1.0.1.4 hashable==1.1.2.3_1 hjsmin==0.1.2_1 hspec==1.2.0.1 \
- html-conduit==0.0.1_1 http-conduit==1.4.1.10 http-date==0.0.2_1 \
- http-types==0.6.11_1 HUnit==1.2.4.2_2 hxt==9.2.2_1 \
- hxt-charproperties==9.1.1_2 hxt-regex-xmlschema==9.0.4_2 \
- hxt-unicode==9.0.2_2 language-javascript==0.5.4_1 largeword==1.0.1_2 \
- lifted-base==0.1.1_1 mime-mail==0.4.1.1_2 monad-control==0.3.1.3_1 \
- network-conduit==0.4.0.1_1 path-pieces==0.1.1_1 pem==0.1.1_1 \
- persistent==0.9.0.4_1 persistent-template==0.9.0.2_1 \
- pool-conduit==0.1.0.2_1 primitive==0.4.1_2 pureMD5==2.1.0.3_2 \
- pwstore-fast==2.2_2 QuickCheck==2.4.2_1 ranges==0.2.4_2 \
- regex-compat==0.95.1_2 resource-pool==0.2.1.0_1 resourcet==0.3.3.1 \
- safe==0.3.3_2 semigroups==0.8.3.2_1 SHA==1.5.0.1_1 \
- shakespeare==1.0.0.2_1 shakespeare-css==1.0.1.2_1 \
- shakespeare-i18n==1.0.0.2_1 shakespeare-js==1.0.0.3_1 \
- shakespeare-text==1.0.0.2_1 silently==1.2.0.2 \
- simple-sendfile==0.2.4 skein==0.1.0.7_1 socks==0.4.1_1 \
- stm==2.3_1 stringsearch==0.3.6.3_2 system-fileio==0.3.8 \
- system-filepath==0.4.6_1 tagged==0.4.2.1_1 tagsoup==0.12.6_2 \
- tagstream-conduit==0.3.2_1 tls==0.9.5_1 tls-extra==0.4.6_1 \
- transformers-base==0.4.1_2 unix-compat==0.3.0.1_1 \
- unordered-containers==0.2.1.0_1 utf8-light==0.4.0.1_1 \
- utf8-string==0.3.7_2 vault==0.2.0.0_1 vector==0.9.1_2 void==0.5.6 \
- wai==1.2.0.3 wai-app-static==1.2.0.4 wai-extra==1.2.0.5 \
- wai-logger==0.1.4_1 wai-test==1.2.0.2_1 warp==1.2.2 \
- xml-conduit==0.7.0.3_1 xml-types==0.3.2 xml2html==0.1.2.3_1 \
- xss-sanitize==0.3.2_1 yaml==0.7.0.3 yesod==1.0.1.6_1 \
- yesod-auth==1.0.2.1_1 yesod-core==1.0.1.2_1 yesod-default==1.0.1.1_1 \
- yesod-form==1.0.0.4_1 yesod-json==1.0.0.1_1 yesod-persistent==1.0.0.1_1 \
- yesod-routes==1.0.1.2_1 yesod-static==1.0.0.3_1 yesod-test==0.2.1 \
- zlib==0.5.3.3_1 zlib-bindings==0.1.0.1_1 zlib-conduit==0.4.0.2
+USE_CABAL= aeson==0.6.0.2_2 \
+ ansi-terminal==0.5.5_5 \
+ asn1-data==0.7.1 \
+ attoparsec==0.10.2.0_2 \
+ attoparsec-conduit==0.5.0.3 \
+ authenticate==1.3.2 \
+ base-unicode-symbols==0.2.2.4 \
+ base64-bytestring==1.0.0.0 \
+ blaze-builder==0.3.1.0_3 \
+ blaze-builder-conduit==0.5.0.3 \
+ blaze-html==0.5.1.1 \
+ blaze-markup==0.5.1.2 \
+ byteorder==1.0.3_3 \
+ case-insensitive==0.4.0.3 \
+ cereal==0.3.5.2_1 \
+ certificate==1.3.3 \
+ clientsession==0.8.0.1 \
+ conduit==0.5.5 \
+ cookie==0.4.0.1 \
+ cprng-aes==0.2.4 \
+ cpu==0.1.1_1 \
+ crypto-api==0.10.2_2 \
+ crypto-conduit==0.4.1 \
+ crypto-pubkey-types==0.2.0 \
+ cryptocipher==0.3.6 \
+ cryptohash==0.7.9 \
+ css-text==0.1.1_3 \
+ data-default==0.5.0 \
+ date-cache==0.3.0 \
+ dlist==0.5_7 \
+ email-validate==0.3.2 \
+ entropy==0.2.1_3 \
+ failure==0.2.0.1_2 \
+ fast-logger==0.3.1 \
+ file-embed==0.0.4.6 \
+ filesystem-conduit==0.5.0.2 \
+ hamlet==1.1.1.1 \
+ hashable==1.1.2.5 \
+ hjsmin==0.1.3 \
+ hspec==1.4.2 \
+ hspec-expectations==0.3.0.3 \
+ html-conduit==0.1.0.4 \
+ http-conduit==1.8.4.3 \
+ http-date==0.0.3 \
+ http-types==0.7.3.0.1 \
+ language-javascript==0.5.7 \
+ largeword==1.0.3 \
+ lifted-base==0.2 \
+ mime-mail==0.4.1.2 \
+ mime-types==0.1.0.0 \
+ monad-control==0.3.1.4 \
+ monad-logger==0.2.3 \
+ network-conduit==0.6.1.1 \
+ path-pieces==0.1.2 \
+ pem==0.1.1_2 \
+ persistent==1.0.2.2 \
+ persistent-template==1.0.0.2 \
+ pool-conduit==0.1.0.3 \
+ primitive==0.5.0.1 \
+ pureMD5==2.1.2.1 \
+ pwstore-fast==2.3 \
+ ranges==0.2.4_3 \
+ resource-pool==0.2.1.1 \
+ resourcet==0.4.4 \
+ safe==0.3.3_3 \
+ semigroups==0.8.4.1 \
+ SHA==1.6.1 \
+ shakespeare==1.0.2 \
+ shakespeare-css==1.0.2 \
+ shakespeare-i18n==1.0.0.2_2 \
+ shakespeare-js==1.1.0 \
+ shakespeare-text==1.0.0.5 \
+ silently==1.2.4 \
+ simple-sendfile==0.2.8 \
+ skein==0.1.0.10 \
+ socks==0.4.2 \
+ stringsearch==0.3.6.4 \
+ system-fileio==0.3.10 \
+ system-filepath==0.4.7 \
+ tagged==0.4.4 \
+ tagsoup==0.12.8 \
+ tagstream-conduit==0.5.3 \
+ tar==0.4.0.1 \
+ tls==1.0.2 \
+ tls-extra==0.5.0 \
+ transformers-base==0.4.1_3 \
+ unix-compat==0.4.0.0 \
+ unordered-containers==0.2.2.1 \
+ utf8-light==0.4.0.1_2 \
+ utf8-string==0.3.7_3 \
+ vault==0.2.0.1 \
+ vector==0.10.0.1 \
+ void==0.5.8 \
+ wai==1.3.0.1 \
+ wai-app-static==1.3.0.4 \
+ wai-extra==1.3.0.4 \
+ wai-logger==0.3.0 \
+ wai-test==1.3.0 \
+ warp==1.3.5 \
+ xml-conduit==1.0.3.3 \
+ xml-types==0.3.3 \
+ xss-sanitize==0.3.2_2 \
+ yaml==0.8.1.1 \
+ yesod==1.1.4.1 \
+ yesod-auth==1.1.2 \
+ yesod-core==1.1.6.1 \
+ yesod-default==1.1.2 \
+ yesod-form==1.2.0.1 \
+ yesod-json==1.1.2 \
+ yesod-persistent==1.1.0 \
+ yesod-routes==1.1.1.1 \
+ yesod-static==1.1.1.1 \
+ yesod-test==0.3.1.1 \
+ zlib-bindings==0.1.1.2 \
+ zlib-conduit==0.5.0.3
+
+IGNORE_DYNAMIC= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index 062ca63a94df..ed1192b01aeb 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.0.5.tar.gz) = 76f4c602a59e3a8b78cd4848428ca58043b10a91a9f2910fe7f6fd3ddd793f88
-SIZE (cabal/yesod-platform-1.0.5.tar.gz) = 2577
+SHA256 (cabal/yesod-platform-1.1.5.tar.gz) = 32be89dc69c3e3328b01c012fd9624b8d0e380931aa198e2e98c2d8ecbcec16b
+SIZE (cabal/yesod-platform-1.1.5.tar.gz) = 2626
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
deleted file mode 100644
index 61aad211719a..000000000000
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./yesod-platform.cabal.orig 2012-06-30 21:34:35.000000000 +0200
-+++ ./yesod-platform.cabal 2012-07-01 02:04:57.000000000 +0200
-@@ -14,8 +14,8 @@
-
- library
- build-depends: base >= 4 && < 5
-- , HUnit == 1.2.4.3
-- , QuickCheck == 2.5
-+ , HUnit == 1.2.4.2
-+ , QuickCheck == 2.4.2
- , SHA == 1.5.0.1
- , aeson == 0.6.0.2
- , ansi-terminal == 0.5.5
diff --git a/www/hs-yesod-platform/pkg-descr b/www/hs-yesod-platform/pkg-descr
index 6feddde6daee..c9590d88665f 100644
--- a/www/hs-yesod-platform/pkg-descr
+++ b/www/hs-yesod-platform/pkg-descr
@@ -1,4 +1,4 @@
Instead of allowing version ranges of dependencies, this package requires
specific versions to avoid dependency hell.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index 1d327dcfc2e6..fba24da8af44 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-routes
-# Date created: April 8, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-routes
-PORTVERSION= 1.0.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index f13cf91dffb8..3f842663270f 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.0.1.2.tar.gz) = c75dec099532e1d6ac8f42032e071dc50680de3e14578edf354de7ce7d4a5995
-SIZE (cabal/yesod-routes-1.0.1.2.tar.gz) = 16286
+SHA256 (cabal/yesod-routes-1.1.1.1.tar.gz) = 75e03bca8523ec2bb9e05c078ca99ab05efc9f011de0ab3d881c2e681b289e81
+SIZE (cabal/yesod-routes-1.1.1.1.tar.gz) = 17946
diff --git a/www/hs-yesod-routes/pkg-descr b/www/hs-yesod-routes/pkg-descr
index 8ae4c84deecf..45e5b2dfb72d 100644
--- a/www/hs-yesod-routes/pkg-descr
+++ b/www/hs-yesod-routes/pkg-descr
@@ -1,3 +1,3 @@
Provides an efficient routing system, a parser and TH code generation.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index c603fef6926d..344414dd265d 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod-static
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-static
-PORTVERSION= 1.0.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,10 +9,11 @@ COMMENT= Static file serving subsite for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.4 \
- crypto-conduit>=0.3 cryptohash>=0.6.1 file-embed>=0.0.4.1 \
- http-types>=0.6.5 text>=0.9 transformers>=0.2.2 \
- unix-compat>=0.2 wai>=1.2 wai-app-static>=1.2 yesod-core>=1.0
+USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \
+ crypto-conduit>=0.4 cryptohash>=0.6.1 file-embed>=0.0.4.1 \
+ http-types>=0.7 system-filepath>=0.4.6 text>=0.9 \
+ transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \
+ wai-app-static>=1.3 yesod-core>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index d969bcef2f30..98c006dca698 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.0.0.3.tar.gz) = adb81f51e94ba2c1689df6f4296f78475a7efd9ab6aa9969a35315ee916387da
-SIZE (cabal/yesod-static-1.0.0.3.tar.gz) = 6429
+SHA256 (cabal/yesod-static-1.1.1.1.tar.gz) = 5a2254ce8e596974421b312ee42506706512ddc00bd06fdcb5292acda38ce3f2
+SIZE (cabal/yesod-static-1.1.1.1.tar.gz) = 6741
diff --git a/www/hs-yesod-static/pkg-descr b/www/hs-yesod-static/pkg-descr
index 88cb4ba25b3c..6508919727de 100644
--- a/www/hs-yesod-static/pkg-descr
+++ b/www/hs-yesod-static/pkg-descr
@@ -1,3 +1,3 @@
Static file serving subsite for Yesod Web Framework.
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index a18040bd8c57..814d120f372a 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,25 +1,19 @@
-# New ports collection makefile for: hs-yesod-test
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod-test
-PORTVERSION= 0.2.1
+PORTVERSION= 0.3.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= integration testing for WAI/Yesod Applications
+COMMENT= Integration testing for WAI/Yesod Applications
LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-html>=0.5 blaze-markup>=0.5.1 \
- case-insensitive>=0.2 hspec>=1.1 html-conduit>=0.0.1 \
- http-types>=0.6 HUnit>=1.2 hxt>=9.1.6 network>=2.2 \
- persistent>=0.9 text transformers>=0.2.2 wai>=1.2 \
- wai-test>=1.2 xml-conduit>=0.7 xml-types>=0.3 \
- xml2html>=0.1.2.3
+ case-insensitive>=0.2 hspec>=1.3 html-conduit>=0.1 \
+ http-types>=0.7 HUnit>=1.2 monad-control network>=2.2 \
+ persistent>=1.0 pool-conduit text transformers>=0.2.2 \
+ wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 6bdf94d7540a..2407538aee57 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-0.2.1.tar.gz) = 693ef12005b3882fc7f13b4ff093acc19746d91a34a9afa3db84e3f581c047aa
-SIZE (cabal/yesod-test-0.2.1.tar.gz) = 10974
+SHA256 (cabal/yesod-test-0.3.1.1.tar.gz) = 6fd9c2bab18f007feed74840a3593d328abdc5c05b4cf9b7308c75c03d48645c
+SIZE (cabal/yesod-test-0.3.1.1.tar.gz) = 10874
diff --git a/www/hs-yesod-test/pkg-descr b/www/hs-yesod-test/pkg-descr
index e93b9871561b..7a9ff2a40e7d 100644
--- a/www/hs-yesod-test/pkg-descr
+++ b/www/hs-yesod-test/pkg-descr
@@ -1,3 +1,3 @@
Behaviour Oriented integration Testing for Yesod Applications.
-WWW: http://www.yesodweb.com
+WWW: http://www.yesodweb.com
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index 10b5325445e9..2b1d0a3fd4fa 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-yesod
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yesod
-PORTVERSION= 1.0.1.6
-PORTREVISION= 1
+PORTVERSION= 1.1.4.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,16 +9,23 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 fast-logger>=0.0.2 hamlet>=1.0 \
- http-types>=0.6.1 monad-control>=0.3 parsec>=2.1 \
- shakespeare-css>=1.0 shakespeare-js>=1.0 shakespeare-text>=1.0 \
- text>=0.11 transformers>=0.2.2 unix-compat>=0.2 wai>=1.2 \
- wai-extra>=1.2 wai-logger>=0.1.2 warp>=1.2 yesod-auth>=1.0 \
- yesod-core>=1.0 yesod-form>=1.0 yesod-json>=1.0 \
- yesod-persistent>=1.0
+USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \
+ blaze-html>=0.5 blaze-markup>=0.5.1 conduit>=0.5.1 file-embed \
+ fsnotify>=0.0 ghc-paths>=0.1 hamlet>=1.1 http-conduit \
+ http-reverse-proxy>=0.1.0.4 http-types>=0.7 lifted-base \
+ monad-control>=0.3 network optparse-applicative>=0.4 \
+ parsec>=2.1 project-template>=0.1 resourcet>=0.3 \
+ shakespeare>=1.0.2 shakespeare-css>=1.0.2 \
+ shakespeare-js>=1.0.2 shakespeare-text>=1.0 split>=0.2 \
+ system-fileio>=0.3 system-filepath>=0.4 tar>=0.4 text>=0.11 \
+ transformers>=0.2.2 unix-compat>=0.2 unordered-containers \
+ wai>=1.3 wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-auth>=1.1 \
+ yesod-core>=1.1.5 yesod-default>=1.1.1.1 yesod-form>=1.1 \
+ yesod-json>=1.1 yesod-persistent>=1.1 zlib>=0.5
-EXECUTABLE= yesod
+EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
+
+IGNORE_DYNAMIC= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 3b57ef9a38cf..b2a387db83fa 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.0.1.6.tar.gz) = 83a8d743418e65247f84be82653ad7a0cc86ceb4b379a3a4bfd281b2d92ab370
-SIZE (cabal/yesod-1.0.1.6.tar.gz) = 65869
+SHA256 (cabal/yesod-1.1.4.1.tar.gz) = 8309a920f38e2cae1f8460e7bedd42e77fbdfa88b228134718815f0759f2e337
+SIZE (cabal/yesod-1.1.4.1.tar.gz) = 279377
diff --git a/www/hs-yesod/pkg-descr b/www/hs-yesod/pkg-descr
index d7f676dfee21..c20591e7294a 100644
--- a/www/hs-yesod/pkg-descr
+++ b/www/hs-yesod/pkg-descr
@@ -5,4 +5,4 @@ to stand-alone serving. Yesod also focuses on developer productivity.
Yesod integrates well with tools for all your basic web development (wai,
persistent, and shakespeare/hamlet).
-WWW: http://www.yesodweb.com/
+WWW: http://www.yesodweb.com/
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index bdffb407a1cd..66ee5d39ff96 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-glut-ghc
-# Date created: 2007-09-04
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
+# Created by: Volker Stolz <vs@FreeBSD.org>
# $FreeBSD$
PORTNAME= GLUT
PORTVERSION= 2.1.2.1
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-GLUT/pkg-descr b/x11-toolkits/hs-GLUT/pkg-descr
index 978adf6d08bc..76b9b61e75b1 100644
--- a/x11-toolkits/hs-GLUT/pkg-descr
+++ b/x11-toolkits/hs-GLUT/pkg-descr
@@ -1,4 +1,4 @@
The GLUT package contains a Haskell binding for the OpenGL Utility Toolkit, a
window system independent toolkit for writing OpenGL programs.
-WWW: http://www.haskell.org/HOpenGL/
+WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 626b375c883b..dfb4e94ad04d 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-opengl-ghc
-# Date created: 2008-09-04
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
+# Created by: Volker Stolz <vs@FreeBSD.org>
# $FreeBSD$
PORTNAME= OpenGL
PORTVERSION= 2.2.3.1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/pkg-descr b/x11-toolkits/hs-OpenGL/pkg-descr
index 37862b0989f3..30a792f6dab2 100644
--- a/x11-toolkits/hs-OpenGL/pkg-descr
+++ b/x11-toolkits/hs-OpenGL/pkg-descr
@@ -5,4 +5,4 @@ programming interface (API), incorporating a broad set of rendering,
texture mapping, special effects, and other powerful visualization
functions.
-WWW: http://www.haskell.org/HOpenGL/
+WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-frantk/Makefile b/x11-toolkits/hs-frantk/Makefile
index 1a977d055ec2..de124ad1e950 100644
--- a/x11-toolkits/hs-frantk/Makefile
+++ b/x11-toolkits/hs-frantk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: frantk
-# Date created: 25 May 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
# $FreeBSD$
-#
PORTNAME= frantk
PORTVERSION= 1.1
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index 78567bb290ac..4a1bb60e2f2f 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-gtk
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gtk
-PORTVERSION= 0.12.3.1
+PORTVERSION= 0.12.4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo
index 94b68d782b71..c823f13ccb78 100644
--- a/x11-toolkits/hs-gtk/distinfo
+++ b/x11-toolkits/hs-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk-0.12.3.1.tar.gz) = 1a9de48357f5bf4f2f10b797e3d6bef970aa4597c0ef48e61330ee4b0f803a6d
-SIZE (cabal/gtk-0.12.3.1.tar.gz) = 666428
+SHA256 (cabal/gtk-0.12.4.tar.gz) = e21ed8c3c7c0345bbaec8f1537a8605c64804e9937cef0cc9a84fce65274ce70
+SIZE (cabal/gtk-0.12.4.tar.gz) = 661848
diff --git a/x11-toolkits/hs-gtk/pkg-descr b/x11-toolkits/hs-gtk/pkg-descr
index 744fd816e0a1..15b9bf7e120a 100644
--- a/x11-toolkits/hs-gtk/pkg-descr
+++ b/x11-toolkits/hs-gtk/pkg-descr
@@ -2,4 +2,4 @@ This is the core library of the Gtk2Hs suite of libraries for Haskell based on
Gtk+. Gtk+ is an extensive and mature multi-platform toolkit for creating
graphical user interfaces.
-WWW: http://projects.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 49118293eb82..1ce8b55b7ecb 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: gtk2hs
-# Date created: 03 June 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gtk2hs
-PORTVERSION= 0.12.2
-PORTREVISION= 2
+PORTVERSION= 0.12.4
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -29,7 +24,7 @@ VTE_DESC= Terminal emulator
WEBKIT_DESC= WebKit rendering engine
SOEGTK_DESC= Examples for Haskell SoE
-.include <bsd.port.options.mk>
+.include "../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MGCONF}
USE_CABAL+= gconf
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index db03c2f2d3b0..805847f1ba8d 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-gtkglext
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gtkglext
PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 5df85ee36b5f..003f11dc5893 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-gtksourceview2
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= gtksourceview2
PORTVERSION= 0.12.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 07c07393c2b2..24f5a8305601 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-pango
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pango
-PORTVERSION= 0.12.3
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,8 @@ LICENSE= LGPL21
FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
-USE_CABAL= cairo>=0.12 glib>=0.12 mtl
+
+USE_CABAL= cairo>=0.12.0 glib>=0.12.0 mtl
USE_GNOME= pango
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo
index 7f6a134dec07..f2b37f3924ea 100644
--- a/x11-toolkits/hs-pango/distinfo
+++ b/x11-toolkits/hs-pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pango-0.12.3.tar.gz) = 5131833e1b8c311d22cfeaa8de301355142d79145084f5aab958b7c452f90308
-SIZE (cabal/pango-0.12.3.tar.gz) = 60043
+SHA256 (cabal/pango-0.12.4.tar.gz) = ac6c821544546366bb7e01de85d7c56a6b6accd1af5f78b68cd4a867579d8721
+SIZE (cabal/pango-0.12.4.tar.gz) = 60049
diff --git a/x11-toolkits/hs-pango/pkg-descr b/x11-toolkits/hs-pango/pkg-descr
index 34a67f124a5d..6f9a3d3588a5 100644
--- a/x11-toolkits/hs-pango/pkg-descr
+++ b/x11-toolkits/hs-pango/pkg-descr
@@ -3,4 +3,4 @@ high-quality rendering of Unicode text. It can be used either with Cairo to
output text in PDF, PS or other documents or with Gtk+ to display text
on-screen.
-WWW: http://projects.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index fa3c4de1b405..cc58e6677c37 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-vte
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= vte
PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 40c2cb41609b..0b798c3aac5c 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-wx
-# Date created: January 26, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wx
PORTVERSION= 0.90.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/pkg-descr b/x11-toolkits/hs-wx/pkg-descr
index 25ee84bb643f..a49e8a23ba31 100644
--- a/x11-toolkits/hs-wx/pkg-descr
+++ b/x11-toolkits/hs-wx/pkg-descr
@@ -3,4 +3,4 @@ on top of wxWidgets - a comprehensive C++ library that is portable
across all major GUI platforms; including GTK, Windows, X11, and MacOS
X. This version works with wxWidgets 2.9 only.
-WWW: http://haskell.org/haskellwiki/WxHaskell
+WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index b5141134367c..2bcd16367a97 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-wxc
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wxc
PORTVERSION= 0.90.0.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxc/pkg-descr b/x11-toolkits/hs-wxc/pkg-descr
index ea012555c3a3..38627ecd2e0e 100644
--- a/x11-toolkits/hs-wxc/pkg-descr
+++ b/x11-toolkits/hs-wxc/pkg-descr
@@ -6,4 +6,4 @@ LIBRARY LICENSE. Please see LICENSE file, but note that this is essentially
LGPL with an exception allowing binary distribution of proprietary software.
This is the same license as wxWidgets itself uses.
-WWW: http://haskell.org/haskellwiki/WxHaskell
+WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 89bd1511a87e..9d63750832e9 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: hs-wxcore
-# Date created: January 26, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wxcore
PORTVERSION= 0.90.0.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxcore/pkg-descr b/x11-toolkits/hs-wxcore/pkg-descr
index 865dd7d51f88..9666ec72f6db 100644
--- a/x11-toolkits/hs-wxcore/pkg-descr
+++ b/x11-toolkits/hs-wxcore/pkg-descr
@@ -7,4 +7,4 @@ essentially LGPL with an exception allowing binary distribution of
proprietary software. This is the same license as wxWidgets itself
uses.
-WWW: http://haskell.org/haskellwiki/WxHaskell
+WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index 5f489bed7d1f..e4d4747108ee 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-wxdirect
-# Date created: January 26, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= wxdirect
PORTVERSION= 0.90.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/pkg-descr b/x11-toolkits/hs-wxdirect/pkg-descr
index efb14c338858..5a608f1fd3cc 100644
--- a/x11-toolkits/hs-wxdirect/pkg-descr
+++ b/x11-toolkits/hs-wxdirect/pkg-descr
@@ -3,4 +3,4 @@ on top of wxWidgets, a comprehensive C++ library that is portable across
all major GUI platforms, including GTK, Windows, X11, and MacOS X. This
version works with wxWidgets 2.9 only.
-WWW: http://haskell.org/haskellwiki/WxHaskell
+WWW: http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index dd76beabee37..9e3c55efe1a8 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: xmonad-contrib
-# Date created: 2008-01-23
-# Whom: Matthieu Guegan <matt.guegan@free.fr>
-#
+# Created by: Matthieu Guegan <matt.guegan@free.fr>
# $FreeBSD$
-#
PORTNAME= xmonad-contrib
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -25,7 +21,7 @@ OPTIONS_DEFAULT= XFT
XFT_DESC= Enable Xft support for fonts
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+= --flags="use_xft"
diff --git a/x11-wm/hs-xmonad-contrib/pkg-descr b/x11-wm/hs-xmonad-contrib/pkg-descr
index 2d0eb4d7d254..d347d1994811 100644
--- a/x11-wm/hs-xmonad-contrib/pkg-descr
+++ b/x11-wm/hs-xmonad-contrib/pkg-descr
@@ -10,4 +10,4 @@ In particular:
* XMonad.Doc.Developing, introduction to xmonad internals and
writing your own extensions.
-WWW: http://xmonad.org/
+WWW: http://xmonad.org/
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 3fc0e28dc57c..4d8b2f81f01d 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: xmonad
-# Date created: 2007-10-25
-# Whom: Matthieu Guegan <matt.guegan@free.fr>
-#
+# Created by: Matthieu Guegan <matt.guegan@free.fr>
# $FreeBSD$
-#
PORTNAME= xmonad
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad/pkg-descr b/x11-wm/hs-xmonad/pkg-descr
index d57c4ea7c31a..8b12cb63b0a8 100644
--- a/x11-wm/hs-xmonad/pkg-descr
+++ b/x11-wm/hs-xmonad/pkg-descr
@@ -7,4 +7,4 @@ written by the user in config files. Layouts are applied dynamically,
and different layouts may be used on each workspace. Xinerama is fully
supported, allowing windows to be tiled on several screens.
-WWW: http://xmonad.org/
+WWW: http://xmonad.org/
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index c33663b18ef3..3623d3d824ea 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-x11-xft-ghc
-# Date created: 2008-10-21
-# Whom: Ashish Shukla <wahjava@gmail.com>
-#
# $FreeBSD$
-#
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 4543b1659853..54a2a91f2b07 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: hs-x11-ghc
-# Date created: 2007-09-03
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
+# Created by: Volker Stolz <vs@FreeBSD.org>
# $FreeBSD$
PORTNAME= X11
PORTVERSION= 1.5.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -23,7 +20,7 @@ OPTIONS_DEFAULT= XINERAMA
XINERAMA_DESC= Build with Xinerama support
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MXINERAMA}
USE_XORG+= xinerama
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index a3cb9ad3dbbf..a658438b67a2 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: xmobar
-# Date created: November 7, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= xmobar
PORTVERSION= 0.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -29,7 +26,7 @@ XFT_DESC= Use Xft to render text (UTF-8 support included)
UTF8_DESC= UTF-8 support
MPD_DESC= mpd support
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
# Disable Linux-only options
CONFIGURE_ARGS+= --flags="-with_inotify -with_iwlib"
diff --git a/x11/hs-xmobar/pkg-descr b/x11/hs-xmobar/pkg-descr
index e202314d2fc0..e6fd56693605 100644
--- a/x11/hs-xmobar/pkg-descr
+++ b/x11/hs-xmobar/pkg-descr
@@ -2,4 +2,4 @@ Xmobar is a minimalistic text based status bar. Inspired by the Ion3 status
bar, it supports similar features, like dynamic color management, output
templates, and extensibility through plugins.
-WWW: http://projects.haskell.org/xmobar/
+WWW: http://projects.haskell.org/xmobar/