aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpgj <pgj@FreeBSD.org>2013-02-06 06:26:31 +0800
committerpgj <pgj@FreeBSD.org>2013-02-06 06:26:31 +0800
commit89e80c9d9a740b177df836e3e8afcb075ac40dd1 (patch)
tree23d3f49a5183d8fbc5324dad9a1ae399f457b1d7
parent624202a6ea91dc9c37f79fc34e43f38fc32fbf13 (diff)
downloadfreebsd-ports-gnome-89e80c9d9a740b177df836e3e8afcb075ac40dd1.tar.gz
freebsd-ports-gnome-89e80c9d9a740b177df836e3e8afcb075ac40dd1.tar.zst
freebsd-ports-gnome-89e80c9d9a740b177df836e3e8afcb075ac40dd1.zip
- Fix breakage in the DYNAMIC-enabled ports triggered by the recent
devel/libffi update - Enable multithreaded build for lang/ghc (i.e. mark MAKE_JOBS_SAFE) Please note that port revision for all the Haskell ports without version changes are bumped. New ports (20): devel/hs-MonadRandom 0.1.8 devel/hs-base64-conduit 0.5.1 devel/hs-bifunctors 3.2 devel/hs-either 3.1 devel/hs-errors 1.3.1 devel/hs-generic-deriving 1.4.0 devel/hs-lens 3.8.5 devel/hs-profunctor-extras 3.3 devel/hs-profunctors 3.2 devel/hs-reflection 1.1.6 devel/hs-timezone-olson 0.1.2 devel/hs-timezone-series 0.1.2 math/hs-comonads-fd 3.0.1 math/hs-groupoids 3.0.1.1 math/hs-nats 0.1 math/hs-semigroupoid-extras 3.0.1 security/hs-cipher-rc4 0.1.2 security/hs-crypto-numbers 0.1.3 security/hs-crypto-pubkey 0.1.2 security/hs-crypto-random-api 0.2.0 Updated ports (107): archivers/hs-zip-archive 0.1.2.1 --> 0.1.3.3 archivers/hs-zlib-bindings 0.1.1.2 --> 0.1.1.3 audio/hs-libmpd 0.8.0.1 --> 0.8.0.2 benchmarks/hs-criterion 0.6.2.0 --> 0.6.2.1 converters/hs-aeson 0.6.0.2_2 --> 0.6.1.0 converters/hs-dataenc 0.14.0.4 --> 0.14.0.5 databases/hs-persistent 1.0.2.2 --> 1.1.4 databases/hs-persistent-sqlite 1.0.1 --> 1.1.2 databases/hs-persistent-template 1.0.0.2 --> 1.1.2.1 devel/hs-BNFC 2.4.2.1_1 --> 2.6.0.3 devel/hs-Boolean 0.1.1 --> 0.1.2 devel/hs-TypeCompose 0.9.7 --> 0.9.9 devel/hs-ansi-terminal 0.5.5_5 --> 0.5.5.1 devel/hs-ansi-wl-pprint 0.6.4_3 --> 0.6.6 devel/hs-basic-prelude 0.3.1.0 --> 0.3.2.0 devel/hs-checkers 0.2.9_2 --> 0.3.1 devel/hs-classy-prelude 0.4.1 --> 0.4.3 devel/hs-classy-prelude-conduit 0.4.1 --> 0.4.3 devel/hs-conduit 0.5.5 --> 0.5.6 devel/hs-configurator 0.2.0.1 --> 0.2.0.2 devel/hs-cpphs 1.15 --> 1.16 devel/hs-edit-distance 0.2.1.1 --> 0.2.1.2 devel/hs-file-embed 0.0.4.6 --> 0.0.4.7 devel/hs-filestore 0.5.0.1 --> 0.6 devel/hs-fsnotify 0.0.4 --> 0.0.6 devel/hs-ghc-paths 0.1.0.8_5 --> 0.1.0.9 devel/hs-git-annex 3.20121211 --> 3.20130124 devel/hs-hashable 1.1.2.5 --> 1.2.0.5 devel/hs-hastache 0.4.2 --> 0.5.0 devel/hs-hlint 1.8.39 --> 1.8.43 devel/hs-hoogle 4.2.14 --> 4.2.15 devel/hs-hspec 1.4.2 --> 1.4.3 devel/hs-largeword 1.0.3 --> 1.0.4 devel/hs-lifted-base 0.2 --> 0.2.0.2 devel/hs-monad-logger 0.2.3 --> 0.2.3.2 devel/hs-optparse-applicative 0.4.2 --> 0.5.2.1 devel/hs-pool-conduit 0.1.0.3 --> 0.1.1 devel/hs-project-template 0.1.0.1 --> 0.1.1 devel/hs-silently 1.2.4 --> 1.2.4.1 devel/hs-smallcheck 0.6.1_2 --> 0.6.2 devel/hs-system-fileio 0.3.10 --> 0.3.11 devel/hs-unix-compat 0.4.0.0 --> 0.4.1.0 devel/hs-unordered-containers 0.2.2.1 --> 0.2.3.0 devel/hs-vault 0.2.0.1 --> 0.2.0.4 devel/hs-void 0.5.8 --> 0.5.11 devel/hs-word8 0.0.2 --> 0.0.3 mail/hs-mime-types 0.1.0.0 --> 0.1.0.2 math/hs-categories 1.0.4 --> 1.0.5 math/hs-comonad 3.0.0.2 --> 3.0.1.1 math/hs-comonad-transformers 3.0 --> 3.0.1 math/hs-distributive 0.2.2_2 --> 0.3 math/hs-pointed 3.0.1 --> 3.0.2 math/hs-semigroupoids 3.0.0.1 --> 3.0.2 math/hs-semigroups 0.8.4.1 --> 0.9 net/hs-network-conduit 0.6.1.1 --> 0.6.2.2 net/hs-simple-sendfile 0.2.8 --> 0.2.10 print/hs-hscolour 1.20.3,1 --> 1.20.3_1,1 security/hs-certificate 1.3.3 --> 1.3.5 security/hs-cipher-aes 0.1.5 --> 0.1.7 security/hs-clientsession 0.8.0.1 --> 0.8.1 security/hs-cprng-aes 0.2.4 --> 0.3.4 security/hs-crypto-conduit 0.4.1 --> 0.4.3 security/hs-cryptocipher 0.3.6 --> 0.4.0 security/hs-cryptohash 0.7.9 --> 0.8.3 security/hs-pem 0.1.1_2 --> 0.1.2 security/hs-skein 0.1.0.10 --> 0.1.0.11 security/hs-tls 1.0.2 --> 1.1.1 security/hs-tls-extra 0.5.0 --> 0.6.1 sysutils/hs-angel 0.3.3 --> 0.3.4 textproc/hs-Diff 0.1.3_3 --> 0.2.0 textproc/hs-attoparsec 0.10.2.0_2 --> 0.10.3.0 textproc/hs-blaze-html 0.5.1.1 --> 0.5.1.3 textproc/hs-blaze-markup 0.5.1.2 --> 0.5.1.4 textproc/hs-case-insensitive 0.4.0.3 --> 0.4.0.4 textproc/hs-citeproc-hs 0.3.6 --> 0.3.7 textproc/hs-double-conversion 0.2.0.5 --> 0.2.0.6 textproc/hs-highlighting-kate 0.5.3.3 --> 0.5.3.5 textproc/hs-hs-bibutils 4.15 --> 4.16 textproc/hs-regex-pcre-builtin 0.94.4.3.8.31 --> 0.94.4.5.8.31 textproc/hs-texmath 0.6.1.1 --> 0.6.1.3 textproc/hs-yaml 0.8.1.1 --> 0.8.2 www/hs-gitit 0.10.0.2 --> 0.10.1.2 www/hs-hamlet 1.1.1.1 --> 1.1.3.1 www/hs-heist 0.8.2 --> 0.11.0 www/hs-hjsmin 0.1.3 --> 0.1.4 www/hs-http-conduit 1.8.4.3 --> 1.8.7 www/hs-http-date 0.0.3 --> 0.0.4 www/hs-http-reverse-proxy 0.1.0.6 --> 0.1.1.1 www/hs-shakespeare-js 1.1.0 --> 1.1.1 www/hs-snap 0.9.2.2 --> 0.11.0 www/hs-wai-app-static 1.3.0.4 --> 1.3.1_1 www/hs-wai-extra 1.3.0.4 --> 1.3.2 www/hs-warp 1.3.5 --> 1.3.7.1 www/hs-xss-sanitize 0.3.2_2 --> 0.3.3 www/hs-yesod 1.1.4.1 --> 1.1.7.2 www/hs-yesod-auth 1.1.2 --> 1.1.3 www/hs-yesod-core 1.1.6.1 --> 1.1.7.1 www/hs-yesod-default 1.1.2 --> 1.1.3 www/hs-yesod-form 1.2.0.1 --> 1.2.0.2 www/hs-yesod-persistent 1.1.0 --> 1.1.0.1 www/hs-yesod-platform 1.1.5 --> 1.1.7.2 www/hs-yesod-static 1.1.1.1 --> 1.1.1.2 www/hs-yesod-test 0.3.1.1 --> 0.3.3 x11-wm/hs-xmonad 0.10_4 --> 0.11 x11-wm/hs-xmonad-contrib 0.10_4 --> 0.11 x11/hs-X11 1.5.0.1_3 --> 1.6.0.2 x11/hs-xmobar 0.14_3 --> 0.16 Obtained from: FreeBSD Haskell
-rw-r--r--UPDATING18
-rw-r--r--archivers/hs-tar/Makefile1
-rw-r--r--archivers/hs-zip-archive/Makefile2
-rw-r--r--archivers/hs-zip-archive/distinfo4
-rw-r--r--archivers/hs-zlib-bindings/Makefile2
-rw-r--r--archivers/hs-zlib-bindings/distinfo4
-rw-r--r--archivers/hs-zlib-conduit/Makefile1
-rw-r--r--archivers/hs-zlib-enum/Makefile1
-rw-r--r--archivers/hs-zlib/Makefile1
-rw-r--r--audio/hs-ALUT/Makefile2
-rw-r--r--audio/hs-OpenAL/Makefile2
-rw-r--r--audio/hs-libmpd/Makefile2
-rw-r--r--audio/hs-libmpd/distinfo4
-rw-r--r--benchmarks/hs-criterion/Makefile4
-rw-r--r--benchmarks/hs-criterion/distinfo4
-rw-r--r--benchmarks/hs-criterion/pkg-descr10
-rw-r--r--converters/hs-aeson/Makefile3
-rw-r--r--converters/hs-aeson/distinfo4
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-dataenc/distinfo4
-rw-r--r--converters/hs-json/Makefile1
-rw-r--r--databases/hs-mysql/Makefile2
-rw-r--r--databases/hs-persistent-sqlite/Makefile4
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-template/Makefile4
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent/Makefile11
-rw-r--r--databases/hs-persistent/distinfo4
-rw-r--r--deskutils/checkrdf/Makefile8
-rw-r--r--devel/Makefile12
-rw-r--r--devel/hs-BNFC/Makefile7
-rw-r--r--devel/hs-BNFC/distinfo4
-rw-r--r--devel/hs-BNFC/pkg-descr11
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-ConfigFile/Makefile2
-rw-r--r--devel/hs-DeepArrow/Makefile1
-rw-r--r--devel/hs-HUnit/Makefile1
-rw-r--r--devel/hs-IORefCAS/Makefile2
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-List/Makefile1
-rw-r--r--devel/hs-MaybeT/Makefile2
-rw-r--r--devel/hs-MemoTrie/Makefile1
-rw-r--r--devel/hs-MissingH/Makefile1
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile1
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile2
-rw-r--r--devel/hs-MonadRandom/Makefile16
-rw-r--r--devel/hs-MonadRandom/distinfo2
-rw-r--r--devel/hs-MonadRandom/pkg-descr3
-rw-r--r--devel/hs-ObjectName/Makefile2
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-QuickCheck/Makefile1
-rw-r--r--devel/hs-ReadArgs/Makefile1
-rw-r--r--devel/hs-SafeSemaphore/Makefile1
-rw-r--r--devel/hs-StateVar/Makefile2
-rw-r--r--devel/hs-Stream/Makefile1
-rw-r--r--devel/hs-Tensor/Makefile2
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-TypeCompose/distinfo4
-rw-r--r--devel/hs-abstract-deque/Makefile1
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-activehs-base/Makefile1
-rw-r--r--devel/hs-alex/Makefile1
-rw-r--r--devel/hs-ansi-terminal/Makefile3
-rw-r--r--devel/hs-ansi-terminal/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile3
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo4
-rw-r--r--devel/hs-arrows/Makefile1
-rw-r--r--devel/hs-asn1-data/Makefile1
-rw-r--r--devel/hs-async/Makefile1
-rw-r--r--devel/hs-attempt/Makefile2
-rw-r--r--devel/hs-base-unicode-symbols/Makefile1
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/Makefile1
-rw-r--r--devel/hs-base64-conduit/Makefile15
-rw-r--r--devel/hs-base64-conduit/distinfo2
-rw-r--r--devel/hs-base64-conduit/pkg-descr3
-rw-r--r--devel/hs-basic-prelude/Makefile4
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile15
-rw-r--r--devel/hs-bifunctors/distinfo2
-rw-r--r--devel/hs-bifunctors/pkg-descr3
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile1
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile1
-rw-r--r--devel/hs-blaze-builder/Makefile2
-rw-r--r--devel/hs-blaze-textual/Makefile1
-rw-r--r--devel/hs-bloomfilter/Makefile2
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-bytestring-nums/Makefile1
-rw-r--r--devel/hs-c2hs/Makefile1
-rw-r--r--devel/hs-cabal-install/Makefile2
-rw-r--r--devel/hs-cereal/Makefile2
-rw-r--r--devel/hs-checkers/Makefile5
-rw-r--r--devel/hs-checkers/distinfo4
-rw-r--r--devel/hs-checkers/files/patch-checkers.cabal10
-rw-r--r--devel/hs-checkers/pkg-descr2
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile5
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo4
-rw-r--r--devel/hs-classy-prelude/Makefile4
-rw-r--r--devel/hs-classy-prelude/distinfo4
-rw-r--r--devel/hs-cmdargs/Makefile1
-rw-r--r--devel/hs-conduit/Makefile4
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-configurator/distinfo4
-rw-r--r--devel/hs-convertible/Makefile2
-rw-r--r--devel/hs-cpphs/Makefile4
-rw-r--r--devel/hs-cpphs/distinfo4
-rw-r--r--devel/hs-darcs/Makefile1
-rw-r--r--devel/hs-data-default/Makefile1
-rw-r--r--devel/hs-data-pprint/Makefile1
-rw-r--r--devel/hs-date-cache/Makefile1
-rw-r--r--devel/hs-datetime/Makefile2
-rw-r--r--devel/hs-directory-tree/Makefile1
-rw-r--r--devel/hs-dlist/Makefile2
-rw-r--r--devel/hs-drift/Makefile5
-rw-r--r--devel/hs-edit-distance/Makefile2
-rw-r--r--devel/hs-edit-distance/distinfo4
-rw-r--r--devel/hs-either/Makefile16
-rw-r--r--devel/hs-either/distinfo2
-rw-r--r--devel/hs-either/pkg-descr3
-rw-r--r--devel/hs-enumerator/Makefile2
-rw-r--r--devel/hs-errors/Makefile17
-rw-r--r--devel/hs-errors/distinfo2
-rw-r--r--devel/hs-errors/pkg-descr5
-rw-r--r--devel/hs-failure/Makefile2
-rw-r--r--devel/hs-fast-logger/Makefile1
-rw-r--r--devel/hs-fgl/Makefile2
-rw-r--r--devel/hs-file-embed/Makefile2
-rw-r--r--devel/hs-file-embed/distinfo4
-rw-r--r--devel/hs-filemanip/Makefile1
-rw-r--r--devel/hs-filestore/Makefile6
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-filestore/pkg-descr2
-rw-r--r--devel/hs-filesystem-conduit/Makefile1
-rw-r--r--devel/hs-fsnotify/Makefile2
-rw-r--r--devel/hs-fsnotify/distinfo4
-rw-r--r--devel/hs-gconf/Makefile1
-rw-r--r--devel/hs-generic-deriving/Makefile15
-rw-r--r--devel/hs-generic-deriving/distinfo2
-rw-r--r--devel/hs-generic-deriving/pkg-descr4
-rw-r--r--devel/hs-ghc-events/Makefile1
-rw-r--r--devel/hs-ghc-mtl/Makefile1
-rw-r--r--devel/hs-ghc-paths/Makefile5
-rw-r--r--devel/hs-ghc-paths/distinfo4
-rw-r--r--devel/hs-ghc-paths/pkg-descr2
-rw-r--r--devel/hs-gio/Makefile1
-rw-r--r--devel/hs-git-annex/Makefile2
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-glade/Makefile2
-rw-r--r--devel/hs-glib/Makefile1
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile1
-rw-r--r--devel/hs-haddock/Makefile1
-rw-r--r--devel/hs-happy/Makefile1
-rw-r--r--devel/hs-hashable/Makefile4
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashed-storage/Makefile1
-rw-r--r--devel/hs-hashtables/Makefile1
-rw-r--r--devel/hs-haskeline/Makefile2
-rw-r--r--devel/hs-haskell-platform/Makefile62
-rw-r--r--devel/hs-haskell-src-exts/Makefile1
-rw-r--r--devel/hs-haskell-src/Makefile2
-rw-r--r--devel/hs-hastache/Makefile4
-rw-r--r--devel/hs-hastache/distinfo4
-rw-r--r--devel/hs-hdoc/Makefile5
-rw-r--r--devel/hs-hinotify/Makefile1
-rw-r--r--devel/hs-hint/Makefile1
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile2
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile8
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hslogger/Makefile1
-rw-r--r--devel/hs-hspec-expectations/Makefile1
-rw-r--r--devel/hs-hspec/Makefile4
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-idoc/Makefile5
-rw-r--r--devel/hs-kqueue/Makefile1
-rw-r--r--devel/hs-language-c/Makefile2
-rw-r--r--devel/hs-language-javascript/Makefile1
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-largeword/distinfo4
-rw-r--r--devel/hs-largeword/pkg-descr2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lens/Makefile21
-rw-r--r--devel/hs-lens/distinfo2
-rw-r--r--devel/hs-lens/files/patch-lens.cabal12
-rw-r--r--devel/hs-lens/pkg-descr8
-rw-r--r--devel/hs-lifted-base/Makefile2
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-logict/Makefile1
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-monad-control/Makefile1
-rw-r--r--devel/hs-monad-logger/Makefile4
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par/Makefile2
-rw-r--r--devel/hs-mtl/Makefile1
-rw-r--r--devel/hs-mueval/Makefile2
-rw-r--r--devel/hs-murmur-hash/Makefile1
-rw-r--r--devel/hs-optparse-applicative/Makefile2
-rw-r--r--devel/hs-optparse-applicative/distinfo4
-rw-r--r--devel/hs-parallel/Makefile1
-rw-r--r--devel/hs-pcre-light/Makefile2
-rw-r--r--devel/hs-pool-conduit/Makefile2
-rw-r--r--devel/hs-pool-conduit/distinfo4
-rw-r--r--devel/hs-primitive/Makefile1
-rw-r--r--devel/hs-profunctor-extras/Makefile16
-rw-r--r--devel/hs-profunctor-extras/distinfo2
-rw-r--r--devel/hs-profunctor-extras/pkg-descr5
-rw-r--r--devel/hs-profunctors/Makefile15
-rw-r--r--devel/hs-profunctors/distinfo2
-rw-r--r--devel/hs-profunctors/pkg-descr3
-rw-r--r--devel/hs-project-template/Makefile8
-rw-r--r--devel/hs-project-template/distinfo4
-rw-r--r--devel/hs-random/Makefile2
-rw-r--r--devel/hs-ranges/Makefile2
-rw-r--r--devel/hs-reactive/Makefile2
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-reflection/Makefile15
-rw-r--r--devel/hs-reflection/distinfo2
-rw-r--r--devel/hs-reflection/pkg-descr5
-rw-r--r--devel/hs-resource-pool/Makefile1
-rw-r--r--devel/hs-resourcet/Makefile1
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-setenv/Makefile1
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile2
-rw-r--r--devel/hs-silently/distinfo4
-rw-r--r--devel/hs-simple-reflect/Makefile1
-rw-r--r--devel/hs-smallcheck/Makefile3
-rw-r--r--devel/hs-smallcheck/distinfo4
-rw-r--r--devel/hs-split/Makefile1
-rw-r--r--devel/hs-stm/Makefile1
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile1
-rw-r--r--devel/hs-syb/Makefile1
-rw-r--r--devel/hs-system-fileio/Makefile2
-rw-r--r--devel/hs-system-fileio/distinfo4
-rw-r--r--devel/hs-system-filepath/Makefile1
-rw-r--r--devel/hs-tagged/Makefile1
-rw-r--r--devel/hs-temporary/Makefile1
-rw-r--r--devel/hs-terminfo/Makefile1
-rw-r--r--devel/hs-test-framework-hunit/Makefile1
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile1
-rw-r--r--devel/hs-test-framework/Makefile1
-rw-r--r--devel/hs-testpack/Makefile2
-rw-r--r--devel/hs-text/Makefile1
-rw-r--r--devel/hs-threads/Makefile1
-rw-r--r--devel/hs-threadscope/Makefile1
-rw-r--r--devel/hs-time-compat/Makefile1
-rw-r--r--devel/hs-timezone-olson/Makefile17
-rw-r--r--devel/hs-timezone-olson/distinfo2
-rw-r--r--devel/hs-timezone-olson/pkg-descr4
-rw-r--r--devel/hs-timezone-series/Makefile15
-rw-r--r--devel/hs-timezone-series/distinfo2
-rw-r--r--devel/hs-timezone-series/pkg-descr5
-rw-r--r--devel/hs-transformers-base/Makefile2
-rw-r--r--devel/hs-transformers/Makefile2
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile1
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-compat/distinfo4
-rw-r--r--devel/hs-unix-time/Makefile1
-rw-r--r--devel/hs-unordered-containers/Makefile2
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile1
-rw-r--r--devel/hs-uuagc/Makefile1
-rw-r--r--devel/hs-uulib/Makefile2
-rw-r--r--devel/hs-vault/Makefile4
-rw-r--r--devel/hs-vault/distinfo4
-rw-r--r--devel/hs-vector-algorithms/Makefile1
-rw-r--r--devel/hs-vector/Makefile1
-rw-r--r--devel/hs-void/Makefile4
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-word8/Makefile2
-rw-r--r--devel/hs-word8/distinfo4
-rw-r--r--ftp/hs-curl/Makefile1
-rw-r--r--graphics/hs-HGL/Makefile2
-rw-r--r--graphics/hs-cairo/Makefile1
-rw-r--r--graphics/hs-dia-base/Makefile1
-rw-r--r--graphics/hs-dia-functions/Makefile1
-rw-r--r--graphics/hs-soegtk/Makefile2
-rw-r--r--graphics/hs-svgcairo/Makefile2
-rw-r--r--lang/ghc/Makefile14
-rw-r--r--lang/ghc/bsd.cabal.mk4
-rw-r--r--lang/ghc/bsd.hackage.mk20
-rw-r--r--lang/ghc/files/patch-aclocal.m447
-rw-r--r--lang/ghc/files/patch-configure103
-rw-r--r--lang/ghc/files/patch-configure.ac70
-rw-r--r--lang/ghc/files/patch-ghc.mk32
-rw-r--r--lang/ghc/files/patch-mk-config.mk.in15
-rw-r--r--lang/ghc/files/patch-rts-ghc.mk104
-rw-r--r--lang/ghc/files/patch-rts_package.conf.in29
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-epic/Makefile2
-rw-r--r--lang/hs-unlambda/Makefile1
-rw-r--r--lang/whitespace/Makefile13
-rw-r--r--mail/hs-email-validate/Makefile1
-rw-r--r--mail/hs-mime-mail/Makefile1
-rw-r--r--mail/hs-mime-types/Makefile2
-rw-r--r--mail/hs-mime-types/distinfo4
-rw-r--r--mail/hs-mime/Makefile1
-rw-r--r--math/Makefile4
-rw-r--r--math/hs-Agda-executable/Makefile2
-rw-r--r--math/hs-Agda/Makefile4
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs11
-rw-r--r--math/hs-NumInstances/Makefile2
-rw-r--r--math/hs-categories/Makefile2
-rw-r--r--math/hs-categories/distinfo4
-rw-r--r--math/hs-comonad-transformers/Makefile2
-rw-r--r--math/hs-comonad-transformers/distinfo4
-rw-r--r--math/hs-comonad/Makefile2
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-comonads-fd/Makefile16
-rw-r--r--math/hs-comonads-fd/distinfo2
-rw-r--r--math/hs-comonads-fd/pkg-descr3
-rw-r--r--math/hs-contravariant/Makefile2
-rw-r--r--math/hs-data-lens-template/Makefile1
-rw-r--r--math/hs-data-lens/Makefile1
-rw-r--r--math/hs-distributive/Makefile5
-rw-r--r--math/hs-distributive/distinfo4
-rw-r--r--math/hs-distributive/files/patch-distributive.cabal12
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-groupoids/Makefile15
-rw-r--r--math/hs-groupoids/distinfo2
-rw-r--r--math/hs-groupoids/pkg-descr3
-rw-r--r--math/hs-ieee754/Makefile2
-rw-r--r--math/hs-math-functions/Makefile1
-rw-r--r--math/hs-mwc-random/Makefile1
-rw-r--r--math/hs-nats/Makefile13
-rw-r--r--math/hs-nats/distinfo2
-rw-r--r--math/hs-nats/pkg-descr3
-rw-r--r--math/hs-pointed/Makefile4
-rw-r--r--math/hs-pointed/distinfo4
-rw-r--r--math/hs-probability/Makefile2
-rw-r--r--math/hs-semigroupoid-extras/Makefile15
-rw-r--r--math/hs-semigroupoid-extras/distinfo2
-rw-r--r--math/hs-semigroupoid-extras/pkg-descr3
-rw-r--r--math/hs-semigroupoids/Makefile2
-rw-r--r--math/hs-semigroupoids/distinfo4
-rw-r--r--math/hs-semigroups/Makefile4
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-statistics/Makefile1
-rw-r--r--math/hs-vector-space/Makefile1
-rw-r--r--multimedia/hs-gstreamer/Makefile1
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-network-conduit/Makefile2
-rw-r--r--net/hs-network-conduit/distinfo4
-rw-r--r--net/hs-network-info/Makefile1
-rw-r--r--net/hs-network-multicast/Makefile1
-rw-r--r--net/hs-network/Makefile1
-rw-r--r--net/hs-pcap/Makefile1
-rw-r--r--net/hs-sendfile/Makefile1
-rw-r--r--net/hs-simple-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/distinfo4
-rw-r--r--net/hs-socks/Makefile1
-rw-r--r--ports-mgmt/hs-porte/Makefile2
-rw-r--r--print/hs-hscolour/Makefile1
-rw-r--r--science/hs-bio/Makefile2
-rw-r--r--security/Makefile4
-rw-r--r--security/hs-Crypto/Makefile1
-rw-r--r--security/hs-HsOpenSSL/Makefile1
-rw-r--r--security/hs-RSA/Makefile1
-rw-r--r--security/hs-SHA/Makefile1
-rw-r--r--security/hs-certificate/Makefile2
-rw-r--r--security/hs-certificate/distinfo4
-rw-r--r--security/hs-cipher-aes/Makefile2
-rw-r--r--security/hs-cipher-aes/distinfo4
-rw-r--r--security/hs-cipher-rc4/Makefile15
-rw-r--r--security/hs-cipher-rc4/distinfo2
-rw-r--r--security/hs-cipher-rc4/pkg-descr3
-rw-r--r--security/hs-clientsession/Makefile8
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-cprng-aes/Makefile5
-rw-r--r--security/hs-cprng-aes/distinfo4
-rw-r--r--security/hs-crypto-api/Makefile2
-rw-r--r--security/hs-crypto-conduit/Makefile2
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-numbers/Makefile17
-rw-r--r--security/hs-crypto-numbers/distinfo2
-rw-r--r--security/hs-crypto-numbers/pkg-descr3
-rw-r--r--security/hs-crypto-pubkey-types/Makefile1
-rw-r--r--security/hs-crypto-pubkey/Makefile18
-rw-r--r--security/hs-crypto-pubkey/distinfo2
-rw-r--r--security/hs-crypto-pubkey/pkg-descr5
-rw-r--r--security/hs-crypto-random-api/Makefile17
-rw-r--r--security/hs-crypto-random-api/distinfo2
-rw-r--r--security/hs-crypto-random-api/pkg-descr3
-rw-r--r--security/hs-cryptocipher/Makefile6
-rw-r--r--security/hs-cryptocipher/distinfo4
-rw-r--r--security/hs-cryptohash/Makefile4
-rw-r--r--security/hs-cryptohash/distinfo4
-rw-r--r--security/hs-digest/Makefile1
-rw-r--r--security/hs-entropy/Makefile2
-rw-r--r--security/hs-monadcryptorandom/Makefile1
-rw-r--r--security/hs-pem/Makefile3
-rw-r--r--security/hs-pem/distinfo4
-rw-r--r--security/hs-pureMD5/Makefile1
-rw-r--r--security/hs-pwstore-fast/Makefile1
-rw-r--r--security/hs-skein/Makefile2
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-tls-extra/Makefile8
-rw-r--r--security/hs-tls-extra/distinfo4
-rw-r--r--security/hs-tls-extra/pkg-descr2
-rw-r--r--security/hs-tls/Makefile6
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--sysutils/hs-angel/Makefile2
-rw-r--r--sysutils/hs-angel/distinfo4
-rw-r--r--sysutils/hs-cpu/Makefile2
-rw-r--r--textproc/hs-Diff/Makefile3
-rw-r--r--textproc/hs-Diff/distinfo4
-rw-r--r--textproc/hs-HStringTemplate/Makefile1
-rw-r--r--textproc/hs-HaXml/Makefile2
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile1
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile1
-rw-r--r--textproc/hs-attoparsec/Makefile3
-rw-r--r--textproc/hs-attoparsec/distinfo4
-rw-r--r--textproc/hs-attoparsec/pkg-descr5
-rw-r--r--textproc/hs-blaze-html/Makefile2
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile4
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile3
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/Makefile2
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile4
-rw-r--r--textproc/hs-double-conversion/distinfo4
-rw-r--r--textproc/hs-feed/Makefile2
-rw-r--r--textproc/hs-hexpat/Makefile1
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile4
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-html-conduit/Makefile1
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-unicode/Makefile2
-rw-r--r--textproc/hs-hxt/Makefile1
-rw-r--r--textproc/hs-lhs2tex/Makefile1
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-types/Makefile2
-rw-r--r--textproc/hs-pandoc/Makefile1
-rw-r--r--textproc/hs-parsec/Makefile1
-rw-r--r--textproc/hs-polyparse/Makefile2
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo4
-rw-r--r--textproc/hs-regex-posix/Makefile1
-rw-r--r--textproc/hs-stringsearch/Makefile1
-rw-r--r--textproc/hs-tagsoup/Makefile1
-rw-r--r--textproc/hs-tagstream-conduit/Makefile1
-rw-r--r--textproc/hs-texmath/Makefile2
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-xhtml/Makefile2
-rw-r--r--textproc/hs-xml-conduit/Makefile1
-rw-r--r--textproc/hs-xml-types/Makefile1
-rw-r--r--textproc/hs-xml/Makefile2
-rw-r--r--textproc/hs-xmlhtml/Makefile1
-rw-r--r--textproc/hs-yaml/Makefile4
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--www/hs-HTTP/Makefile1
-rw-r--r--www/hs-activehs/Makefile1
-rw-r--r--www/hs-authenticate/Makefile1
-rw-r--r--www/hs-cgi/Makefile2
-rw-r--r--www/hs-cookie/Makefile1
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-gitit/Makefile6
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-gitit/files/patch-gitit.cabal11
-rw-r--r--www/hs-hS3/Makefile2
-rw-r--r--www/hs-hamlet/Makefile2
-rw-r--r--www/hs-hamlet/distinfo4
-rw-r--r--www/hs-happstack-server/Makefile1
-rw-r--r--www/hs-happstack/Makefile1
-rw-r--r--www/hs-heist/Makefile9
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-heist/pkg-descr14
-rw-r--r--www/hs-hjsmin/Makefile2
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-http-conduit/Makefile15
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-date/Makefile2
-rw-r--r--www/hs-http-date/distinfo4
-rw-r--r--www/hs-http-reverse-proxy/Makefile10
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-server/Makefile1
-rw-r--r--www/hs-http-types/Makefile1
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-path-pieces/Makefile1
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-scgi/Makefile2
-rw-r--r--www/hs-shakespeare-css/Makefile1
-rw-r--r--www/hs-shakespeare-i18n/Makefile2
-rw-r--r--www/hs-shakespeare-js/Makefile2
-rw-r--r--www/hs-shakespeare-js/distinfo4
-rw-r--r--www/hs-shakespeare-text/Makefile1
-rw-r--r--www/hs-shakespeare/Makefile1
-rw-r--r--www/hs-snap-core/Makefile1
-rw-r--r--www/hs-snap-server/Makefile1
-rw-r--r--www/hs-snap/Makefile13
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-wai-app-static/Makefile3
-rw-r--r--www/hs-wai-app-static/distinfo4
-rw-r--r--www/hs-wai-extra/Makefile2
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-logger/Makefile1
-rw-r--r--www/hs-wai-test/Makefile1
-rw-r--r--www/hs-wai/Makefile1
-rw-r--r--www/hs-warp/Makefile2
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-webkit/Makefile2
-rw-r--r--www/hs-xss-sanitize/Makefile3
-rw-r--r--www/hs-xss-sanitize/distinfo4
-rw-r--r--www/hs-yesod-auth/Makefile2
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-core/Makefile4
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-default/Makefile2
-rw-r--r--www/hs-yesod-default/distinfo4
-rw-r--r--www/hs-yesod-form/Makefile4
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-json/Makefile1
-rw-r--r--www/hs-yesod-persistent/Makefile2
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile248
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-routes/Makefile1
-rw-r--r--www/hs-yesod-static/Makefile2
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-test/Makefile13
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod/Makefile10
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--x11-toolkits/hs-GLUT/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile2
-rw-r--r--x11-toolkits/hs-gtk/Makefile1
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile1
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/hs-pango/Makefile1
-rw-r--r--x11-toolkits/hs-vte/Makefile2
-rw-r--r--x11-toolkits/hs-wx/Makefile2
-rw-r--r--x11-toolkits/hs-wxc/Makefile2
-rw-r--r--x11-toolkits/hs-wxcore/Makefile2
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile2
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile11
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo4
-rw-r--r--x11-wm/hs-xmonad/Makefile7
-rw-r--r--x11-wm/hs-xmonad/distinfo4
-rw-r--r--x11-wm/hs-xmonad/pkg-descr15
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile21
-rw-r--r--x11/hs-X11/distinfo4
-rw-r--r--x11/hs-X11/pkg-descr8
-rw-r--r--x11/hs-xmobar/Makefile40
-rw-r--r--x11/hs-xmobar/distinfo4
-rw-r--r--x11/hs-xmobar/pkg-descr6
573 files changed, 1767 insertions, 897 deletions
diff --git a/UPDATING b/UPDATING
index b4c98bfda3b2..02e6d4a16908 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,24 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20130205:
+ AFFECTS: users of lang/ghc and */hs-*
+ AUTHOR: haskell@FreeBSD.org
+
+ Note that the recent devel/libffi update caused some breakage in the Haskell
+ ports with the DYNAMIC option enabled. The problem has been identified and
+ fixed since then. All Haskell ports have been updated to their latest stable
+ versions or bumped as DYNAMIC is enabled by default.
+
+ Hence it is recommended to rebuild or reinstall all ports depending on GHC
+ by one of the following commands:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+ or
+ # pkg install -fR lang/ghc
+
+20130205:
AFFECTS: users of editors/libreoffice
AUTHOR: bapt@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index f3964f4174b4..ba044bfe4ae6 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tar
PORTVERSION= 0.4.0.1
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index bb3baf184d29..c26b4ad34786 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.1.2.1
+PORTVERSION= 0.1.3.3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index ce7ba3f13671..1f696c76411e 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.2.1.tar.gz) = f0ce17e41b28889543a1dd4dda1546b3cdd53a616101f3efb2846c37f39217b0
-SIZE (cabal/zip-archive-0.1.2.1.tar.gz) = 11123
+SHA256 (cabal/zip-archive-0.1.3.3.tar.gz) = 914bfcee21b9f1f5773525a9cb4b119b5b316fe42ef41e362e636b6ab4d1f77f
+SIZE (cabal/zip-archive-0.1.3.3.tar.gz) = 11214
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 8343242aa4ea..efed82964170 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zlib-bindings
-PORTVERSION= 0.1.1.2
+PORTVERSION= 0.1.1.3
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-bindings/distinfo b/archivers/hs-zlib-bindings/distinfo
index 5f411010cf39..3e6da251f265 100644
--- a/archivers/hs-zlib-bindings/distinfo
+++ b/archivers/hs-zlib-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-bindings-0.1.1.2.tar.gz) = 9686b6cce62f4b874e3c453b6a17f32ee751f69f26e7e1fcdaa96095d908875c
-SIZE (cabal/zlib-bindings-0.1.1.2.tar.gz) = 55496
+SHA256 (cabal/zlib-bindings-0.1.1.3.tar.gz) = d96193eaa6ca5bb1f92bbc05f3153e37ee47935dc7f29aea54572dc8ce5650a2
+SIZE (cabal/zlib-bindings-0.1.1.3.tar.gz) = 55555
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
index 2f59960ea457..420f079db03a 100644
--- a/archivers/hs-zlib-conduit/Makefile
+++ b/archivers/hs-zlib-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zlib-conduit
PORTVERSION= 0.5.0.3
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 92d4493c6e3e..686be54cb805 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index edbc063dad4e..963748d3fd22 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= zlib
PORTVERSION= 0.5.4.0
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 792f3c3cf931..7ca7d49c1396 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ALUT
PORTVERSION= 2.2.0.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index e07e61117941..b3a94039ba5a 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenAL
PORTVERSION= 1.4.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index 0acf0cfd2d72..5807cbde9ccf 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.8.0.1
+PORTVERSION= 0.8.0.2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 06b256727ab5..506e1964c630 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/libmpd-0.8.0.1.tar.gz) = b5e31ad6a2c2384eee6d4d8c89246bf46eea0965c1e1974e5a9a526e1b60429a
-SIZE (cabal/libmpd-0.8.0.1.tar.gz) = 31861
+SHA256 (cabal/libmpd-0.8.0.2.tar.gz) = 5201623568eea7fb13ddfdad1ea6bf7657da9a01e9ac061614fc2a4dcb5a14de
+SIZE (cabal/libmpd-0.8.0.2.tar.gz) = 40189
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 6d9490471b99..4b11f60adb57 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 0.6.2.0
+PORTVERSION= 0.6.2.1
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ 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 \
+USE_CABAL= aeson>=0.3.2.12 hastache>=0.5.0 mtl>=2 mwc-random>=0.8.0.3 \
parsec>=3.1.0 statistics>=0.10.0.0 transformers \
vector>=0.7.1 vector-algorithms>=0.4
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index 756576caf06a..f572fe79d599 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/criterion-0.6.2.0.tar.gz) = bd36ce9b3ff24ff3fe428645a54b1166b928925d48cf63b5c0d11a011606a9f5
-SIZE (cabal/criterion-0.6.2.0.tar.gz) = 153076
+SHA256 (cabal/criterion-0.6.2.1.tar.gz) = e59732cd1401b0201c032adc9a67c96ae8556baa7f8e91059c006b8c83d1eb21
+SIZE (cabal/criterion-0.6.2.1.tar.gz) = 153292
diff --git a/benchmarks/hs-criterion/pkg-descr b/benchmarks/hs-criterion/pkg-descr
index a331977172f8..f4331227d96d 100644
--- a/benchmarks/hs-criterion/pkg-descr
+++ b/benchmarks/hs-criterion/pkg-descr
@@ -1,6 +1,6 @@
-This Haskell library provides a powerful but simple way to measure the
-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.
+This library provides a powerful but simple way to measure sofware
+performance. 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: https://github.com/bos/criterion
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index ae3cd6f93e3e..677238da471c 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 0.6.0.2
-PORTREVISION= 2
+PORTVERSION= 0.6.1.0
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index 34e2891be5bc..7152a620d765 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/aeson-0.6.0.2.tar.gz) = a1f82e515b1eca410f7610161c2d65ce02deda229de09973314fc43fee957e13
-SIZE (cabal/aeson-0.6.0.2.tar.gz) = 98688
+SHA256 (cabal/aeson-0.6.1.0.tar.gz) = 7d4de8aee47d3ed7f5171c619a83a18f741dfb4a59808e9e0eb3beba3ce3129a
+SIZE (cabal/aeson-0.6.1.0.tar.gz) = 101599
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 05feac919193..a14d624b3be8 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dataenc
-PORTVERSION= 0.14.0.4
+PORTVERSION= 0.14.0.5
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/distinfo b/converters/hs-dataenc/distinfo
index 6dc1955ccbb1..f624f521df84 100644
--- a/converters/hs-dataenc/distinfo
+++ b/converters/hs-dataenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dataenc-0.14.0.4.tar.gz) = 7c9540d746b578ff3d3eb2fce896c00d697044ba25cfe9ffcaa092ef2d48d676
-SIZE (cabal/dataenc-0.14.0.4.tar.gz) = 12911
+SHA256 (cabal/dataenc-0.14.0.5.tar.gz) = 1cb1aeb20b641149a1be9a8c18fa020dbf73441c89e78135ea272baf1696ea8d
+SIZE (cabal/dataenc-0.14.0.5.tar.gz) = 12902
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index b09becccdcb2..5d697d2ba180 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,6 +3,7 @@
PORTNAME= json
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index 0576c0613715..fb4f3370911a 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mysql
PORTVERSION= 0.1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index b4e84385a2e4..13c35c162160 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
-USE_CABAL= aeson>=0.5 conduit>=0.5 monad-control>=0.2 persistent>=1.0 \
+USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 persistent>=1.1.2 \
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 356b8fc53034..2c9442fea2ce 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-1.0.1.tar.gz) = f52c2117e0f55576c6840e707ae5cd42574827fbc3d7ec001e3e9ee1ebee7ee3
-SIZE (cabal/persistent-sqlite-1.0.1.tar.gz) = 1285112
+SHA256 (cabal/persistent-sqlite-1.1.2.tar.gz) = e30604324b39bd0e34f3591c7fbe4a693e148569d657d1880e47cba3ce14655d
+SIZE (cabal/persistent-sqlite-1.1.2.tar.gz) = 1285013
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index dcafa19268e8..7fe7455c4ea4 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 1.0.0.2
+PORTVERSION= 1.1.2.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson monad-control>=0.2 persistent>=1.0 text>=0.5 \
+USE_CABAL= aeson monad-control>=0.2 persistent>=1.1.2 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 5e580612997b..7717033fb89d 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-1.0.0.2.tar.gz) = e8c7c47482daccd38c93be37818b629ff03f90e56299f284ba15e19edd0b6d6a
-SIZE (cabal/persistent-template-1.0.0.2.tar.gz) = 10208
+SHA256 (cabal/persistent-template-1.1.2.1.tar.gz) = dab4a604af8073f2f0341652c353ee33018c1788bb470e93e4beb34310ce580b
+SIZE (cabal/persistent-template-1.1.2.1.tar.gz) = 10770
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index e8f39f774b8b..6335d393e525 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 1.0.2.2
+PORTVERSION= 1.1.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +10,11 @@ COMMENT= Type-safe, multi-backend data serialization
LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
- blaze-markup>=0.5.1 conduit>=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
+ blaze-markup>=0.5.1 conduit>=0.5.5 lifted-base>=0.1 \
+ monad-control>=0.3 monad-logger>=0.2.3 path-pieces>=0.1 \
+ pool-conduit>=0.1.1 resourcet>=0.4 silently 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 701618fa77fb..9abf5bd79de6 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-1.0.2.2.tar.gz) = d6a05aefa9ae1a3903009dd9ec89f8b249c7a4a2f7aa914ad7013000b64c5a69
-SIZE (cabal/persistent-1.0.2.2.tar.gz) = 29083
+SHA256 (cabal/persistent-1.1.4.tar.gz) = f2e55ab379452fb195bd15f12ab8cfd9de791818c7fd040bdebd5074bd873dbb
+SIZE (cabal/persistent-1.1.4.tar.gz) = 30980
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index ad773d91183c..ab4bbb7d15e7 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: checkrdf
-# Date created: 17 december 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
+# Created by: Oliver Braun <obraun@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= checkrdf
PORTVERSION= 39.4444
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils
MASTER_SITES= SF
diff --git a/devel/Makefile b/devel/Makefile
index d9694057ea4f..54b786328708 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -649,6 +649,7 @@
SUBDIR += hs-MissingH
SUBDIR += hs-MonadCatchIO-mtl
SUBDIR += hs-MonadCatchIO-transformers
+ SUBDIR += hs-MonadRandom
SUBDIR += hs-ObjectName
SUBDIR += hs-PSQueue
SUBDIR += hs-QuickCheck
@@ -671,7 +672,9 @@
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
+ SUBDIR += hs-base64-conduit
SUBDIR += hs-basic-prelude
+ SUBDIR += hs-bifunctors
SUBDIR += hs-bits-atomic
SUBDIR += hs-blaze-builder
SUBDIR += hs-blaze-builder-conduit
@@ -701,7 +704,9 @@
SUBDIR += hs-dlist
SUBDIR += hs-drift
SUBDIR += hs-edit-distance
+ SUBDIR += hs-either
SUBDIR += hs-enumerator
+ SUBDIR += hs-errors
SUBDIR += hs-failure
SUBDIR += hs-fast-logger
SUBDIR += hs-fgl
@@ -710,6 +715,7 @@
SUBDIR += hs-filestore
SUBDIR += hs-filesystem-conduit
SUBDIR += hs-fsnotify
+ SUBDIR += hs-generic-deriving
SUBDIR += hs-gconf
SUBDIR += hs-ghc-events
SUBDIR += hs-ghc-mtl
@@ -745,6 +751,7 @@
SUBDIR += hs-language-javascript
SUBDIR += hs-largeword
SUBDIR += hs-lazysmallcheck
+ SUBDIR += hs-lens
SUBDIR += hs-lifted-base
SUBDIR += hs-logict
SUBDIR += hs-mmap
@@ -760,11 +767,14 @@
SUBDIR += hs-pcre-light
SUBDIR += hs-pool-conduit
SUBDIR += hs-primitive
+ SUBDIR += hs-profunctor-extras
+ SUBDIR += hs-profunctors
SUBDIR += hs-project-template
SUBDIR += hs-random
SUBDIR += hs-ranges
SUBDIR += hs-reactive
SUBDIR += hs-readline
+ SUBDIR += hs-reflection
SUBDIR += hs-resource-pool
SUBDIR += hs-resourcet
SUBDIR += hs-safe
@@ -792,6 +802,8 @@
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
+ SUBDIR += hs-timezone-olson
+ SUBDIR += hs-timezone-series
SUBDIR += hs-transformers
SUBDIR += hs-transformers-base
SUBDIR += hs-unamb
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index c4551fd1bbb4..2703847e0699 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,19 +2,16 @@
# $FreeBSD$
PORTNAME= BNFC
-PORTVERSION= 2.4.2.1
-PORTREVISION= 1
+PORTVERSION= 2.6.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Labelled BNF converter
+COMMENT= Compiler front-end generator
LICENSE= GPLv2
-FILE_LICENSE= COPYING
USE_CABAL= mtl
-STANDALONE= yes
EXECUTABLE= bnfc
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index a29b0e0fafdb..e9bab0aa2650 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/BNFC-2.4.2.1.tar.gz) = 24d0964a28c475a722fab4f332407f33c652e11233fe76287e62f6896b62d128
-SIZE (cabal/BNFC-2.4.2.1.tar.gz) = 3546017
+SHA256 (cabal/BNFC-2.6.0.3.tar.gz) = 583aeac56d9444ba191501936c290136ba37b95dbee7d5a965d1ee4935cf6844
+SIZE (cabal/BNFC-2.6.0.3.tar.gz) = 202928
diff --git a/devel/hs-BNFC/pkg-descr b/devel/hs-BNFC/pkg-descr
index 32f16a632efb..52774eaa606d 100644
--- a/devel/hs-BNFC/pkg-descr
+++ b/devel/hs-BNFC/pkg-descr
@@ -1,6 +1,11 @@
The BNF Converter is a compiler construction tool generating a compiler
-front-end from a Labeled BNF grammar. It was originally written to generate
+front-end from a Labelled 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.
+Java, C++, and C. Given a Labelled BNF grammar the tool produces: an
+abstract syntax as a Haskell/C++/C module or Java directory, a case skeleton
+for the abstract syntax in the same language, an Alex, JLex, or Flex lexer
+generator file, a Happy, CUP, or Bison parser generator file, a pretty-printer
+as a Haskell/Java/C++/C module, a Latex file containing a readable
+specification of the language.
-WWW: http://www.cse.chalmers.se/research/group/Language-technology/BNFC/
+WWW: http://bnfc.digitalgrammars.com/
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 4ed17c400e0c..5d6ecc835998 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index a46f5aeb5d9d..e29472ca699d 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.1.1.tar.gz) = db2370df3810e62e7604666da9e44a25a690d9c9770b34f63be6bf4e7539a0c5
-SIZE (cabal/Boolean-0.1.1.tar.gz) = 4237
+SHA256 (cabal/Boolean-0.1.2.tar.gz) = a6d7d80e9962dbe1767e95cbe057db3723850cceabbd84f1a914a2e47e7ab01e
+SIZE (cabal/Boolean-0.1.2.tar.gz) = 4349
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index bc2ddf88ad61..8f2c6f51b06b 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile
index 8440fe507d51..7d0d3f5601ba 100644
--- a/devel/hs-DeepArrow/Makefile
+++ b/devel/hs-DeepArrow/Makefile
@@ -3,6 +3,7 @@
PORTNAME= DeepArrow
PORTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 944dbcd21587..241ae656daeb 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= HUnit
PORTVERSION= 1.2.5.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-IORefCAS/Makefile
index 579971345e5d..0a6736da442b 100644
--- a/devel/hs-IORefCAS/Makefile
+++ b/devel/hs-IORefCAS/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IORefCAS
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 6086282a60e2..cad10dad5a84 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index b350e29fb6e5..937d555d2968 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -2,6 +2,7 @@
PORTNAME= List
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile
index fddef62f67bc..f22b5ea2006a 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-MaybeT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MaybeT
PORTVERSION= 0.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 06f8643b9a82..f8bb7bcbef60 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MemoTrie
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 8702948cac4f..538dc0af07c2 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MissingH
PORTVERSION= 1.2.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index b95d72be6ba9..5224c39baee5 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MonadCatchIO-mtl
PORTVERSION= 0.3.0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index 6fb1fcc51e02..374a567ec1fa 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MonadCatchIO-transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
new file mode 100644
index 000000000000..c86747e70402
--- /dev/null
+++ b/devel/hs-MonadRandom/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= MonadRandom
+PORTVERSION= 0.1.8
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Random-number generation monad
+
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= mtl random
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
new file mode 100644
index 000000000000..7fe689ad0f18
--- /dev/null
+++ b/devel/hs-MonadRandom/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/MonadRandom-0.1.8.tar.gz) = 35baeda6b072bdab64dd2d0e013940b5f326be42d928838151ff19b43d3e36fe
+SIZE (cabal/MonadRandom-0.1.8.tar.gz) = 3838
diff --git a/devel/hs-MonadRandom/pkg-descr b/devel/hs-MonadRandom/pkg-descr
new file mode 100644
index 000000000000..fa24cdf976a4
--- /dev/null
+++ b/devel/hs-MonadRandom/pkg-descr
@@ -0,0 +1,3 @@
+Support for computations which consume random values.
+
+WWW: http://hackage.haskell.org/package/MonadRandom
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 3614bfddb0b2..cf1e5af45a47 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index 9d16db03258a..e514b57beae8 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 201e94369c4f..7f8d1080203a 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -3,6 +3,7 @@
PORTNAME= QuickCheck
PORTVERSION= 2.5.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 9582f3d33f5a..ae042d905044 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ReadArgs
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index eeb85faca1c5..4c7f04bdb99a 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,6 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 8ece2c0eba28..ad745a1b55ce 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= StateVar
PORTVERSION= 1.0.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index a22358ca48c2..54f5e965dbb4 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index 4a855d29e789..db21c33be7ed 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Tensor
PORTVERSION= 1.0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index dcb2cfc76fc6..bf56bc3771cf 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= TypeCompose
-PORTVERSION= 0.9.7
+PORTVERSION= 0.9.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index b80eafdf1aa2..db0fce9ff4e1 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/TypeCompose-0.9.7.tar.gz) = 442692548862da0036cd03987d38404c4486773e1ae2e62bd99397542c1b7cd7
-SIZE (cabal/TypeCompose-0.9.7.tar.gz) = 17688
+SHA256 (cabal/TypeCompose-0.9.9.tar.gz) = 8fe39768f879a80399fdad89f166bd0ce7a239241558d85c606cd2a77cc80945
+SIZE (cabal/TypeCompose-0.9.9.tar.gz) = 17834
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 851a0569edb6..5ef5e1e53ef5 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,6 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.1.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index 8ea194073364..f3c4979b2d99 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index b533a8300fc5..bc53b5eb445a 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,6 +2,7 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 1bd775a1e81c..5c7de0e8d227 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alex
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 13b6c91c467b..820cdbee6a4f 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.5.5
-PORTREVISION= 5
+PORTVERSION= 0.5.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 184b3323ce48..6d8594d61eb0 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-terminal-0.5.5.tar.gz) = 489565cf36471bdbf38b1b76fc09bce6c311b472d54f09c66546c7592fb52427
-SIZE (cabal/ansi-terminal-0.5.5.tar.gz) = 13136
+SHA256 (cabal/ansi-terminal-0.5.5.1.tar.gz) = 8c0247c0e5dc2089a72575dd5074583a3075adf7a4d87b349f5aef96c8c5d390
+SIZE (cabal/ansi-terminal-0.5.5.1.tar.gz) = 13132
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index cce7f6017e69..ad1ed48b0b2e 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.4
-PORTREVISION= 3
+PORTVERSION= 0.6.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index e1c2419ca502..acfe75fa94cb 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-wl-pprint-0.6.4.tar.gz) = 608ea9c866198c7214b0493e74a4cae227e72da426d0c254c226cec2eafc307f
-SIZE (cabal/ansi-wl-pprint-0.6.4.tar.gz) = 13702
+SHA256 (cabal/ansi-wl-pprint-0.6.6.tar.gz) = 1eff90ac153f66c42aa6ee10639e3c541194935030672bac8ff2b5cbca8e6bfe
+SIZE (cabal/ansi-wl-pprint-0.6.6.tar.gz) = 13775
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 37bfa4fe6cc3..0d6596e9d48c 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,6 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 4916f3667f7d..20415fae4827 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,6 +2,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index c041e1cd8f31..f4a5fb464b03 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -2,6 +2,7 @@
PORTNAME= async
PORTVERSION= 2.0.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile
index 46e59d14da3c..d7135643797b 100644
--- a/devel/hs-attempt/Makefile
+++ b/devel/hs-attempt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attempt
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index c6771df4e52f..073257a73333 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,6 +2,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index cd4f0766c3d1..cc74acd85ab7 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index c2be52eca291..1c4cb314831d 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,6 +2,7 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-conduit/Makefile b/devel/hs-base64-conduit/Makefile
new file mode 100644
index 000000000000..2d3d12842655
--- /dev/null
+++ b/devel/hs-base64-conduit/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= base64-conduit
+PORTVERSION= 0.5.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Base64-encode and decode streams of bytes
+
+LICENSE= BSD
+
+USE_CABAL= base64-bytestring>=0.1.1.1 conduit>=0.5
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base64-conduit/distinfo b/devel/hs-base64-conduit/distinfo
new file mode 100644
index 000000000000..d300edc8a201
--- /dev/null
+++ b/devel/hs-base64-conduit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/base64-conduit-0.5.1.tar.gz) = 3481c4695747985516e3e2bdfd4f76e9e0acd43f5fa5c24f3f4ce5527634b7fe
+SIZE (cabal/base64-conduit-0.5.1.tar.gz) = 2508
diff --git a/devel/hs-base64-conduit/pkg-descr b/devel/hs-base64-conduit/pkg-descr
new file mode 100644
index 000000000000..7d01f88d5e4d
--- /dev/null
+++ b/devel/hs-base64-conduit/pkg-descr
@@ -0,0 +1,3 @@
+Base64-encode and decode streams of bytes.
+
+WWW: http://github.com/snoyberg/conduit
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index 1d9bad623d6b..a7320baa2833 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.1.0
+PORTVERSION= 0.3.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable ReadArgs>=1.2 system-filepath>=0.4 text \
+USE_CABAL= hashable lifted-base ReadArgs>=1.2 system-filepath>=0.4 text \
transformers unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 12388ca7c8b0..82654c4a0864 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.1.0.tar.gz) = 40966f69cb6ec71aeb03b81b6543e6b46a78c242d6edcccd500fca8fce4f6896
-SIZE (cabal/basic-prelude-0.3.1.0.tar.gz) = 4324
+SHA256 (cabal/basic-prelude-0.3.2.0.tar.gz) = 92cd64b41d1374b7ee97f6252ff6f4e60286d9a1541ad04cdaa8ebdc139cbce9
+SIZE (cabal/basic-prelude-0.3.2.0.tar.gz) = 4534
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
new file mode 100644
index 000000000000..6c1c61002d03
--- /dev/null
+++ b/devel/hs-bifunctors/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= bifunctors
+PORTVERSION= 3.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell 98 bifunctors
+
+LICENSE= BSD
+
+USE_CABAL= semigroupoids semigroups>=0.8.3.1 tagged>=0.4.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
new file mode 100644
index 000000000000..364ddfc00036
--- /dev/null
+++ b/devel/hs-bifunctors/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/bifunctors-3.2.tar.gz) = 0a7427a16b2a5e39ca92c7a5c63e16f0fcffea2b4f2d59e32c3c1e1182fb7a0d
+SIZE (cabal/bifunctors-3.2.tar.gz) = 7327
diff --git a/devel/hs-bifunctors/pkg-descr b/devel/hs-bifunctors/pkg-descr
new file mode 100644
index 000000000000..a4f6d0ad626d
--- /dev/null
+++ b/devel/hs-bifunctors/pkg-descr
@@ -0,0 +1,3 @@
+Haskell 98 bifunctors.
+
+WWW: http://github.com/ekmett/bifunctors/
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 7f49ae90280a..5a2cf9b02000 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
index 165e0a3259e3..b1c0c9f73b30 100644
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ b/devel/hs-blaze-builder-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-builder-conduit
PORTVERSION= 0.5.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index b1404ea9521e..78d3b879b41d 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index b184c340d118..5d701f4d7db4 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-builder
PORTVERSION= 0.3.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index 0889bd8d422f..73c338b4b077 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.0.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index a98200aa7647..f4fbd0efa10d 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 1.2.6.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 6924e402e07c..99d4e6aa87f0 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index b17c6b6b29d8..0d4506500b34 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index b93dc1c6e052..e9b914784728 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index ce63c1126f65..a8fac7d12314 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= c2hs
PORTVERSION= 0.16.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index ec2c62256441..a1615dcb9ba6 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cabal-install
PORTVERSION= 0.14.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 20120218320a..b322013176c8 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cereal
PORTVERSION= 0.3.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 47db4912bf72..f5f34ab73139 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.2.9
-PORTREVISION= 2
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ COMMENT= Check properties on standard classes and data structures
LICENSE= BSD
FILE_LICENSE= COPYING
-USE_CABAL= QuickCheck>=2.3
+USE_CABAL= QuickCheck>=2.3 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index 576d25cc6eb1..d7cf29c0196a 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/checkers-0.2.9.tar.gz) = fa41e5ec8236ef45d4f45af050ff40924ffea7456ca7e174ddf723afa19e21ff
-SIZE (cabal/checkers-0.2.9.tar.gz) = 14941
+SHA256 (cabal/checkers-0.3.1.tar.gz) = d728c85d7d7d050932d13ab75e29c7f9ea4e3a91e6b025272045ce89e6421e52
+SIZE (cabal/checkers-0.3.1.tar.gz) = 14894
diff --git a/devel/hs-checkers/files/patch-checkers.cabal b/devel/hs-checkers/files/patch-checkers.cabal
deleted file mode 100644
index 09a9d1c47979..000000000000
--- a/devel/hs-checkers/files/patch-checkers.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./checkers.cabal.orig 2010-12-09 22:21:39.000000000 +0100
-+++ ./checkers.cabal 2011-07-31 16:03:29.000000000 +0200
-@@ -45,6 +45,6 @@
- Test.QuickCheck.Later
- Other-modules:
- Control.Monad.Extensions
-- ghc-options: -Wall -fno-warn-orphans
-+ ghc-options: -Wall -fno-warn-orphans -O0
-
- -- ghc-prof-options: -prof -auto-all
diff --git a/devel/hs-checkers/pkg-descr b/devel/hs-checkers/pkg-descr
index acb8063a8f0f..aa9255c7c280 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://hackage.haskell.org/package/checkers
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index fa0d206d65b1..f6c7d1423e86 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,8 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= classy-prelude>=0.4.1 conduit>=0.5.4.1 xml-conduit>=1.0
+USE_CABAL= classy-prelude>=0.4.3 conduit>=0.5.4.1 monad-control \
+ resourcet transformers void 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
index a39666a8e933..c41aad1fbfe8 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-conduit-0.4.1.tar.gz) = e8616c45c64c3e122aef41631d6eb2b61e2e89e92900af5cec0f7a6b3bc89152
-SIZE (cabal/classy-prelude-conduit-0.4.1.tar.gz) = 1966
+SHA256 (cabal/classy-prelude-conduit-0.4.3.tar.gz) = 64b841c5d86734de207cef4e1411c45a103d79aaa3a5c7e034cf44f34dd4c45b
+SIZE (cabal/classy-prelude-conduit-0.4.3.tar.gz) = 6460
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 0b24579c93af..9e21f45e89a8 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= basic-prelude>=0.3 hashable system-filepath>=0.4 text \
+USE_CABAL= basic-prelude>=0.3.2 hashable system-filepath>=0.4 text \
transformers unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index 5a06f6d831bb..acaf3be55218 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.4.1.tar.gz) = c1ad044194e48795eb9b2846ddc3bdb987695bd5872dc21b8b0b23ad73c44193
-SIZE (cabal/classy-prelude-0.4.1.tar.gz) = 9437
+SHA256 (cabal/classy-prelude-0.4.3.tar.gz) = d88c8df50d173b4125b93c5036cefb4fe3bd659b97227afd57480fa0e4d751cc
+SIZE (cabal/classy-prelude-0.4.3.tar.gz) = 9517
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 595a64778c97..b0b7bd423c44 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cmdargs
PORTVERSION= 0.10.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index 7eaa0cfb60f9..b36f327b6b65 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 0.5.5
+PORTVERSION= 0.5.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Streaming data processing library
LICENSE= BSD
-USE_CABAL= lifted-base>=0.1 monad-control>=0.3.1 resourcet>=0.3 \
+USE_CABAL= lifted-base>=0.1 monad-control>=0.3.1 resourcet>=0.4.3 \
text>=0.11 transformers>=0.2.2 transformers-base>=0.4.1 \
void>=0.5.5
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index d181c37fb1e0..f33f789e00e0 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-0.5.5.tar.gz) = 388a4e5343165f78516e02055bbdd9e95fcb1d17a37870f4d2d565ddd513612b
-SIZE (cabal/conduit-0.5.5.tar.gz) = 34781
+SHA256 (cabal/conduit-0.5.6.tar.gz) = ba3381e1fd0251128b85ae549b26eecaa453c4798af00fcfd753caa11bbbaaa8
+SIZE (cabal/conduit-0.5.6.tar.gz) = 35200
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index b840aee6981c..3b1612429897 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= configurator
-PORTVERSION= 0.2.0.1
+PORTVERSION= 0.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index baee181bcf5d..c7af3bb6f818 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/configurator-0.2.0.1.tar.gz) = d7f8bea4e67843454ca66685c950eb0483eccf4345998fdf1cecce2e7071860b
-SIZE (cabal/configurator-0.2.0.1.tar.gz) = 14221
+SHA256 (cabal/configurator-0.2.0.2.tar.gz) = 0bb504b11c4f13a57b2cb80f23427dd7e8d13dade4f126e06c91ec87487b3904
+SIZE (cabal/configurator-0.2.0.2.tar.gz) = 14231
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 0c87c9ea8875..6766c20c78c4 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,7 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.0.11.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index b2607ed2fac8..afe87899deea 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.15
+PORTVERSION= 1.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A liberalised re-implementation of cpp, the C pre-processor
+COMMENT= Liberalised re-implementation of cpp, the C pre-processor
LICENSE= LGPL21
FILE_LICENSE= LICENCE-LGPL
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 82f4c6d409c9..88bbcfd69faa 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpphs-1.15.tar.gz) = 868c68cda54601db1f0ea4bee72fe1b3c8580fd7c8e1bc03becdfb887f7254dc
-SIZE (cabal/cpphs-1.15.tar.gz) = 71444
+SHA256 (cabal/cpphs-1.16.tar.gz) = b7562ee6dd504f210a363c6bb7ea542e67f0a6ad75aca66080e66801870e69bb
+SIZE (cabal/cpphs-1.16.tar.gz) = 71105
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 6b32106a71f1..6fba544e5362 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= darcs
PORTVERSION= 2.8.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index ae288aab4194..1d213ead9bee 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-default
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index 976a60d5b80d..e87d0beb3c16 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-pprint
PORTVERSION= 0.2.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index c278a8af8fc5..73d38e61eece 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,6 +2,7 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index ccc3e7668ece..f636c1b014c2 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index a8ee776c708c..26115c49771a 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -2,6 +2,7 @@
PORTNAME= directory-tree
PORTVERSION= 0.11.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 80144b529292..96a4173fafb7 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dlist
PORTVERSION= 0.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index 08d9f93a7578..ffc433700f17 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -3,7 +3,7 @@
PORTNAME= drift
PORTVERSION= 2.2.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/
PKGNAMEPREFIX= hs-
@@ -24,7 +24,8 @@ GHC_DESC= Build with GHC
.if ${PORT_OPTIONS:MGHC}
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
hs-random>=0:${PORTSDIR}/devel/hs-random
-LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
+ ffi.6:${PORTSDIR}/devel/libffi
CONFIGURE_ARGS+= --with-hc=ghc
.endif
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 1e4fb63e9d74..12db5e7de249 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= edit-distance
-PORTVERSION= 0.2.1.1
+PORTVERSION= 0.2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index d429bd1982f3..6a1292d246f1 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/edit-distance-0.2.1.1.tar.gz) = d60ba4ca60467a34e2f5e8a9452f6a9caf52e963fe95dbc4d5fbab61191a10b5
-SIZE (cabal/edit-distance-0.2.1.1.tar.gz) = 9940
+SHA256 (cabal/edit-distance-0.2.1.2.tar.gz) = 84bcc319f4b7dc48994de082819bc656e6a001fdf40c2f7327b9a2acc2d5bd21
+SIZE (cabal/edit-distance-0.2.1.2.tar.gz) = 11335
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
new file mode 100644
index 000000000000..1b2196e6fb8f
--- /dev/null
+++ b/devel/hs-either/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= either
+PORTVERSION= 3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Either monad transformer
+
+LICENSE= BSD
+
+USE_CABAL= MonadRandom mtl>=2.0 semigroupoids>=3 semigroups>=0.8.3.1 \
+ transformers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
new file mode 100644
index 000000000000..300d1a2c4801
--- /dev/null
+++ b/devel/hs-either/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/either-3.1.tar.gz) = 55b73518e14650a07c9a1cf8eb92be96ecaaf61cf4da02b5185976d1a0a34fdd
+SIZE (cabal/either-3.1.tar.gz) = 4945
diff --git a/devel/hs-either/pkg-descr b/devel/hs-either/pkg-descr
new file mode 100644
index 000000000000..65d246419505
--- /dev/null
+++ b/devel/hs-either/pkg-descr
@@ -0,0 +1,3 @@
+An either monad transformer.
+
+WWW: http://github.com/ekmett/either/
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index 9cb790120106..bb8bf61551d3 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.19
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
new file mode 100644
index 000000000000..dc7bbbfc3038
--- /dev/null
+++ b/devel/hs-errors/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= errors
+PORTVERSION= 1.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simplified error-handling
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= either>=3.0.1 safe>=0.3.3 transformers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
new file mode 100644
index 000000000000..cbe7b6512aef
--- /dev/null
+++ b/devel/hs-errors/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/errors-1.3.1.tar.gz) = 33babc5bee751efd9f426ef410fbe1dbc031ddd56538e5e55ec28c1fe7b5d76d
+SIZE (cabal/errors-1.3.1.tar.gz) = 6048
diff --git a/devel/hs-errors/pkg-descr b/devel/hs-errors/pkg-descr
new file mode 100644
index 000000000000..58c6980880f5
--- /dev/null
+++ b/devel/hs-errors/pkg-descr
@@ -0,0 +1,5 @@
+The one-stop shop for all your error-handling needs! Just import
+"Control.Error". This library encourages an error-handling style that directly
+uses the type system, rather than out-of-band exceptions.
+
+WWW: http://hackage.haskell.org/package/errors
diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile
index 3e95db73cfd8..84aa54f89dee 100644
--- a/devel/hs-failure/Makefile
+++ b/devel/hs-failure/Makefile
@@ -2,7 +2,7 @@
PORTNAME= failure
PORTVERSION= 0.2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 969f6b0ddb48..2e042693fa99 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fast-logger
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 9163b51a49ab..7ba71cbb6147 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fgl
PORTVERSION= 5.4.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 5c6de1d7af32..845e5305701a 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.4.6
+PORTVERSION= 0.0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index e19df2aaa64b..aa4fa73b58e5 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/file-embed-0.0.4.6.tar.gz) = 77e351e14cead1934e17c312610c51e2179172d4ee7735b8eac5cba04dd15b5c
-SIZE (cabal/file-embed-0.0.4.6.tar.gz) = 3490
+SHA256 (cabal/file-embed-0.0.4.7.tar.gz) = 71cf7f79316511154d7c5b9910dcb701a68c342a3afc32a3f1c0ab991241c0c2
+SIZE (cabal/file-embed-0.0.4.7.tar.gz) = 3630
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 17cb10676903..db6446dd011e 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,6 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index aac684ca66ff..4eb97934adc0 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.5.0.1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD
-USE_CABAL= Diff>=0.1.2 HUnit>=1.2 mtl parsec>=2 split>=0.1 utf8-string>=0.3 \
- xml>=1.3
+USE_CABAL= Diff>=0.2 filestore HUnit>=1.2 mtl parsec>=2 split>=0.1 \
+ utf8-string>=0.3 xml>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 174cc9c4f3f5..b8ee3facc877 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.5.0.1.tar.gz) = f4dc9ec0e49abcd138328eec6495df034f656979d0f6936e8a98ad35f5e071f1
-SIZE (cabal/filestore-0.5.0.1.tar.gz) = 29263
+SHA256 (cabal/filestore-0.6.tar.gz) = 6076b3cb8e702520d0c98526babd96d9942a87cf5af10e604887e33873c7baae
+SIZE (cabal/filestore-0.6.tar.gz) = 29622
diff --git a/devel/hs-filestore/pkg-descr b/devel/hs-filestore/pkg-descr
index f5a82fb20949..bd532ee1dc4e 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://hackage.haskell.org/package/filestore
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
index 502d84789f63..e650e8729689 100644
--- a/devel/hs-filesystem-conduit/Makefile
+++ b/devel/hs-filesystem-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= filesystem-conduit
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index f8c59bfb9323..a95037e52ecb 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.0.4
+PORTVERSION= 0.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 719f9a4f214e..4d4553ba69ff 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fsnotify-0.0.4.tar.gz) = 5f2317ec9f17665a89bfd5d9601e313f01969e10327d7e28fc354a4464ffe168
-SIZE (cabal/fsnotify-0.0.4.tar.gz) = 14565
+SHA256 (cabal/fsnotify-0.0.6.tar.gz) = 85e31556ab86f4c1c6fa5039492e0f66094e029705ebd53b4c58ed21b5556645
+SIZE (cabal/fsnotify-0.0.6.tar.gz) = 14570
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 4a7c56d56ccd..560b18ed0d1f 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gconf
PORTVERSION= 0.12.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
new file mode 100644
index 000000000000..3a6aecafd5d3
--- /dev/null
+++ b/devel/hs-generic-deriving/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= generic-deriving
+PORTVERSION= 1.4.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Generic programming library for generalised deriving
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
new file mode 100644
index 000000000000..7a82879f602f
--- /dev/null
+++ b/devel/hs-generic-deriving/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/generic-deriving-1.4.0.tar.gz) = 47e5bae4348401217de5e6f8dd638a6e5c3fc3ddedce1c885fc56252091d5b95
+SIZE (cabal/generic-deriving-1.4.0.tar.gz) = 17868
diff --git a/devel/hs-generic-deriving/pkg-descr b/devel/hs-generic-deriving/pkg-descr
new file mode 100644
index 000000000000..0dc690fe0bee
--- /dev/null
+++ b/devel/hs-generic-deriving/pkg-descr
@@ -0,0 +1,4 @@
+This package provides functionality for generalising the deriving mechanism
+in Haskell to arbitrary classes.
+
+WWW: http://hackage.haskell.org/package/generic-deriving
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 4a762179cedb..2cf2c114c0b5 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ghc-events
PORTVERSION= 0.4.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index d82f2ae49ef1..2ad9d05e65ad 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index a1cb48f442a4..5262fdb97358 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= ghc-paths
-PORTVERSION= 0.1.0.8
-PORTREVISION= 5
+PORTVERSION= 0.1.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Utility looking for GHC installation directories
+COMMENT= Knowledge of GHC's installation directories
LICENSE= BSD
diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo
index 7997b1ec5b19..fd8cca66f7c9 100644
--- a/devel/hs-ghc-paths/distinfo
+++ b/devel/hs-ghc-paths/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-paths-0.1.0.8.tar.gz) = 8672c1e65525555481091443f44abf738f9442516c612d67dde12ebfe02f0c56
-SIZE (cabal/ghc-paths-0.1.0.8.tar.gz) = 2369
+SHA256 (cabal/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945
+SIZE (cabal/ghc-paths-0.1.0.9.tar.gz) = 2402
diff --git a/devel/hs-ghc-paths/pkg-descr b/devel/hs-ghc-paths/pkg-descr
index 7ebe02750896..82789d455542 100644
--- a/devel/hs-ghc-paths/pkg-descr
+++ b/devel/hs-ghc-paths/pkg-descr
@@ -1,3 +1,3 @@
Knowledge of GHC's installation directories.
-WWW: http://hackage.haskell.org/packages/archive/ghc-paths
+WWW: http://hackage.haskell.org/packages/ghc-paths
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index e8573ed54213..feb6d0a883c8 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gio
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 5f53970f9dd8..4b9fb4f56b2e 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 3.20121211
+PORTVERSION= 3.20130124
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index 78258a0755df..360618a0db2c 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-3.20121211.tar.gz) = 3b6d9d7d8d44c7939813a4798a78b76a02efef655030d742149eda3779daa13e
-SIZE (cabal/git-annex-3.20121211.tar.gz) = 2068316
+SHA256 (cabal/git-annex-3.20130124.tar.gz) = 02498f5806344aae49ebcf6b67d370da29fc8d770a38dfad8cd8de59c127a290
+SIZE (cabal/git-annex-3.20130124.tar.gz) = 2173150
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
index 4992e24a6a3c..f591c156bfb5 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -2,7 +2,7 @@
PORTNAME= glade
PORTVERSION= 0.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index c9445a244f27..b9d8af9f6b4c 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -2,6 +2,7 @@
PORTNAME= glib
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 935d399cfea9..765b9092ec7b 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gtk2hs-buildtools
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 2c1c78bf64ac..15a8a32565c9 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -3,6 +3,7 @@
PORTNAME= haddock
PORTVERSION= 2.11.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index be1c56a02eb8..fc6d431f2daf 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.18.10
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 7f894ea5cdfb..45f72ef770d0 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.1.2.5
+PORTVERSION= 1.2.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A class for types that can be converted to a hash value
+COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 5a166ac6bda9..a28b27d99922 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.1.2.5.tar.gz) = 3fb5d430c9289ebada4991a76fd78f028aaaf17957dc666ddc7b89c98a54713d
-SIZE (cabal/hashable-1.1.2.5.tar.gz) = 9129
+SHA256 (cabal/hashable-1.2.0.5.tar.gz) = 107b7b58aa9a2eee81c58bc00638b7c0a9db53e1b7b4de8388a4eb4592c8383b
+SIZE (cabal/hashable-1.2.0.5.tar.gz) = 21090
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index b22b7e2adcf1..ae861ed1c425 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 25d51f8cada5..50ac0a9b3295 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hashtables
PORTVERSION= 1.0.1.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index a651caf6c5dc..c9f0c729783c 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= haskeline
PORTVERSION= 0.6.4.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index d655c70c1ad9..4e87e0935b2e 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-platform
PORTVERSION= 2012.4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,36 +12,36 @@ LICENSE= BSD
METAPORT= yes
-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_3 \
- alex==3.0.2 \
- happy==1.18.10
+USE_CABAL= async==2.0.1.3_1 \
+ cgi==3001.1.7.4_6,1 \
+ fgl==5.4.2.4_4 \
+ GLUT==2.1.2.1_7,1 \
+ haskell-src==1.0.1.5_3 \
+ html==1.0.1.2_6 \
+ HTTP==4000.2.5_1 \
+ HUnit==1.2.5.1_1 \
+ mtl==2.1.2_1 \
+ network==2.3.1.0_1 \
+ OpenGL==2.2.3.1_4,1 \
+ parallel==3.2.0.3_1 \
+ parsec==3.1.3_1 \
+ primitive==0.5.0.1_1 \
+ QuickCheck==2.5.1.1_1 \
+ random==1.0.1.1_3 \
+ regex-base==0.93.2_6 \
+ regex-compat==0.95.1_4 \
+ regex-posix==0.95.2_1 \
+ split==0.2.1.1_1 \
+ stm==2.4_1 \
+ syb==0.3.7_1 \
+ text==0.11.2.3_1 \
+ transformers==0.3.0.0_3 \
+ vector==0.10.0.1_1 \
+ xhtml==3000.2.1_3 \
+ zlib==0.5.4.0_1 \
+ cabal-install==0.14.0_4 \
+ alex==3.0.2_1 \
+ happy==1.18.10_1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 27868a48619e..baa2fc80f4e1 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= haskell-src-exts
PORTVERSION= 1.13.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 7268c8ea90d1..9a18ee6fd903 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index 02805f44e289..f97a0694b150 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hastache
-PORTVERSION= 0.4.2
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= blaze-builder ieee754 mtl syb text utf8-string
+USE_CABAL= blaze-builder ieee754 mtl syb text transformers utf8-string
INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${DATADIR}
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 330e7923ef24..563fcafcb3cf 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hastache-0.4.2.tar.gz) = 719f07aa9917e5b0d8586bb26fc045e81fae50fb4d3230a351a05bdb7148a6a9
-SIZE (cabal/hastache-0.4.2.tar.gz) = 12113
+SHA256 (cabal/hastache-0.5.0.tar.gz) = c8fa5525433bbed0f684da356429589c672fee861132ec9a2bb4747c38bc37b0
+SIZE (cabal/hastache-0.5.0.tar.gz) = 12670
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index c5657c34f2c3..e4f4869dad47 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hdoc
PORTVERSION= 0.8.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MASTER_SITES= http://staff.fmi.uni-passau.de/~groessli/hdoc/
PKGNAMEPREFIX= hs-
@@ -14,7 +14,8 @@ COMMENT= HTML documentation tool for Haskell
LICENSE= GPLv2
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp \
+ ffi.6:${PORTSDIR}/devel/libffi
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 30e8c9bde366..be355d3f9d1c 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hinotify
PORTVERSION= 0.3.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index a4c32f5dbeaf..e0caac788262 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hint
PORTVERSION= 0.3.3.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index a342b3fdfa5e..45ade769e4ec 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index ff9fcbfa44b5..0d2eb1385fe7 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.8.39
+PORTVERSION= 1.8.43
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 1e48d978c903..42c7c04d38df 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.8.39.tar.gz) = e58cea4090352e95c457b1153857ca57c346c8bfbb0bf17fbf28661b08713801
-SIZE (cabal/hlint-1.8.39.tar.gz) = 63401
+SHA256 (cabal/hlint-1.8.43.tar.gz) = 664799ed88bc7fc07308288b87df689b9388ae5625cea163781103d33dd7ce71
+SIZE (cabal/hlint-1.8.43.tar.gz) = 68396
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 5de7501c002b..ebc7180da00c 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.14
+PORTVERSION= 4.2.15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,9 +14,9 @@ FILE_LICENSE= docs/LICENSE
CABAL_SETUP= Setup.hs
USE_CABAL= blaze-builder>=0.2 case-insensitive>=0.2 cmdargs>=0.7 \
- conduit>=0.2 haskell-src-exts>=1.12 http-types parsec>=2.1 \
- random safe tagsoup>=0.11 transformers>=0.2 uniplate wai>=1.1 \
- warp>=1.1
+ conduit>=0.2 haskell-src-exts>=1.12 http-types>=0.7 \
+ parsec>=2.1 random safe tagsoup>=0.11 transformers>=0.2 \
+ uniplate wai>=1.1 warp>=1.1
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index a36ec1292674..5ba3c6b0c41a 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.14.tar.gz) = 32af22fa4c1ecd87c1ab67e196e11e0db6e8805723c3adecf3cb8adb3f72b5fa
-SIZE (cabal/hoogle-4.2.14.tar.gz) = 118457
+SHA256 (cabal/hoogle-4.2.15.tar.gz) = 717efbc7dbf890fe805a2954cd3b441e015c74f61db6f1fb2f141efcd76a1d56
+SIZE (cabal/hoogle-4.2.15.tar.gz) = 118793
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index cbbef5cfc071..02cc924707de 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hslogger
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index a8b9a4e7d8a1..354469465c29 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hspec-expectations
PORTVERSION= 0.3.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 5983d2a030cb..4678cb43a427 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.4.2
+PORTVERSION= 1.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Behavior Driven Development for Haskell
LICENSE= BSD
-USE_CABAL= ansi-terminal==0.5.5_5 hspec-expectations HUnit>=1.2.5 \
+USE_CABAL= ansi-terminal hspec-expectations HUnit>=1.2.5 \
QuickCheck>=2.4.0.1 setenv silently>=1.1.1 transformers>=0.2.0
EXECUTABLE= hspec-discover
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 2f980c7057eb..319fd634679e 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.4.2.tar.gz) = 98958b685b5f7ead7fdd831aec6e0a7a866a03937a117014f36fba10cb359562
-SIZE (cabal/hspec-1.4.2.tar.gz) = 16278
+SHA256 (cabal/hspec-1.4.3.tar.gz) = accab7dbfa0ce09a8c679b0e1c34ee230232089ff918a69c1ad1fbaaba1b2645
+SIZE (cabal/hspec-1.4.3.tar.gz) = 25080
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 5fb63e48c16e..bea92f8910ba 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= idoc
PORTVERSION= 0.2.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/idoc/
PKGNAMEPREFIX= hs-
@@ -15,7 +15,8 @@ LICENSE= GPLv2
FILE_LICENSE= COPYING
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp \
+ ffi.6:${PORTSDIR}/devel/libffi
PLIST_FILES= bin/idoc
USE_GMAKE= yes
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index 80345f408030..0fa79c1acdeb 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kqueue
PORTVERSION= 0.1.2.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 47e62d59ba55..40b93dac775d 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -2,7 +2,7 @@
PORTNAME= language-c
PORTVERSION= 0.3.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 9a36c77cfdc5..0c3db887b337 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -2,6 +2,7 @@
PORTNAME= language-javascript
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 2830da05964f..eb85ab0358d9 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= largeword
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index c77d620f3b0b..0d0b7edf2a09 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/largeword-1.0.3.tar.gz) = 6fee917834de18d5df6a45bf1535fb9dd989045a0c609757e384731630b466a1
-SIZE (cabal/largeword-1.0.3.tar.gz) = 2967
+SHA256 (cabal/largeword-1.0.4.tar.gz) = 858a257890c698eaad065c6eced696be83b9e8288c1b081d6c7debbad6fad9a6
+SIZE (cabal/largeword-1.0.4.tar.gz) = 3023
diff --git a/devel/hs-largeword/pkg-descr b/devel/hs-largeword/pkg-descr
index 6cd8d083ab73..93702a590bcd 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://github.com/idontgetoutmuch/largeword
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index a10d699ae723..df81fb488e9d 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
new file mode 100644
index 000000000000..cc09a4653e06
--- /dev/null
+++ b/devel/hs-lens/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= lens
+PORTVERSION= 3.8.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Lenses, Folds and Traversals
+
+LICENSE= BSD
+
+USE_CABAL= bifunctors>=3 comonad>=3 comonad-transformers>=3 \
+ comonads-fd>=3 contravariant>=0.2.0.2 distributive>=0.3 \
+ generic-deriving hashable>=1.1.2.3 MonadCatchIO-transformers>=0.3 \
+ mtl>=2.0.1 parallel>=3.1.0.1 profunctor-extras>=3.3 \
+ profunctors>=3.2 reflection>=1.1.6 semigroupoids>=3 \
+ semigroups>=0.8.4 split tagged>=0.4.4 text>=0.11 \
+ transformers>=0.3 unordered-containers>=0.2 vector>=0.9
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
new file mode 100644
index 000000000000..8dac094b662b
--- /dev/null
+++ b/devel/hs-lens/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/lens-3.8.5.tar.gz) = 769bfa066991237a660cbf8a2ffa4ffadb9dfc44eb0297a02f47e27ae08fe227
+SIZE (cabal/lens-3.8.5.tar.gz) = 195783
diff --git a/devel/hs-lens/files/patch-lens.cabal b/devel/hs-lens/files/patch-lens.cabal
new file mode 100644
index 000000000000..73cb26baa09c
--- /dev/null
+++ b/devel/hs-lens/files/patch-lens.cabal
@@ -0,0 +1,12 @@
+--- ./lens.cabal.orig 2013-01-26 15:22:29.000000000 +0100
++++ ./lens.cabal 2013-01-29 07:57:12.000000000 +0100
+@@ -186,8 +186,7 @@
+ tagged >= 0.4.4 && < 1,
+ template-haskell >= 2.4 && < 2.10,
+ text >= 0.11 && < 0.12,
+- transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 1,
++ transformers >= 0.3 && < 0.4,
+ unordered-containers >= 0.2 && < 0.3,
+ vector >= 0.9 && < 0.11
+
diff --git a/devel/hs-lens/pkg-descr b/devel/hs-lens/pkg-descr
new file mode 100644
index 000000000000..41fbde7d6fe6
--- /dev/null
+++ b/devel/hs-lens/pkg-descr
@@ -0,0 +1,8 @@
+This package comes "Batteries Included" with many useful lenses for the
+types commonly used from the Haskell Platform, and with tools for
+automatically generating lenses and isomorphisms for user-supplied data
+types. The combinators in Control.Lens provide a highly generic toolbox
+for composing families of getters, folds, isomorphisms, traversals,
+setters and lenses and their indexed variants.
+
+WWW: http://github.com/ekmett/lens/
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 63395e37ce5d..f7c37623092e 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2
+PORTVERSION= 0.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index 182a5dc92431..6f6ff813ed05 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.2.tar.gz) = cb4958e56f0d60e1a6ea60469633b7821ad6f4be342b50d477a6e9b038195189
-SIZE (cabal/lifted-base-0.2.tar.gz) = 11556
+SHA256 (cabal/lifted-base-0.2.0.2.tar.gz) = bddda22f43595566b51942fd536e98ca8d62e8696bbf703a27b04c20b3babfa7
+SIZE (cabal/lifted-base-0.2.0.2.tar.gz) = 11702
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 4f92a7f9e3c6..7b9837be5cfb 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,6 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index ac16734ee28c..7907273763d7 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 0acb874d6e11..337b1a6b9f14 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -2,6 +2,7 @@
PORTNAME= monad-control
PORTVERSION= 0.3.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index 8abb9f9ceaac..a858803b8ca1 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.2.3
+PORTVERSION= 0.2.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ 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
+ resourcet>=0.4 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
index c1e2fce29c76..06811f857088 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.2.3.tar.gz) = a39ac84cd2bc98935e42223c4c6dbca25c209f050191958c33ff2c3573d89c10
-SIZE (cabal/monad-logger-0.2.3.tar.gz) = 4468
+SHA256 (cabal/monad-logger-0.2.3.2.tar.gz) = 65febe4a9f0214adb68d696879d169029391bc262796cab86af72c5d7f75b22c
+SIZE (cabal/monad-logger-0.2.3.2.tar.gz) = 4500
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index df8560480f91..f340c073cfbe 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 167a4b0457c4..ef598b4ff16c 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index 9d1019e3f7cb..77304fc10cd5 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 33a228f3a5dd..95ea93c60d60 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mueval
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 4dc92ae2974a..466778dcb5e5 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -2,6 +2,7 @@
PORTNAME= murmur-hash
PORTVERSION= 0.1.0.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 4ec1ecbeddf7..c7390385352d 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.4.2
+PORTVERSION= 0.5.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index c5a0fe76a75c..dc278360e40c 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/optparse-applicative-0.4.2.tar.gz) = 292c9735552a5656586a6764b5fa74625bc606ea7ad521980b1f12012124b443
-SIZE (cabal/optparse-applicative-0.4.2.tar.gz) = 21536
+SHA256 (cabal/optparse-applicative-0.5.2.1.tar.gz) = 1110b926d9c601f8bc24c3e57e08d3f957ad047a60324b11640df51a0a9a9570
+SIZE (cabal/optparse-applicative-0.5.2.1.tar.gz) = 24123
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 9ccdbfeb73c0..41b84b333053 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= parallel
PORTVERSION= 3.2.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index be22f9e1eee5..fc31326357b2 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pcre-light
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
index ca69f42eb3ad..b8ed7864982d 100644
--- a/devel/hs-pool-conduit/Makefile
+++ b/devel/hs-pool-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pool-conduit
-PORTVERSION= 0.1.0.3
+PORTVERSION= 0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pool-conduit/distinfo b/devel/hs-pool-conduit/distinfo
index 3a7f2c111cf1..4bcdb0571500 100644
--- a/devel/hs-pool-conduit/distinfo
+++ b/devel/hs-pool-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pool-conduit-0.1.0.3.tar.gz) = a9abd59d2b63dc6de99d73381fde66777485a9d671fdc5ac4acd75700e592561
-SIZE (cabal/pool-conduit-0.1.0.3.tar.gz) = 2067
+SHA256 (cabal/pool-conduit-0.1.1.tar.gz) = e1b1f19266386979c6f9fd940277151295e3af11835ed8a70425e5c5f90352bd
+SIZE (cabal/pool-conduit-0.1.1.tar.gz) = 2151
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index d1c012eb9eeb..7f4e846191b0 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -2,6 +2,7 @@
PORTNAME= primitive
PORTVERSION= 0.5.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctor-extras/Makefile b/devel/hs-profunctor-extras/Makefile
new file mode 100644
index 000000000000..9d3f08eff30f
--- /dev/null
+++ b/devel/hs-profunctor-extras/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= profunctor-extras
+PORTVERSION= 3.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Profunctor extras
+
+LICENSE= BSD
+
+USE_CABAL= comonad>=3 profunctors>=3.2 semigroupoid-extras>=3 \
+ semigroupoids>=3 tagged>=0.4.4 transformers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-profunctor-extras/distinfo b/devel/hs-profunctor-extras/distinfo
new file mode 100644
index 000000000000..35fe032471c1
--- /dev/null
+++ b/devel/hs-profunctor-extras/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/profunctor-extras-3.3.tar.gz) = 79bfbe8087295e3bd18175a32a325dc4115111945dcbae7feea24bd102e3b169
+SIZE (cabal/profunctor-extras-3.3.tar.gz) = 5811
diff --git a/devel/hs-profunctor-extras/pkg-descr b/devel/hs-profunctor-extras/pkg-descr
new file mode 100644
index 000000000000..afdaceb77f1f
--- /dev/null
+++ b/devel/hs-profunctor-extras/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a number of utilities and constructions that arise
+when working with profunctors that require minor extensions to Haskell
+98.
+
+WWW: http://github.com/ekmett/profunctor-extras/
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
new file mode 100644
index 000000000000..b4f8e02c750a
--- /dev/null
+++ b/devel/hs-profunctors/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= profunctors
+PORTVERSION= 3.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell 98 Profunctors
+
+LICENSE= BSD
+
+USE_CABAL= comonad>=3 tagged>=0.4.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
new file mode 100644
index 000000000000..6bce34878993
--- /dev/null
+++ b/devel/hs-profunctors/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/profunctors-3.2.tar.gz) = ccbf75c45a8bbd17d162870b99f854407c8fa73e1478c9d931dfc132af20e230
+SIZE (cabal/profunctors-3.2.tar.gz) = 6172
diff --git a/devel/hs-profunctors/pkg-descr b/devel/hs-profunctors/pkg-descr
new file mode 100644
index 000000000000..1f9e7b99e2b2
--- /dev/null
+++ b/devel/hs-profunctors/pkg-descr
@@ -0,0 +1,3 @@
+Haskell 98 Profunctors.
+
+WWW: http://github.com/ekmett/profunctors/
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index ad596b06de39..22c75f8543c7 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.1.0.1
+PORTVERSION= 0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +11,9 @@ 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
+USE_CABAL= base64-bytestring base64-conduit classy-prelude-conduit>=0.4 \
+ conduit>=0.5.4 mtl>=2.0 resourcet>=0.4.3 system-fileio>=0.3 \
+ system-filepath>=0.4 text>=0.11 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 1476eddae170..42e34ae9864d 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/project-template-0.1.0.1.tar.gz) = 43c41931b9428f6a69c030e91544ee6bb5a034063ca570a443df23621d6d152a
-SIZE (cabal/project-template-0.1.0.1.tar.gz) = 3689
+SHA256 (cabal/project-template-0.1.1.tar.gz) = ca160d5d1cce4e39e5a791738725bdb59f39ed92a9f0885fc2fe1c0aa1c3d0a0
+SIZE (cabal/project-template-0.1.1.tar.gz) = 3810
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index 0079c12fbb7c..c91efd55d331 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= random
PORTVERSION= 1.0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile
index 9d693eb5686a..8037de79ab11 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-ranges/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ranges
PORTVERSION= 0.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 3708ed0283e4..7d16b2d2082b 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -3,7 +3,7 @@
PORTNAME= reactive
PORTVERSION= 0.11.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 276a3e4805b7..ca02901c3683 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
new file mode 100644
index 000000000000..23abde9fe2c1
--- /dev/null
+++ b/devel/hs-reflection/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= reflection
+PORTVERSION= 1.1.6
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Reifies arbitrary terms into types that can be reflected back into terms
+
+LICENSE= BSD
+
+USE_CABAL= tagged>=0.2.3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
new file mode 100644
index 000000000000..30dc1f51033d
--- /dev/null
+++ b/devel/hs-reflection/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/reflection-1.1.6.tar.gz) = 7cd255fbde19be97e303439b1ba5f1c4b65010b53f540caafa2ccc8b54e81ec6
+SIZE (cabal/reflection-1.1.6.tar.gz) = 6193
diff --git a/devel/hs-reflection/pkg-descr b/devel/hs-reflection/pkg-descr
new file mode 100644
index 000000000000..b07f7d5c6bb7
--- /dev/null
+++ b/devel/hs-reflection/pkg-descr
@@ -0,0 +1,5 @@
+This package provides an implementation of the ideas presented in the
+paper "Functional Pearl: Implicit Configurations" by Oleg Kiselyov and
+Chung-chieh Shan.
+
+WWW: http://github.com/ekmett/reflection
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 8b0fdc2be095..de21c8974643 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -2,6 +2,7 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 2c1094fefd41..e23da3fd9955 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -2,6 +2,7 @@
PORTNAME= resourcet
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index f0989548dcb9..f2f68082c518 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= safe
PORTVERSION= 0.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index 1353bc2c54f8..14258b6dfc84 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,6 +2,7 @@
PORTNAME= setenv
PORTVERSION= 0.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 6e1fd6367532..a83f37d6632e 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.4.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index 922c156abf56..d7a0b34d9bb0 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= silently
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index 634a7f5622ea..e80b0761afe2 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/silently-1.2.4.tar.gz) = b2d01ebe18c07313564253bd755a439b5e6f9dc2cc49b3f7ddc69464c92a8729
-SIZE (cabal/silently-1.2.4.tar.gz) = 3140
+SHA256 (cabal/silently-1.2.4.1.tar.gz) = a2b8f53e7e7bc0272852852c49d8b27ff250accc73e25cbe9f1e20f3fee0ad0c
+SIZE (cabal/silently-1.2.4.1.tar.gz) = 3199
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index eca8af8e52eb..4b9d7cda40bd 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,6 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 59ed10b5dfd3..ef670778910f 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= smallcheck
-PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTVERSION= 0.6.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index 82fe3836d9df..c7b8871f778c 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/smallcheck-0.6.1.tar.gz) = 6b83c4934ed6b2141725731ede11db7380dc80c91a17261baedf338a00d34bdc
-SIZE (cabal/smallcheck-0.6.1.tar.gz) = 22854
+SHA256 (cabal/smallcheck-0.6.2.tar.gz) = d9af8f30a54846565000c88ce096d537a6dfcf80f376a49f3e2a86338755e77b
+SIZE (cabal/smallcheck-0.6.2.tar.gz) = 23125
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index 93c2c74327d4..3feefff2edc0 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -3,6 +3,7 @@
PORTNAME= split
PORTVERSION= 0.2.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index c79088344fc9..e95ebce3a7e2 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= stm
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 794de1085c81..d9bbdd688048 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index f444b61166e8..99424927dfbb 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 1935304de638..dc9dab90f14a 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -2,6 +2,7 @@
PORTNAME= syb-with-class
PORTVERSION= 0.6.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 82c375a6135b..3169f2c038ec 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -2,6 +2,7 @@
PORTNAME= syb
PORTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 74801fe399dc..f3ab25d1155a 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= system-fileio
-PORTVERSION= 0.3.10
+PORTVERSION= 0.3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index 9d2895fc7f1c..f45ea98ea672 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-fileio-0.3.10.tar.gz) = 04cf8b61e35dba6d5281f1edec46e688d7afd1a01dfa27c391bf5b61aa891ab9
-SIZE (cabal/system-fileio-0.3.10.tar.gz) = 15241
+SHA256 (cabal/system-fileio-0.3.11.tar.gz) = eb13a13315dd946f2a827258465089531c47ca2ad436c446a2a9e3f5e1cfd242
+SIZE (cabal/system-fileio-0.3.11.tar.gz) = 15498
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index 25790a7af3c7..b2da79163fe4 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -2,6 +2,7 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index fc1125f7d81d..9663f8bb7bee 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagged
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index b7d3b3be89e0..851fb831281c 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,6 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.1.2.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
index c2722fa786d2..73e23328f634 100644
--- a/devel/hs-terminfo/Makefile
+++ b/devel/hs-terminfo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= terminfo
PORTVERSION= 0.3.2.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 7e425908169f..52911f6aa59c 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 246d8bdcf1ec..fa761d787d00 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -2,6 +2,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.3.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index fa45e73a88a0..1716a8cdfc9b 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,6 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index bb30e8d2a2ef..6324249b4de5 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -3,7 +3,7 @@
PORTNAME= testpack
PORTVERSION= 2.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index aff49fb4721a..2822db17d83d 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -2,6 +2,7 @@
PORTNAME= text
PORTVERSION= 0.11.2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index 7d6d41481374..fd254cbe7dd3 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -2,6 +2,7 @@
PORTNAME= threads
PORTVERSION= 0.5.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index ab1cc0fc1ceb..8cd19bc0851c 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -2,6 +2,7 @@
PORTNAME= threadscope
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 94ea5b54ad08..64716d4f8616 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
new file mode 100644
index 000000000000..93b4df6ad0ed
--- /dev/null
+++ b/devel/hs-timezone-olson/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= timezone-olson
+PORTVERSION= 0.1.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Pure Haskell parser and renderer for binary Olson timezone files
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= timezone-series>=0.1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
new file mode 100644
index 000000000000..cb7d4fa40aba
--- /dev/null
+++ b/devel/hs-timezone-olson/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/timezone-olson-0.1.2.tar.gz) = 3ee1eb5401607750d328cc6ec3dc6b93f4290dc77e2d7f8f60629cbeefb5e0b6
+SIZE (cabal/timezone-olson-0.1.2.tar.gz) = 11598
diff --git a/devel/hs-timezone-olson/pkg-descr b/devel/hs-timezone-olson/pkg-descr
new file mode 100644
index 000000000000..838e25d3f8ea
--- /dev/null
+++ b/devel/hs-timezone-olson/pkg-descr
@@ -0,0 +1,4 @@
+A parser and renderer for binary Olson timezone files whose format is
+specified by the tzfile(5) man page on Unix-like systems.
+
+WWW: http://projects.haskell.org/time-ng/
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
new file mode 100644
index 000000000000..7ddd44600e81
--- /dev/null
+++ b/devel/hs-timezone-series/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= timezone-series
+PORTVERSION= 0.1.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Enhanced timezone handling for Data.Time
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
new file mode 100644
index 000000000000..24dac99ba607
--- /dev/null
+++ b/devel/hs-timezone-series/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/timezone-series-0.1.2.tar.gz) = f719e45de1679c130759df553385739a58ebffcd6f93b3e02a2df6ca67a89b32
+SIZE (cabal/timezone-series-0.1.2.tar.gz) = 5923
diff --git a/devel/hs-timezone-series/pkg-descr b/devel/hs-timezone-series/pkg-descr
new file mode 100644
index 000000000000..e5828eff94cf
--- /dev/null
+++ b/devel/hs-timezone-series/pkg-descr
@@ -0,0 +1,5 @@
+This package endows Data.Time, from the time package, with several data
+types and functions for enhanced processing of timezones. For one way to
+create timezone series, see the timezone-olson package.
+
+WWW: http://projects.haskell.org/time-ng/
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 817cb6ba4dd8..b6806522836e 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index 6cd592e4ed92..2d295f282c9c 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -3,7 +3,7 @@
PORTNAME= transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 86df2b201139..b8501ed23805 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 643499f63cb3..e44ea73adea1 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,6 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.10
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index f8896cd2e426..8aeb74fd09e9 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.0.0
+PORTVERSION= 0.4.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index 405124344052..af0fc77fca94 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.4.0.0.tar.gz) = 28a77f4a6aabc5893461963c1943d4040a099fd4028b07dc569e55261bde1076
-SIZE (cabal/unix-compat-0.4.0.0.tar.gz) = 13004
+SHA256 (cabal/unix-compat-0.4.1.0.tar.gz) = f1cbbf9234baa1d385c3f4fb3f1bd06f97b5ff0e5d5a329977eb8b64de1fb594
+SIZE (cabal/unix-compat-0.4.1.0.tar.gz) = 13013
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index 4b09fa6f4747..bf0bc8f1eee9 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -2,6 +2,7 @@
PORTNAME= unix-time
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index 6153a00a1c4d..d48b6c62ac5f 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.2.1
+PORTVERSION= 0.2.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index 29ba19f3d49b..d950e9daf7dc 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.2.1.tar.gz) = fe9bacdc6649dc8b196d9ab1a28ba5e2ac60fef37f6aebc0f50332c0fbe1c85b
-SIZE (cabal/unordered-containers-0.2.2.1.tar.gz) = 23129
+SHA256 (cabal/unordered-containers-0.2.3.0.tar.gz) = edb6a442ef9fcf4ce59f66871d51df5c012345fce95970127e75b62e5396efef
+SIZE (cabal/unordered-containers-0.2.3.0.tar.gz) = 25362
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index 6d7589ac4a58..1538f34fb6fb 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 5e2359da5eac..28b021f9c77c 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-string
PORTVERSION= 0.3.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 408527231ae7..c208f7f56978 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -3,7 +3,7 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 3eb43ce00437..74f57a4b9119 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 74c6cc5a722a..ae78f759fb44 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -2,6 +2,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.0.4.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 4d10950abecf..460fdb206abc 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.42.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 6e48ed546c59..ff2270bde0ed 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uulib
PORTVERSION= 0.9.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index b67b25511e3a..0b677e4b7baa 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.2.0.1
+PORTVERSION= 0.2.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable unordered-containers>=0.2.1.0
+USE_CABAL= hashable>=1.1 unordered-containers>=0.2.1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index eba7b50c3d6d..9464ba2d9bd3 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vault-0.2.0.1.tar.gz) = b8e3164c7cbcefc2823c31495111cec79613a0d33db1cd8143e9da56ed7afc08
-SIZE (cabal/vault-0.2.0.1.tar.gz) = 4760
+SHA256 (cabal/vault-0.2.0.4.tar.gz) = c32a85ee84455c3a03ed7142d5adb60d2e7e0e467ba6458c549c5c3db3cac3a8
+SIZE (cabal/vault-0.2.0.4.tar.gz) = 4883
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 5af066576394..373542c04f6f 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -2,6 +2,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.5.4.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index e58d834569f2..973a064cc343 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -2,6 +2,7 @@
PORTNAME= vector
PORTVERSION= 0.10.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index e2d3909fa822..9e71069fc06a 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.5.8
+PORTVERSION= 0.5.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell 98 logically uninhabited data type
+COMMENT= Haskell 98 logically uninhabited data type
LICENSE= BSD
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index 2ab856ada36f..1871b547c8e5 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.5.8.tar.gz) = ff08bd4c291efa15a750bcf35b9cc8f4c60d84ecf4fc735288249ec36eb31cc7
-SIZE (cabal/void-0.5.8.tar.gz) = 2273
+SHA256 (cabal/void-0.5.11.tar.gz) = 660f593e5fae6f32e309c946ae7c7a63837b4c6bb03f3676f99381072d63283a
+SIZE (cabal/void-0.5.11.tar.gz) = 2521
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 34f40e0cf4bd..ef8251e07a49 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= word8
-PORTVERSION= 0.0.2
+PORTVERSION= 0.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 8c2c3109e9d5..4206b9457c52 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/word8-0.0.2.tar.gz) = cbb6c4c816ed515428427c6afd8487403e2689d6b1f31f75d623c99960a14846
-SIZE (cabal/word8-0.0.2.tar.gz) = 4482
+SHA256 (cabal/word8-0.0.3.tar.gz) = 458473a9a6c20e755197d5a8cf6e31cbfa88e84b5318e6103ffcb57843c2bacc
+SIZE (cabal/word8-0.0.3.tar.gz) = 5848
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 9ffa9faccee9..5912be1e3981 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
+PORTREVISION= 1
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index c304289fa5e7..893b9ddf5a89 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 26c965f0eb02..d819e4a6f364 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cairo
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 4a3edcb091a8..833b51589b63 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dia-base
PORTVERSION= 0.1.1.2
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index 16b5f0a6e3a3..1194ada00b42 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dia-functions
PORTVERSION= 0.2.1.3
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index 49a30ebe7739..6d5f7197977c 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= soegtk
PORTVERSION= 0.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index ed8f868d1b1a..d4cfeec500d6 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= svgcairo
PORTVERSION= 0.12.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 6a3c01ede6ea..502c08e9dfaa 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ghc
PORTVERSION= 7.4.2
+PORTREVISION= 1
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -26,6 +27,7 @@ CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.*
USE_BZIP2= yes
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
+USE_AUTOTOOLS= autoconf autoheader
USE_PERL5_BUILD= yes
USE_GMAKE= yes
USE_ICONV= yes
@@ -36,6 +38,7 @@ USE_NCURSES= yes
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
+MAKE_JOBS_SAFE= yes
MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
# The configure process accepts,filters and canonicalises
@@ -66,6 +69,10 @@ OPTIONS_DEFINE+= BOOTH
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDYNAMIC}
+LIB_DEPENDS+= ffi.6:${PORTSDIR}/devel/libffi
+.endif
+
.if empty(PORT_OPTIONS:MBOOT)
EXTRA_PATCHES= ${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in
@@ -108,11 +115,18 @@ HACKAGE_SITE?= http://hackage.haskell.org/
HACKAGE_ARCH?= packages/archive/
CONFIGURE_ARGS= --with-gcc=${CC} \
+ --with-ld=${LD} \
--with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib \
--with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
+.if ${PORT_OPTIONS:MDYNAMIC}
+CONFIGURE_ARGS+= --with-system-libffi \
+ --with-ffi-includes=${LOCALBASE}/include \
+ --with-ffi-libraries=${LOCALBASE}/lib
+.endif
+
.if empty(PORT_OPTIONS:MBOOT)
BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 55efc4943188..107dda7a3b31 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -80,10 +80,6 @@ BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
USE_BINUTILS= yes
USE_GCC= 4.6+
-.if ${PORT_OPTIONS:MDYNAMIC}
-LIB_DEPENDS+= ffi:${PORTSDIR}/devel/libffi
-.endif
-
CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
--with-ranlib=${RANLIB}
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 4e5a4ab72fee..749258a2e05b 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -34,7 +34,9 @@ authenticate_port= www/hs-authenticate
base-unicode-symbols_port= devel/hs-base-unicode-symbols
base16-bytestring_port= devel/hs-base16-bytestring
base64-bytestring_port= devel/hs-base64-bytestring
+base64-conduit_port= devel/hs-base64-conduit
basic-prelude_port= devel/hs-basic-prelude
+bifunctors_port= devel/hs-bifunctors
bio_port= science/hs-bio
bits-atomic_port= devel/hs-bits-atomic
blaze-builder_port= devel/hs-blaze-builder
@@ -61,6 +63,7 @@ certificate_port= security/hs-certificate
cgi_port= www/hs-cgi
checkers_port= devel/hs-checkers
cipher-aes_port= security/hs-cipher-aes
+cipher-rc4_port= security/hs-cipher-rc4
citeproc-hs_port= textproc/hs-citeproc-hs
classy-prelude_port= devel/hs-classy-prelude
classy-prelude-conduit_port= devel/hs-classy-prelude-conduit
@@ -68,6 +71,7 @@ clientsession_port= security/hs-clientsession
cmdargs_port= devel/hs-cmdargs
comonad_port= math/hs-comonad
comonad-transformers_port= math/hs-comonad-transformers
+comonads-fd_port= math/hs-comonads-fd
conduit_port= devel/hs-conduit
ConfigFile_port= devel/hs-ConfigFile
configurator_port= devel/hs-configurator
@@ -81,7 +85,10 @@ criterion_port= benchmarks/hs-criterion
Crypto_port= security/hs-Crypto
crypto-api_port= security/hs-crypto-api
crypto-conduit_port= security/hs-crypto-conduit
+crypto-numbers_port= security/hs-crypto-numbers
+crypto-pubkey_port= security/hs-crypto-pubkey
crypto-pubkey-types_port= security/hs-crypto-pubkey-types
+crypto-random-api_port= security/hs-crypto-random-api
cryptocipher_port= security/hs-cryptocipher
cryptohash_port= security/hs-cryptohash
css-text_port= www/hs-css-text
@@ -105,11 +112,13 @@ distributive_port= math/hs-distributive
dlist_port= devel/hs-dlist
double-conversion_port= textproc/hs-double-conversion
edit-distance_port= devel/hs-edit-distance
+either_port= devel/hs-either
email-validate_port= mail/hs-email-validate
entropy_port= security/hs-entropy
enumerator_port= devel/hs-enumerator
epic_port= lang/hs-epic # executable
erf_port= math/hs-erf
+errors_port= devel/hs-errors
failure_port= devel/hs-failure
fast-logger_port= devel/hs-fast-logger
fastcgi_port= www/hs-fastcgi # lib_depends
@@ -121,6 +130,7 @@ filestore_port= devel/hs-filestore
filesystem-conduit_port= devel/hs-filesystem-conduit
fsnotify_port= devel/hs-fsnotify
gconf_port= devel/hs-gconf
+generic-deriving_port= devel/hs-generic-deriving
ghc-events_port= devel/hs-ghc-events # executable
ghc-mtl_port= devel/hs-ghc-mtl
ghc-paths_port= devel/hs-ghc-paths
@@ -130,6 +140,7 @@ gitit_port= www/hs-gitit # executable
glade_port= devel/hs-glade
glib_port= devel/hs-glib
GLUT_port= x11-toolkits/hs-GLUT
+groupoids_port= math/hs-groupoids
gstreamer_port= multimedia/hs-gstreamer
gtk_port= x11-toolkits/hs-gtk
gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable
@@ -189,6 +200,7 @@ language-c_port= devel/hs-language-c
language-javascript_port= devel/hs-language-javascript
largeword_port= devel/hs-largeword
lazysmallcheck_port= devel/hs-lazysmallcheck
+lens_port= devel/hs-lens
lhs2tex_port= textproc/hs-lhs2tex
libmpd_port= audio/hs-libmpd
libxml_port= textproc/hs-libxml
@@ -210,11 +222,13 @@ monad-par-extras_port= devel/hs-monad-par-extras
MonadCatchIO-mtl_port= devel/hs-MonadCatchIO-mtl
MonadCatchIO-transformers_port= devel/hs-MonadCatchIO-transformers
monadcryptorandom_port= security/hs-monadcryptorandom
+MonadRandom_port= devel/hs-MonadRandom
mtl_port= devel/hs-mtl
mueval_port= devel/hs-mueval # executable
murmur-hash_port= devel/hs-murmur-hash
mwc-random_port= math/hs-mwc-random
mysql_port= databases/hs-mysql
+nats_port= math/hs-nats
network_port= net/hs-network
network-conduit_port= net/hs-network-conduit
network-info_port= net/hs-network-info
@@ -243,6 +257,8 @@ pool-conduit_port= devel/hs-pool-conduit
porte_port= ports-mgmt/hs-porte # executable
primitive_port= devel/hs-primitive
probability_port= math/hs-probability
+profunctor-extras_port= devel/hs-profunctor-extras
+profunctors_port= devel/hs-profunctors
project-template_port= devel/hs-project-template
PSQueue_port= devel/hs-PSQueue
pureMD5_port= security/hs-pureMD5
@@ -254,6 +270,7 @@ reactive_port= devel/hs-reactive
ReadArgs_port= devel/hs-ReadArgs
readline_port= devel/hs-readline
recaptcha_port= www/hs-recaptcha
+reflection_port= devel/hs-reflection
regex-base_port= textproc/hs-regex-base
regex-compat_port= textproc/hs-regex-compat
regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin
@@ -265,6 +282,7 @@ safe_port= devel/hs-safe
SafeSemaphore_port= devel/hs-SafeSemaphore
scgi_port= www/hs-scgi
sendfile_port= net/hs-sendfile
+semigroupoid-extras_port= math/hs-semigroupoid-extras
semigroupoids_port= math/hs-semigroupoids
semigroups_port= math/hs-semigroups
setenv_port= devel/hs-setenv
@@ -314,6 +332,8 @@ text_port= devel/hs-text
threads_port= devel/hs-threads
threadscope_port= devel/hs-threadscope # executable
time-compat_port= devel/hs-time-compat
+timezone-olson_port= devel/hs-timezone-olson
+timezone-series_port= devel/hs-timezone-series
tls_port= security/hs-tls
tls-extra_port= security/hs-tls-extra
transformers_port= devel/hs-transformers
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
new file mode 100644
index 000000000000..f288e6b77221
--- /dev/null
+++ b/lang/ghc/files/patch-aclocal.m4
@@ -0,0 +1,47 @@
+--- aclocal.m4.orig 2012-06-06 19:10:25.000000000 +0200
++++ aclocal.m4 2013-02-03 01:28:58.024638318 +0100
+@@ -19,6 +19,8 @@
+ # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
+ # so this justs uses $bootstrap_target.
+
++ bootstrap_target=`echo "$bootstrap_target" | sed -e 's/-unknown-/-portbld-/g'`
++
+ if test "$build_alias" = ""
+ then
+ if test "$bootstrap_target" != ""
+@@ -157,7 +159,7 @@
+ i386)
+ test -z "[$]2" || eval "[$]2=ArchX86"
+ ;;
+- x86_64)
++ x86_64|amd64)
+ GET_ARM_ISA()
+ test -z "[$]2" || eval "[$]2=ArchX86_64"
+ ;;
+@@ -186,7 +188,7 @@
+
+ checkVendor() {
+ case [$]1 in
+- dec|unknown|hp|apple|next|sun|sgi|ibm)
++ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld)
+ ;;
+ *)
+ echo "Unknown vendor [$]1"
+@@ -1835,7 +1837,7 @@
+ vax)
+ $2="vax"
+ ;;
+- x86_64)
++ x86_64|amd64)
+ $2="x86_64"
+ ;;
+ *)
+@@ -1875,7 +1877,7 @@
+ freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+ $2="$1"
+ ;;
+- freebsd8) # like i686-gentoo-freebsd8
++ freebsd*) # like i686-gentoo-freebsd8
+ $2="freebsd"
+ ;;
+ *)
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
deleted file mode 100644
index 3383b16e1a76..000000000000
--- a/lang/ghc/files/patch-configure
+++ /dev/null
@@ -1,103 +0,0 @@
---- 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"
- ;;
-- x86_64)
-- BuildArch="x86_64"
-+ x86_64|amd64)
-+ BuildArch="amd64"
- ;;
- *)
- echo "Unknown CPU $build_cpu"
-@@ -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"
- ;;
-- freebsd8) # like i686-gentoo-freebsd8
-+ freebsd*) # like i686-gentoo-freebsd8
- BuildOS="freebsd"
- ;;
- *)
-@@ -3486,8 +3486,8 @@
- vax)
- HostArch="vax"
- ;;
-- x86_64)
-- HostArch="x86_64"
-+ x86_64|amd64)
-+ HostArch="amd64"
- ;;
- *)
- echo "Unknown CPU $host_cpu"
-@@ -3600,8 +3600,8 @@
- vax)
- TargetArch="vax"
- ;;
-- x86_64)
-- TargetArch="x86_64"
-+ x86_64|amd64)
-+ TargetArch="amd64"
- ;;
- *)
- echo "Unknown CPU $target_cpu"
-@@ -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.
-@@ -5772,7 +5774,7 @@
- i386)
- test -z "$2" || eval "$2=ArchX86"
- ;;
-- x86_64)
-+ x86_64|amd64)
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-@@ -5953,7 +5955,7 @@
-
- checkVendor() {
- case $1 in
-- dec|unknown|hp|apple|next|sun|sgi|ibm)
-+ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld)
- ;;
- *)
- echo "Unknown vendor $1"
-@@ -5976,7 +5978,7 @@
- mingw32)
- test -z "$2" || eval "$2=OSMinGW32"
- ;;
-- freebsd)
-+ freebsd*)
- test -z "$2" || eval "$2=OSFreeBSD"
- ;;
- kfreebsdgnu)
-@@ -9990,7 +9992,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrt $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -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 :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
--_ACEOF
--
-- LIBS="-lrt $LIBS"
--
-+ LIBS="$LIBS"
- fi
-
- for ac_func in clock_gettime timer_create timer_settime
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
new file mode 100644
index 000000000000..11139a3aa71d
--- /dev/null
+++ b/lang/ghc/files/patch-configure.ac
@@ -0,0 +1,70 @@
+--- configure.ac.orig 2012-06-06 19:10:25.000000000 +0200
++++ configure.ac 2013-02-02 17:31:55.193634655 +0100
+@@ -89,6 +89,59 @@
+ fi
+ WithGhc="$GHC"])
+
++# system libffi
++
++AC_ARG_WITH([system-libffi],
++[AC_HELP_STRING([--with-system-libffi],
++ [Use system provided libffi for RTS [default=no]])
++])
++
++AS_IF([test "x$with_system_libffi" = "xyes"],
++ [UseSystemLibFFI="YES"], [UseSystemLibFFI="NO"]
++)
++
++AC_SUBST(UseSystemLibFFI)
++
++AC_ARG_WITH([ffi-includes],
++[AC_HELP_STRING([--with-ffi-includes=ARG]
++ [Find includes for libffi in ARG [default=system default]])
++],
++[
++ if test "x$UseSystemLibFFI" != "xYES"; then
++ AC_MSG_WARN([--with-ffi-includes will be ignored, --with-system-libffi not set])
++ else
++ FFIIncludeDir="$withval" LIBFFI_CFLAGS="-I $withval"
++ fi
++])
++
++AC_SUBST(FFIIncludeDir)
++
++AC_ARG_WITH([ffi-libraries],
++[AC_HELP_STRING([--with-ffi-libraries=ARG]
++ [Find libffi in ARG [default=system default]])
++],
++[
++ if test "x$UseSystemLibFFI" != "xYES"; then
++ AC_MSG_WARN([--with-ffi-libraries will be ignored, --with-system-libffi not set])
++ else
++ FFILibDir="$withval" LIBFFI_LDFLAGS="-L$withval"
++ fi
++])
++
++AC_SUBST(FFILibDir)
++
++AS_IF([test "$UseSystemLibFFI" = "YES"], [
++ CFLAGS2="$CFLAGS"
++ CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
++ LDFLAGS2="$LDFLAGS"
++ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
++ AC_CHECK_LIB(ffi, ffi_call,
++ [AC_CHECK_HEADERS([ffi.h], [break], [])
++ AC_DEFINE([HAVE_LIBFFI], [1], [Define to 1 if you have libffi.])],
++ [UseSystemLibFFI="NO"])
++ CFLAGS="$CFLAGS2"
++ LDFLAGS="$LDFLAGS2"
++])
+
+ dnl ** Tell the make system which OS we are using
+ dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something
+@@ -717,7 +770,6 @@
+ FP_VISIBILITY_HIDDEN
+
+ dnl ** check for librt
+-AC_CHECK_LIB(rt, clock_gettime)
+ AC_CHECK_FUNCS(clock_gettime timer_create timer_settime)
+ FP_CHECK_TIMER_CREATE
+
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 00eeed367856..81f97ee717ea 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,5 +1,5 @@
---- ghc.mk.orig 2012-06-06 18:10:25.000000000 +0100
-+++ ghc.mk 2012-08-25 12:57:51.000000000 +0100
+--- ghc.mk.orig 2012-06-06 19:10:25.000000000 +0200
++++ ghc.mk 2013-01-30 16:24:02.000000000 +0100
@@ -81,6 +81,7 @@
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
@@ -8,3 +8,31 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
endif
+@@ -574,12 +575,18 @@
+ $(GHC_GENPRIMOP_DIR)
+ endif
+
++ifeq "$(UseSystemLibFFI)" "YES"
++MAYBE_LIBFFI=
++else
++MAYBE_LIBFFI=libffi
++endif
++
+ BUILD_DIRS += \
+ driver \
+ driver/ghci \
+ driver/ghc \
+ driver/haddock \
+- libffi \
++ $(MAYBE_LIBFFI) \
+ includes \
+ rts
+
+@@ -971,6 +978,7 @@
+ echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
+ echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK)
+ echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK)
++ echo "UseSystemLibFFI = $(UseSystemLibFFI)" >> $(BIN_DIST_MK)
+ cd $(BIN_DIST_PREP_DIR) && autoreconf
+ $(call removeFiles,$(BIN_DIST_PREP_TAR))
+ # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
diff --git a/lang/ghc/files/patch-mk-config.mk.in b/lang/ghc/files/patch-mk-config.mk.in
new file mode 100644
index 000000000000..ff8f0071f82f
--- /dev/null
+++ b/lang/ghc/files/patch-mk-config.mk.in
@@ -0,0 +1,15 @@
+--- ./mk/config.mk.in.orig 2012-06-06 19:10:25.000000000 +0200
++++ ./mk/config.mk.in 2013-01-30 16:24:53.000000000 +0100
+@@ -363,6 +363,12 @@
+ PapiLibDir=
+ PapiIncludeDir=
+
++# Configuration for libffi
++UseSystemLibFFI=@UseSystemLibFFI@
++# Flags to go into package.conf for rts
++FFILibDir=@FFILibDir@
++FFIIncludeDir=@FFIIncludeDir@
++
+ ################################################################################
+ #
+ # Paths (see paths.mk)
diff --git a/lang/ghc/files/patch-rts-ghc.mk b/lang/ghc/files/patch-rts-ghc.mk
new file mode 100644
index 000000000000..c03e03dea09a
--- /dev/null
+++ b/lang/ghc/files/patch-rts-ghc.mk
@@ -0,0 +1,104 @@
+--- ./rts/ghc.mk.orig 2012-06-06 19:10:25.000000000 +0200
++++ ./rts/ghc.mk 2013-01-30 16:40:21.000000000 +0100
+@@ -105,8 +105,10 @@
+ endif
+
+ ifneq "$(BINDIST)" "YES"
++ifneq "$(UseSystemLibFFI)" "YES"
+ rts_ffi_objs_stamp = rts/dist/ffi/stamp
+ rts_ffi_objs = rts/dist/ffi/*.o
++
+ $(rts_ffi_objs_stamp): $(libffi_STATIC_LIB) $(TOUCH_DEP) | $$(dir $$@)/.
+ cd rts/dist/ffi && $(AR) x ../../../$(libffi_STATIC_LIB)
+ "$(TOUCH_CMD)" $@
+@@ -119,6 +121,7 @@
+ rts/dist/build/libffi-5.dll: libffi/build/inst/bin/libffi-5.dll
+ cp $< $@
+ endif
++endif
+
+ #-----------------------------------------------------------------------------
+ # Building one way
+@@ -169,6 +172,12 @@
+
+ rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
+
++ifneq "$(UseSystemLibFFI)" "YES"
++rts_dist_FFI_SO = rts/dist/build/libffi$(soext)
++else
++rts_dist_FFI_SO =
++endif
++
+ # Making a shared library for the RTS.
+ ifneq "$$(findstring dyn, $1)" ""
+ ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
+@@ -177,10 +186,15 @@
+ "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
+ -no-auto-link-packages -Lrts/dist/build -lffi-5 `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
+ else
+-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
++ifneq "$(UseSystemLibFFI)" "YES"
++ LIBFFI_LIBS= -Lrts/dist/build -lffi
++else
++ LIBFFI_LIBS= -L$(FFILibDir)
++endif
++$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend $$(rts_dist_FFI_SO)
+ "$$(RM)" $$(RM_OPTS) $$@
+ "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
+- -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
++ -no-auto-link-packages $$(LIBFFI_LIBS) `cat rts/libs.depend` $$(rts_$1_OBJS) \
+ $$(rts_$1_DTRACE_OBJS) -o $$@
+ ifeq "$$(darwin_HOST_OS)" "1"
+ # Ensure library's install name is correct before anyone links with it.
+@@ -370,9 +384,14 @@
+ endif
+
+ # ffi.h triggers prototype warnings, so disable them here:
+-rts/Interpreter_CC_OPTS += -Wno-strict-prototypes
+-rts/Adjustor_CC_OPTS += -Wno-strict-prototypes
+-rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes
++ifeq "$(UseSystemLibFFI)" "YES"
++LIBFFI_CFLAGS = $(addprefix -I,$(FFIIncludeDir))
++else
++LIBFFI_CFLAGS =
++endif
++rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
++rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
++rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
+
+ # inlining warnings happen in Compact
+ rts/sm/Compact_CC_OPTS += -Wno-inline
+@@ -430,6 +449,21 @@
+
+ endif
+
++#-----------------------------------------------------------------------------
++# Use system provided libffi
++
++ifeq "$(UseSystemLibFFI)" "YES"
++
++rts_PACKAGE_CPP_OPTS += -DFFI_INCLUDE_DIR=$(FFIIncludeDir)
++rts_PACKAGE_CPP_OPTS += -DFFI_LIB_DIR=$(FFILibDir)
++
++else # UseSystemLibFFI==YES
++
++rts_PACKAGE_CPP_OPTS += -DFFI_INCLUDE_DIR=""
++rts_PACKAGE_CPP_OPTS += -DFFI_LIB_DIR=""
++
++endif
++
+ # -----------------------------------------------------------------------------
+ # dependencies
+
+@@ -507,7 +541,11 @@
+ INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
+ INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.dll)
+
++ifneq "$(UseSystemLibFFI)" "YES"
+ install: install_libffi_headers
++else
++install:
++endif
+
+ .PHONY: install_libffi_headers
+ install_libffi_headers :
diff --git a/lang/ghc/files/patch-rts_package.conf.in b/lang/ghc/files/patch-rts_package.conf.in
index e3f4f73239ea..de5040db75e7 100644
--- a/lang/ghc/files/patch-rts_package.conf.in
+++ b/lang/ghc/files/patch-rts_package.conf.in
@@ -1,23 +1,20 @@
-
-$FreeBSD$
-
---- rts/package.conf.in.orig
-+++ rts/package.conf.in
-@@ -31,9 +31,6 @@
- #ifdef HAVE_LIBM
- "m" /* for ldexp() */
- #endif
--#ifdef HAVE_LIBRT
-- , "rt"
--#endif
+--- ./rts/package.conf.in.orig 2012-06-06 19:10:25.000000000 +0200
++++ ./rts/package.conf.in 2013-01-30 19:04:28.000000000 +0100
+@@ -33,6 +33,9 @@
#ifdef HAVE_LIBDL
, "dl"
#endif
-@@ -141,6 +138,7 @@
- , "-u", "base_GHCziConc_runSparks_closure"
- , "-u", "base_GHCziConc_runHandlers_closure"
++#ifdef HAVE_LIBFFI
++ , "ffi"
++#endif
+ #ifdef mingw32_HOST_OS
+ ,"wsock32" /* for the linker */
+ #endif
+@@ -138,6 +141,7 @@
+ , "-u", "base_GHCziConcziSync_runSparks_closure"
+ , "-u", "base_GHCziConcziSignal_runHandlers_closure"
#endif
-+ , "-L%%LOCALBASE%%/lib"
++ , "-L%%LOCALBASE%%/lib"
/* Pick up static libraries in preference over dynamic if in earlier search
* path. This is important to use the static gmp in preference on Mac OS.
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index a8f2fe1f03c1..f86e53030995 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
index c4f906d5d150..4183c2962d0f 100644
--- a/lang/hs-epic/Makefile
+++ b/lang/hs-epic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= epic
PORTVERSION= 0.9.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 0017c10296ae..6c32487fc216 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -3,6 +3,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/whitespace/Makefile b/lang/whitespace/Makefile
index 500c814a48f3..11f3a41dd41e 100644
--- a/lang/whitespace/Makefile
+++ b/lang/whitespace/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: whitespace
-# Date created: 18 May 2006
-# Whom: Li-Lun Wang <llwang@infor.org>
-#
+# Created by: Li-Lun Wang <llwang@infor.org>
# $FreeBSD$
-#
PORTNAME= whitespace
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang
MASTER_SITES= http://compsoc.dur.ac.uk/whitespace/downloads/
DISTNAME= wspace-${PORTVERSION}
@@ -19,8 +15,9 @@ COMMENT= An interpreter for the Whitespace programming language
LICENSE= GPLv2
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
-USE_PERL5_BUILD= yes
+LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
+ ffi.6:${PORTSDIR}/devel/libffi
+USE_PERL5_BUILD= 5.8+
WRKSRC= ${WRKDIR}/WSpace
USE_GMAKE= yes
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 68322a475d23..074294676780 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= email-validate
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 6ea7870ccf0f..3aefaa692055 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mime-mail
PORTVERSION= 0.4.1.2
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 440b0f9ec698..5ac720ece153 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mime-types
-PORTVERSION= 0.1.0.0
+PORTVERSION= 0.1.0.2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
index 110219f10c56..ed8f9dbd8e55 100644
--- a/mail/hs-mime-types/distinfo
+++ b/mail/hs-mime-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-types-0.1.0.0.tar.gz) = 37f0b99e3ddcde95693c1b4586b6d7f905390dd5a8c90199f75f5b82f2358375
-SIZE (cabal/mime-types-0.1.0.0.tar.gz) = 2720
+SHA256 (cabal/mime-types-0.1.0.2.tar.gz) = 9ab9a912b905a8682fb284cd621115b195f3696499561e14c7068d2126ca70de
+SIZE (cabal/mime-types-0.1.0.2.tar.gz) = 2738
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index daf0ed1e7366..9518bf81ac34 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mime
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/Makefile b/math/Makefile
index 52f73dda5457..d06ed902271e 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -159,16 +159,20 @@
SUBDIR += hs-categories
SUBDIR += hs-comonad
SUBDIR += hs-comonad-transformers
+ SUBDIR += hs-comonads-fd
SUBDIR += hs-contravariant
SUBDIR += hs-data-lens
SUBDIR += hs-data-lens-template
SUBDIR += hs-distributive
SUBDIR += hs-erf
+ SUBDIR += hs-groupoids
SUBDIR += hs-ieee754
SUBDIR += hs-math-functions
SUBDIR += hs-mwc-random
+ SUBDIR += hs-nats
SUBDIR += hs-pointed
SUBDIR += hs-probability
+ SUBDIR += hs-semigroupoid-extras
SUBDIR += hs-semigroupoids
SUBDIR += hs-semigroups
SUBDIR += hs-statistics
diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile
index 7d28ef0dbba0..44e6d041df17 100644
--- a/math/hs-Agda-executable/Makefile
+++ b/math/hs-Agda-executable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Agda-executable
PORTVERSION= 2.3.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 6aaa8cf9d2c7..a323aeef942a 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Agda
PORTVERSION= 2.3.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= A dependently typed functional programming language and proof assistant
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable hashtables haskeline>=0.6.3.2 \
+USE_CABAL= hashable>=1.2 hashtables haskeline>=0.6.3.2 \
haskell-src-exts>=1.9.6 mtl QuickCheck>=2.3 syb>=0.1 \
xhtml zlib>=0.4.0.1
USE_ALEX= yes
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index d451dea27c94..ad9b3b70f9a2 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-10-03 22:53:16.000000000 +0200
++++ ./Agda.cabal 2013-02-05 04:15:30.000000000 +0100
@@ -71,13 +71,13 @@
if flag(use-locale)
build-depends: base >= 4.2 && < 4.6
@@ -18,6 +18,15 @@
containers >= 0.1 && < 0.5,
pretty >= 1.0 && < 1.2,
directory >= 1.0 && < 1.2,
+@@ -90,7 +90,7 @@
+ process >= 1.0.1.0 && < 1.2,
+ haskeline >= 0.6.3.2 && < 0.7,
+ xhtml == 3000.2.*,
+- hashable == 1.1.*,
++ hashable == 1.2.*,
+ hashtables == 1.0.*,
+ syb >= 0.1 && < 0.4
+ build-tools: happy >= 1.15 && < 2,
@@ -334,7 +334,7 @@
if flag(use-locale)
build-depends: base >= 4.2 && < 4.6
diff --git a/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs b/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs
new file mode 100644
index 000000000000..ef6fa31298eb
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs
@@ -0,0 +1,11 @@
+--- ./src/full/Agda/TypeChecking/Serialise.hs.orig 2012-03-12 11:09:33.000000000 +0100
++++ ./src/full/Agda/TypeChecking/Serialise.hs 2013-02-05 04:30:03.000000000 +0100
+@@ -119,7 +119,7 @@
+ -- | With direct access to the internals of 'TypeRep' this instance
+ -- could presumably be improved.
+ instance Hashable TypeRep' where
+- hash = hash . show . unTypeRep'
++ hashWithSalt n = hashWithSalt n . show . unTypeRep'
+
+ data St = St
+ { nodeE :: !(Array Int32 Node)
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 1e37581f5b63..d1e974d076eb 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= NumInstances
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 3e9e07c0aba4..864f62e836a4 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= categories
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 5307bec2f48e..5204cd51b157 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/categories-1.0.4.tar.gz) = fd18fa344f79c5659b593738484c4305421e356d9fe27d43d1a0abc16ddcbec6
-SIZE (cabal/categories-1.0.4.tar.gz) = 7916
+SHA256 (cabal/categories-1.0.5.tar.gz) = 7fce017b35ae7e273250a93070e053396c763995d148c16cdcc0110a16ed739b
+SIZE (cabal/categories-1.0.5.tar.gz) = 8992
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
index c3172f0eb326..753c865fb419 100644
--- a/math/hs-comonad-transformers/Makefile
+++ b/math/hs-comonad-transformers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= comonad-transformers
-PORTVERSION= 3.0
+PORTVERSION= 3.0.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad-transformers/distinfo b/math/hs-comonad-transformers/distinfo
index 8adf3da15462..b173e983d25a 100644
--- a/math/hs-comonad-transformers/distinfo
+++ b/math/hs-comonad-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-transformers-3.0.tar.gz) = 447ced0e4ccf9e7b008b9f487d82095f13cf6548d7c01c4363b8fe9683e951ae
-SIZE (cabal/comonad-transformers-3.0.tar.gz) = 6319
+SHA256 (cabal/comonad-transformers-3.0.1.tar.gz) = b2246025fc1f62b4950d241efd418066d23d106e0bdbafbfa3c03ffd03f8acd2
+SIZE (cabal/comonad-transformers-3.0.1.tar.gz) = 7391
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 992378a57508..dc29fc0526a5 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 3.0.0.2
+PORTVERSION= 3.0.1.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 9eafde869ed7..02bf21e22a82 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-3.0.0.2.tar.gz) = 113aca5618a478d25ce2f71718e5226f41bd0a953d4b1c906cab5543c80a0707
-SIZE (cabal/comonad-3.0.0.2.tar.gz) = 4287
+SHA256 (cabal/comonad-3.0.1.1.tar.gz) = 82418cd6783a166e6b9c17040ea1be6b3d0a17b3f55b9f8db3a61bdf71eef807
+SIZE (cabal/comonad-3.0.1.1.tar.gz) = 4302
diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile
new file mode 100644
index 000000000000..060347d9369d
--- /dev/null
+++ b/math/hs-comonads-fd/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= comonads-fd
+PORTVERSION= 3.0.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Comonad transformers using functional dependencies
+
+LICENSE= BSD
+
+USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 mtl>=2.0 \
+ semigroups>=0.8.3.1 transformers>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-comonads-fd/distinfo b/math/hs-comonads-fd/distinfo
new file mode 100644
index 000000000000..87725c14fc40
--- /dev/null
+++ b/math/hs-comonads-fd/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/comonads-fd-3.0.1.tar.gz) = deb75179224f69d6987f5c7d4186b151afa2125d35243088fa0b8c000fd7e92a
+SIZE (cabal/comonads-fd-3.0.1.tar.gz) = 3494
diff --git a/math/hs-comonads-fd/pkg-descr b/math/hs-comonads-fd/pkg-descr
new file mode 100644
index 000000000000..2854ac4d1d2d
--- /dev/null
+++ b/math/hs-comonads-fd/pkg-descr
@@ -0,0 +1,3 @@
+Comonad transformers using functional dependencies.
+
+WWW: http://github.com/ekmett/comonads-fd/
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index c0dfb0b8ed67..5883a9326a0d 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -2,7 +2,7 @@
PORTNAME= contravariant
PORTVERSION= 0.2.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index 1eef8f7d54ef..0d2fbd8c766e 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-lens-template
PORTVERSION= 2.1.7
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 3665a7f5687d..6c74b09e98a0 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-lens
PORTVERSION= 2.10.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 148ff33c9e89..de6f5ef4f374 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.2.2
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Haskell 98 distributive functors -- Dual to Traversable
LICENSE= BSD
-USE_CABAL= transformers>=0.2
+USE_CABAL= transformers>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index c1be3f8dfc35..05e44530a908 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/distributive-0.2.2.tar.gz) = 22c33561e42f105649f44ce051b17c913cb340c792b7d170c856c0b1b8c89b8f
-SIZE (cabal/distributive-0.2.2.tar.gz) = 2445
+SHA256 (cabal/distributive-0.3.tar.gz) = 4e8c782dea78698d7de89e20ddaa4c907ec0e3ba41267d53bf3b242ba6e2db7c
+SIZE (cabal/distributive-0.3.tar.gz) = 5899
diff --git a/math/hs-distributive/files/patch-distributive.cabal b/math/hs-distributive/files/patch-distributive.cabal
new file mode 100644
index 000000000000..6e956aa320cb
--- /dev/null
+++ b/math/hs-distributive/files/patch-distributive.cabal
@@ -0,0 +1,12 @@
+--- ./distributive.cabal.orig 2013-01-06 18:34:35.000000000 +0100
++++ ./distributive.cabal 2013-01-14 20:36:11.000000000 +0100
+@@ -33,8 +33,7 @@
+ library
+ build-depends:
+ base >= 4 && < 5,
+- transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 0.2
++ transformers >= 0.3 && < 0.4
+
+ hs-source-dirs: src
+ exposed-modules: Data.Distributive
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index d42e2d6bba0f..f6e4be182050 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile
new file mode 100644
index 000000000000..cf2050cc57af
--- /dev/null
+++ b/math/hs-groupoids/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= groupoids
+PORTVERSION= 3.0.1.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell 98 Groupoids
+
+LICENSE= BSD
+
+USE_CABAL= semigroupoids>=3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-groupoids/distinfo b/math/hs-groupoids/distinfo
new file mode 100644
index 000000000000..6ed86ea9df96
--- /dev/null
+++ b/math/hs-groupoids/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/groupoids-3.0.1.1.tar.gz) = c35c27bdee4f43f86e649356a41635911e8c66c9701da19515a5b178b0979d64
+SIZE (cabal/groupoids-3.0.1.1.tar.gz) = 2935
diff --git a/math/hs-groupoids/pkg-descr b/math/hs-groupoids/pkg-descr
new file mode 100644
index 000000000000..20697c4e0785
--- /dev/null
+++ b/math/hs-groupoids/pkg-descr
@@ -0,0 +1,3 @@
+Haskell 98 Groupoids.
+
+WWW: http://github.com/ekmett/groupoids/
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 55b863f8d55f..c91cc6288786 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ieee754
PORTVERSION= 0.7.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 5b3e6f7ab231..9139b85d952a 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -3,6 +3,7 @@
PORTNAME= math-functions
PORTVERSION= 0.1.1.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index f98d85452521..7865c5c0dcbd 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mwc-random
PORTVERSION= 0.12.0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-nats/Makefile b/math/hs-nats/Makefile
new file mode 100644
index 000000000000..81b7f08d7e63
--- /dev/null
+++ b/math/hs-nats/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= nats
+PORTVERSION= 0.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell 98 natural numbers
+
+LICENSE= BSD
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-nats/distinfo b/math/hs-nats/distinfo
new file mode 100644
index 000000000000..858b141455d4
--- /dev/null
+++ b/math/hs-nats/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/nats-0.1.tar.gz) = 7e87fa4ac81bc35a3f1dafca011c19b95f869ddd15e30a5348e0685ea53cf021
+SIZE (cabal/nats-0.1.tar.gz) = 3734
diff --git a/math/hs-nats/pkg-descr b/math/hs-nats/pkg-descr
new file mode 100644
index 000000000000..0fb820219cf3
--- /dev/null
+++ b/math/hs-nats/pkg-descr
@@ -0,0 +1,3 @@
+Haskell 98 natural numbers.
+
+WWW: http://github.com/ekmett/nats/
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 4535847372cb..9b4b9f5ad349 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 3.0.1
+PORTVERSION= 3.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Haskell 98 pointed and copointed data
LICENSE= BSD
-USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 data-default>=0.4 \
+USE_CABAL= comonad>=3 comonad-transformers>=3 data-default>=0.4 \
semigroupoids>=3.0 semigroups>=0.8.3.1 stm>=2.1.2.1 \
transformers>=0.2
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 9c4505a73987..25262b978d4b 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pointed-3.0.1.tar.gz) = fbcde1ac290f111c39c150737d612bf6b2a2241a870672bc01e35140f8a9f9c6
-SIZE (cabal/pointed-3.0.1.tar.gz) = 2941
+SHA256 (cabal/pointed-3.0.2.tar.gz) = 10c6aae5d0d18ae10c7901a07b6dc53eb340eaa84eca2265f04aea3a4a27e8d8
+SIZE (cabal/pointed-3.0.2.tar.gz) = 3084
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 51b1e03ddd5a..9a245b43106b 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -3,7 +3,7 @@
PORTNAME= probability
PORTVERSION= 0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile
new file mode 100644
index 000000000000..cf90c8c57d05
--- /dev/null
+++ b/math/hs-semigroupoid-extras/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= semigroupoid-extras
+PORTVERSION= 3.0.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Semigroupoids requiring Haskell extensions
+
+LICENSE= BSD
+
+USE_CABAL= comonad>=3 distributive>=0.2.2 groupoids>=3 semigroupoids>=3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-semigroupoid-extras/distinfo b/math/hs-semigroupoid-extras/distinfo
new file mode 100644
index 000000000000..f98545574921
--- /dev/null
+++ b/math/hs-semigroupoid-extras/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/semigroupoid-extras-3.0.1.tar.gz) = ed762d6c59ca75abc6fe0a7ed0119757588daca25d0ebc1681612be96bead1ac
+SIZE (cabal/semigroupoid-extras-3.0.1.tar.gz) = 5284
diff --git a/math/hs-semigroupoid-extras/pkg-descr b/math/hs-semigroupoid-extras/pkg-descr
new file mode 100644
index 000000000000..87c1c79973b3
--- /dev/null
+++ b/math/hs-semigroupoid-extras/pkg-descr
@@ -0,0 +1,3 @@
+Semigroupoids and semigroupoid operations requiring Haskell extensions.
+
+WWW: http://github.com/ekmett/semigroupoid-extras
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index 79b7b69a747c..d7af1561f6b7 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 3.0.0.1
+PORTVERSION= 3.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 4d32c8f8e662..40be9cf6c415 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroupoids-3.0.0.1.tar.gz) = d14017b00f96c632d1cdff41a117a289fd0b56af80678a66a8e9f2c8fdad9846
-SIZE (cabal/semigroupoids-3.0.0.1.tar.gz) = 11295
+SHA256 (cabal/semigroupoids-3.0.2.tar.gz) = 95bb528ddbf75fd357fbbada902060291400fa62a3734c7c7d5903ee543c234c
+SIZE (cabal/semigroupoids-3.0.2.tar.gz) = 12007
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 38a9398a986e..2256a2dbd383 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.8.4.1
+PORTVERSION= 0.9
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Haskell 98 semigroups
LICENSE= BSD
+USE_CABAL= nats>=0.1
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index e874457f890d..e596f3bf24f4 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.8.4.1.tar.gz) = d6640f352517b2aafbabed77745324336c0dc6a0df8ce462c8d88ef7aa2a9b17
-SIZE (cabal/semigroups-0.8.4.1.tar.gz) = 10240
+SHA256 (cabal/semigroups-0.9.tar.gz) = 2041f8e2abbf4098551e8980862e034dd586caba46b8f67deef7fd94a9949e33
+SIZE (cabal/semigroups-0.9.tar.gz) = 9450
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 6df0e00460d0..895ac101efe8 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -3,6 +3,7 @@
PORTNAME= statistics
PORTVERSION= 0.10.2.0
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 9fb3ea902015..8ba80b0aff24 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vector-space
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
index 56718ca1b45c..8d6a723a5db2 100644
--- a/multimedia/hs-gstreamer/Makefile
+++ b/multimedia/hs-gstreamer/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.12.1.2
+PORTREVISION= 1
CATEGORIES= multimedia haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index e24a74769540..a70d2bac2add 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
index d07e7ba4d77a..7429be6f70d5 100644
--- a/net/hs-network-conduit/Makefile
+++ b/net/hs-network-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network-conduit
-PORTVERSION= 0.6.1.1
+PORTVERSION= 0.6.2.2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-conduit/distinfo b/net/hs-network-conduit/distinfo
index 7d051e181f08..b58b9cf364eb 100644
--- a/net/hs-network-conduit/distinfo
+++ b/net/hs-network-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-conduit-0.6.1.1.tar.gz) = f6183be9112cd124e7c442a04f5bededd9b1e8107591275aadba6086839ea503
-SIZE (cabal/network-conduit-0.6.1.1.tar.gz) = 5762
+SHA256 (cabal/network-conduit-0.6.2.2.tar.gz) = ac0a0019871730fc7a2719dabd9d826b2d4580ef2b433d213a199e93385c0aed
+SIZE (cabal/network-conduit-0.6.2.2.tar.gz) = 5814
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index eefe943ba238..a43bd54b3ecf 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -2,6 +2,7 @@
PORTNAME= network-info
PORTVERSION= 0.2.0.3
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index d9127786f83d..d66f79a625d5 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -2,6 +2,7 @@
PORTNAME= network-multicast
PORTVERSION= 0.0.7
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 5ced1aa5dce5..1c8374b3dbe3 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -2,6 +2,7 @@
PORTNAME= network
PORTVERSION= 2.3.1.0
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index 61fc89193c2a..05beedcb2581 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 3f2b9bed682e..da52943ce0e3 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.8
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index fc16ce0f8d6d..28be573ec3e9 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.8
+PORTVERSION= 0.2.10
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index 705f85bdcc4e..be40ced2787a 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-sendfile-0.2.8.tar.gz) = f2846af0a582b5bd1c933f6ea74783693fae646a00dd6f538380781644459c86
-SIZE (cabal/simple-sendfile-0.2.8.tar.gz) = 7172
+SHA256 (cabal/simple-sendfile-0.2.10.tar.gz) = 55253bee2269e8f310fa95fb89881b06ae2fd8598930cd87de4279ef130a5a1e
+SIZE (cabal/simple-sendfile-0.2.10.tar.gz) = 7329
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 4844248fad1b..7b1d48d29fde 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -2,6 +2,7 @@
PORTNAME= socks
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 962a9377557c..6adc55459629 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 94e4ed334468..bcb8b52ea4b9 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hscolour
PORTVERSION= 1.20.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= print haskell
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index 15eceb1f37ac..09b6caf80e80 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bio
PORTVERSION= 0.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/Makefile b/security/Makefile
index cfa7bc399c57..cd2dbca4ab4d 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -192,11 +192,15 @@
SUBDIR += hs-SHA
SUBDIR += hs-certificate
SUBDIR += hs-cipher-aes
+ SUBDIR += hs-cipher-rc4
SUBDIR += hs-clientsession
SUBDIR += hs-cprng-aes
SUBDIR += hs-crypto-api
SUBDIR += hs-crypto-conduit
+ SUBDIR += hs-crypto-numbers
+ SUBDIR += hs-crypto-pubkey
SUBDIR += hs-crypto-pubkey-types
+ SUBDIR += hs-crypto-random-api
SUBDIR += hs-cryptocipher
SUBDIR += hs-cryptohash
SUBDIR += hs-digest
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 94b6c6c72962..e76aa7381c08 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index f345db2502a4..1ddeb27c34ce 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -2,6 +2,7 @@
PORTNAME= HsOpenSSL
PORTVERSION= 0.10.3.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 11a45a1d0854..0b2849ef17c2 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -2,6 +2,7 @@
PORTNAME= RSA
PORTVERSION= 1.2.2.0
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index e9a51d64de1f..f1a57712da6c 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -2,6 +2,7 @@
PORTNAME= SHA
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index edfe2000799b..d837627bd096 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= certificate
-PORTVERSION= 1.3.3
+PORTVERSION= 1.3.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index 70d387caa957..d910b20d8ff2 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/certificate-1.3.3.tar.gz) = 0267809fa087e14f1097e22895b7566e703ed953c8090ed35bd631d3fa907d10
-SIZE (cabal/certificate-1.3.3.tar.gz) = 14811
+SHA256 (cabal/certificate-1.3.5.tar.gz) = 92c45aa27bfef07d54fe10452f52becd823fb5348b3c29d1143ea1153d55e29d
+SIZE (cabal/certificate-1.3.5.tar.gz) = 14931
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index 67b6ee6eadcf..ee301518616f 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cipher-aes
-PORTVERSION= 0.1.5
+PORTVERSION= 0.1.7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
index 53143ba658b9..63642e31e1d0 100644
--- a/security/hs-cipher-aes/distinfo
+++ b/security/hs-cipher-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-aes-0.1.5.tar.gz) = 760e49b229443a44f36de0bb8a8acdadb2c87791fe5867f26a7a7a0e055e1858
-SIZE (cabal/cipher-aes-0.1.5.tar.gz) = 27390
+SHA256 (cabal/cipher-aes-0.1.7.tar.gz) = cf7ab769b4d1773246e482b046a4ce409b6945e71db04d7d55d9f59d094b51c5
+SIZE (cabal/cipher-aes-0.1.7.tar.gz) = 27614
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
new file mode 100644
index 000000000000..967f3f50ec56
--- /dev/null
+++ b/security/hs-cipher-rc4/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cipher-rc4
+PORTVERSION= 0.1.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast RC4 cipher implementation
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cipher-rc4/distinfo b/security/hs-cipher-rc4/distinfo
new file mode 100644
index 000000000000..99b21c10d34d
--- /dev/null
+++ b/security/hs-cipher-rc4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cipher-rc4-0.1.2.tar.gz) = 61b908f643cb123788c42e92e7c68fc376d6b094520f00cd10180e7874c5d95b
+SIZE (cabal/cipher-rc4-0.1.2.tar.gz) = 4576
diff --git a/security/hs-cipher-rc4/pkg-descr b/security/hs-cipher-rc4/pkg-descr
new file mode 100644
index 000000000000..82fc3b04a983
--- /dev/null
+++ b/security/hs-cipher-rc4/pkg-descr
@@ -0,0 +1,3 @@
+Fast RC4 cipher implementation.
+
+WWW: http://github.com/vincenthz/hs-cipher-rc4
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index 2b231aaed57f..c58591c8491a 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= clientsession
-PORTVERSION= 0.8.0.1
+PORTVERSION= 0.8.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Securely store session data in a client-side cookie
LICENSE= BSD
-USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cprng-aes>=0.2 \
- crypto-api>=0.8 cryptocipher>=0.2.5 entropy>=0.2.1 \
- skein>=0.1 tagged>=0.1
+USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cipher-aes>=0.1.7 \
+ cprng-aes>=0.2 crypto-api>=0.8 entropy>=0.2.1 skein>=0.1 \
+ tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index 97266eb163a8..24134ff36c1d 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.8.0.1.tar.gz) = bbe77263b6c12a3cf72ad3d9c1465deca8d938edb2c6dd159c8a5c3f7909d264
-SIZE (cabal/clientsession-0.8.0.1.tar.gz) = 7024
+SHA256 (cabal/clientsession-0.8.1.tar.gz) = ed5d1eeff0526f1e66fcdd183d213ee9019064e86c5b786ceda3ee09497598f4
+SIZE (cabal/clientsession-0.8.1.tar.gz) = 7089
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index b193b828259e..8837818cec27 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cprng-aes
-PORTVERSION= 0.2.4
+PORTVERSION= 0.3.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,8 @@ COMMENT= Crypto Pseudo Random Number Generator using AES
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3.0 cipher-aes>=0.1 crypto-api>=0.8 cryptocipher \
+
+USE_CABAL= cipher-aes>=0.1 crypto-api>=0.8 crypto-random-api>=0.2 \
entropy>=0.2 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index f46175c95e23..5de83538f5e5 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cprng-aes-0.2.4.tar.gz) = b2688c576c15a936e73f25334ec1202d4a199f13987c2a0d0caa5c73a4276166
-SIZE (cabal/cprng-aes-0.2.4.tar.gz) = 3832
+SHA256 (cabal/cprng-aes-0.3.4.tar.gz) = 3c0b578124c42d879bc6fe6775597249847b97fba61bfb666e0f83c12d813f4c
+SIZE (cabal/cprng-aes-0.3.4.tar.gz) = 4812
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index df5c86dbb702..6eac84ed8fb7 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-api
PORTVERSION= 0.10.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 8b0d26f188d2..1479023787b8 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-conduit
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index 72d3f10c9db3..169b97d7781c 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.4.1.tar.gz) = 9be3468c1a7d8a7c7e2004b1408414c1cc308db2fc3e8a8ca669b98119b7bfbd
-SIZE (cabal/crypto-conduit-0.4.1.tar.gz) = 6954
+SHA256 (cabal/crypto-conduit-0.4.3.tar.gz) = 33fbfb08a9c7eeb4eade92dea43f3223d65934fadfd26a0e12bf628850ae2d41
+SIZE (cabal/crypto-conduit-0.4.3.tar.gz) = 6884
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
new file mode 100644
index 000000000000..fdf937307fef
--- /dev/null
+++ b/security/hs-crypto-numbers/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= crypto-numbers
+PORTVERSION= 0.1.3
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cryptographic numbers: functions and algorithms
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= crypto-random-api>=0.2 vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-crypto-numbers/distinfo b/security/hs-crypto-numbers/distinfo
new file mode 100644
index 000000000000..980061c6b680
--- /dev/null
+++ b/security/hs-crypto-numbers/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/crypto-numbers-0.1.3.tar.gz) = a1176578b575dae470deab6214c3cb404ffcbc2c7b40ea46c9c5d3e1957db484
+SIZE (cabal/crypto-numbers-0.1.3.tar.gz) = 12074
diff --git a/security/hs-crypto-numbers/pkg-descr b/security/hs-crypto-numbers/pkg-descr
new file mode 100644
index 000000000000..3dd466508d30
--- /dev/null
+++ b/security/hs-crypto-numbers/pkg-descr
@@ -0,0 +1,3 @@
+Cryptographic numbers: functions and algorithms.
+
+WWW: http://github.com/vincenthz/hs-crypto-numbers
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 16d934a36db2..b35982e6df7a 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-pubkey-types
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
new file mode 100644
index 000000000000..5c7314146fac
--- /dev/null
+++ b/security/hs-crypto-pubkey/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= crypto-pubkey
+PORTVERSION= 0.1.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Public Key cryptography
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= crypto-numbers crypto-pubkey-types>=0.2 crypto-random-api>=0.2 \
+ cryptohash>=0.8
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey/distinfo b/security/hs-crypto-pubkey/distinfo
new file mode 100644
index 000000000000..544f2ec266a3
--- /dev/null
+++ b/security/hs-crypto-pubkey/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/crypto-pubkey-0.1.2.tar.gz) = 455b4893d8870829dece447710b073507b70e58daaae685b421b64200f2d5cd1
+SIZE (cabal/crypto-pubkey-0.1.2.tar.gz) = 38610
diff --git a/security/hs-crypto-pubkey/pkg-descr b/security/hs-crypto-pubkey/pkg-descr
new file mode 100644
index 000000000000..543e3a4ce684
--- /dev/null
+++ b/security/hs-crypto-pubkey/pkg-descr
@@ -0,0 +1,5 @@
+Public Key cryptography Supports RSA PKCS15, RSA OAEP, RSA PSS, DSA,
+ElGamal signature. Also have primitive support for Diffie Hellman, and
+ElGamal encryption.
+
+WWW: http://github.com/vincenthz/hs-crypto-pubkey
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
new file mode 100644
index 000000000000..2ce742435ce2
--- /dev/null
+++ b/security/hs-crypto-random-api/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= crypto-random-api
+PORTVERSION= 0.2.0
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple random generators API for cryptography related code
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= entropy
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-crypto-random-api/distinfo b/security/hs-crypto-random-api/distinfo
new file mode 100644
index 000000000000..7ffa524456cd
--- /dev/null
+++ b/security/hs-crypto-random-api/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/crypto-random-api-0.2.0.tar.gz) = 56e9777061bd9ce553683d097ba3a11fdc371724060b62ca103f1f291f9f897c
+SIZE (cabal/crypto-random-api-0.2.0.tar.gz) = 3397
diff --git a/security/hs-crypto-random-api/pkg-descr b/security/hs-crypto-random-api/pkg-descr
new file mode 100644
index 000000000000..412a03280268
--- /dev/null
+++ b/security/hs-crypto-random-api/pkg-descr
@@ -0,0 +1,3 @@
+Simple random generators API for cryptography related code.
+
+WWW: http://github.com/vincenthz/hs-crypto-random-api
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index ac9d1e3a75d5..706e05cd2b51 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cryptocipher
-PORTVERSION= 0.3.6
+PORTVERSION= 0.4.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal cpu>=0.1 crypto-api>=0.5 crypto-pubkey-types>=0.2 \
- primitive tagged vector>=0.7
+USE_CABAL= cereal cipher-aes cipher-rc4 cpu>=0.1 crypto-api>=0.5 \
+ crypto-pubkey-types>=0.2 primitive tagged vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 2d2307a208fc..6121358ba7bf 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptocipher-0.3.6.tar.gz) = dadc3c6ec17ab05cfa177a901f20b28b93a3e88bf8afe4cf57cd021b01a74a64
-SIZE (cabal/cryptocipher-0.3.6.tar.gz) = 43901
+SHA256 (cabal/cryptocipher-0.4.0.tar.gz) = c061b8ccca31cbf5601f98081c557d9ab223e38a5a582d0c3c365effd78776e1
+SIZE (cabal/cryptocipher-0.4.0.tar.gz) = 33337
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 3856df03bd5f..1f2d5d3fce2b 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= cryptohash
-PORTVERSION= 0.7.9
+PORTVERSION= 0.8.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of crypto hashes, fast, pure, and practical
+COMMENT= Collection of crypto hashes, fast, pure, and practical
LICENSE= BSD
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index 9650349b4b7c..b9e61666986d 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptohash-0.7.9.tar.gz) = 1f264146aac46599ce90151caab21b65ecee7dd15a4122f1ae23653a8b612bdf
-SIZE (cabal/cryptohash-0.7.9.tar.gz) = 59641
+SHA256 (cabal/cryptohash-0.8.3.tar.gz) = 6263bc5df13e463430a6a31e10f4ff64b0652dd8c4c013e1aa50c448d95a98b9
+SIZE (cabal/cryptohash-0.8.3.tar.gz) = 64654
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 42604d59f842..f9fa7ae794b5 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,6 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index ada20191254a..eb466f86e40a 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= entropy
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 86a7f8ba77a7..1f021e3e144c 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -2,6 +2,7 @@
PORTNAME= monadcryptorandom
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 412d22d99ffb..581bcf430ace 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pem
-PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTVERSION= 0.1.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/distinfo b/security/hs-pem/distinfo
index acb090ec0259..5135db667af6 100644
--- a/security/hs-pem/distinfo
+++ b/security/hs-pem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pem-0.1.1.tar.gz) = 3432927ed9fa9a5c1889986dacf3ebc1648343dcbcf0f67a191dc66a781a8b4e
-SIZE (cabal/pem-0.1.1.tar.gz) = 3613
+SHA256 (cabal/pem-0.1.2.tar.gz) = 159d8dfa67b4b05d511fbd1a749a7488a8e4fd8a06c92f4771d4f0b4cce05adc
+SIZE (cabal/pem-0.1.2.tar.gz) = 3577
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index 06e0a5d66352..7d9ed77cfe04 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.2.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 9a2dfd635a43..20e454c6d69e 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index ef50324cbe03..3bc6bfd52d65 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 0.1.0.10
+PORTVERSION= 0.1.0.11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index a2bf2a0269b9..1bc0d9ec1860 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-0.1.0.10.tar.gz) = 6c269a0f7cfafb2026846b089353fba168257628d84342ceffaa62d2bdf0d163
-SIZE (cabal/skein-0.1.0.10.tar.gz) = 117764
+SHA256 (cabal/skein-0.1.0.11.tar.gz) = 3808b64716083630c2a900e86006ca3cfedf77b59b3e56e8f271fefeb31b3e9a
+SIZE (cabal/skein-0.1.0.11.tar.gz) = 117775
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index a02c85e230c6..5c2f59550447 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tls-extra
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +11,9 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-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
+USE_CABAL= certificate>=1.3.5 cipher-aes>=0.1 cipher-rc4 crypto-pubkey \
+ crypto-random-api cryptohash>=0.6 mtl network>=2.3 \
+ pem>=0.1.0 text>=0.5 tls>=1.1.0 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls-extra/distinfo b/security/hs-tls-extra/distinfo
index f9556f9308fa..6a09495bcec5 100644
--- a/security/hs-tls-extra/distinfo
+++ b/security/hs-tls-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-extra-0.5.0.tar.gz) = 28cf154074aa9ed1c5259818b5b54394a5222a230e6b78993c140f2b292ec4e4
-SIZE (cabal/tls-extra-0.5.0.tar.gz) = 8199
+SHA256 (cabal/tls-extra-0.6.1.tar.gz) = 56391245bf5f9a6cbf3c8d80fa921606f6c98837252a2ab09912a1a0c76f833d
+SIZE (cabal/tls-extra-0.6.1.tar.gz) = 8091
diff --git a/security/hs-tls-extra/pkg-descr b/security/hs-tls-extra/pkg-descr
index 88ac47cafde3..ea59f470718d 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
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 1f7ec25ea6f5..a4ef867f3a47 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-api>=0.5 \
- cryptocipher>=0.3.0 cryptohash>=0.6 mtl network
+USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-pubkey \
+ crypto-random-api>=0.2 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 2e8b794a94c2..f2c24748af74 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-1.0.2.tar.gz) = e55472857aea73a4ea719604c983dcb0c3e31beb0aa10d0bc1fc3e2213826b3a
-SIZE (cabal/tls-1.0.2.tar.gz) = 46390
+SHA256 (cabal/tls-1.1.1.tar.gz) = f8faea5f050e7fb2a095bffa9327c37aef04e5ec45fa978d32ceecf1cb1a284a
+SIZE (cabal/tls-1.1.1.tar.gz) = 47518
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 6690ea69ed75..957e55bcf1f1 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= angel
-PORTVERSION= 0.3.3
+PORTVERSION= 0.3.4
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-angel/distinfo b/sysutils/hs-angel/distinfo
index 0528b517c802..e9d2761558bf 100644
--- a/sysutils/hs-angel/distinfo
+++ b/sysutils/hs-angel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/angel-0.3.3.tar.gz) = c8bf34b915719ff0f64a272a5245cad42e49572116471ac30d9fd36d99a8edeb
-SIZE (cabal/angel-0.3.3.tar.gz) = 7119
+SHA256 (cabal/angel-0.3.4.tar.gz) = 6dd2186d6527c93591cbc02cfd9867119e1138e1cc0dcb38ebbd911f87d44c2b
+SIZE (cabal/angel-0.3.4.tar.gz) = 7185
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 88217125e013..59ee49030248 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index d9fed3b6dedc..011fbefe37a2 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.1.3
-PORTREVISION= 3
+PORTVERSION= 0.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 2b4b7e81cf2f..7a8f00fd29b9 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Diff-0.1.3.tar.gz) = bc40377de386ee27e823c1427be0590c23286c6c3307387aa97fd67133f1b009
-SIZE (cabal/Diff-0.1.3.tar.gz) = 2851
+SHA256 (cabal/Diff-0.2.0.tar.gz) = f3a4bf6ae69627e67be0ba02b1d32b21442a89674d12b95067ce4ac57f9e0d96
+SIZE (cabal/Diff-0.2.0.tar.gz) = 3201
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index f8552fe9f029..d42715455fb6 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= HStringTemplate
PORTVERSION= 0.6.12
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index eb20245f12d9..f6bc34bbd443 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= HaXml
PORTVERSION= 1.23.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 4066ec2f8c4d..35017507d093 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec-conduit
PORTVERSION= 0.5.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index ae723758bc31..20285e3330d7 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index dfc1c913f5dc..bb39514275ab 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.10.2.0
-PORTREVISION= 2
+PORTVERSION= 0.10.3.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index 3732a9353584..dddb24578e60 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-0.10.2.0.tar.gz) = 2c9cff6ec6415321b2c76eb20d21b07bd1d5c4df4aec490d60ad433b87e97343
-SIZE (cabal/attoparsec-0.10.2.0.tar.gz) = 34080
+SHA256 (cabal/attoparsec-0.10.3.0.tar.gz) = a04426cf283367814e8e69751fd6ae3a2ba4d834765cd0b7cb375b6f9fb38cd0
+SIZE (cabal/attoparsec-0.10.3.0.tar.gz) = 36214
diff --git a/textproc/hs-attoparsec/pkg-descr b/textproc/hs-attoparsec/pkg-descr
index dd1cb996de25..3c34b4c6a86a 100644
--- a/textproc/hs-attoparsec/pkg-descr
+++ b/textproc/hs-attoparsec/pkg-descr
@@ -1,5 +1,4 @@
-A fast parser combinator library, aimed particularly at dealing
-efficiently with network protocols and complicated text/binary file
-formats.
+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
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 3016b84c42dc..3bff6de6fbd0 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.5.1.1
+PORTVERSION= 0.5.1.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 01b89de0a932..2384f90c44e8 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.5.1.1.tar.gz) = 82aa58b0ba1a9cf872f3aae8ac1c09dc36e6e6f40b3a2bfa4efe6a02afb334fc
-SIZE (cabal/blaze-html-0.5.1.1.tar.gz) = 77442
+SHA256 (cabal/blaze-html-0.5.1.3.tar.gz) = 3c40a8a1169207baea6267ce2b657f9d0d136e023815c48931875143c6bc4745
+SIZE (cabal/blaze-html-0.5.1.3.tar.gz) = 77446
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 64321689a6d5..78c8bebc81f7 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.2
+PORTVERSION= 0.5.1.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A blazingly fast markup combinator library for Haskell
+COMMENT= Blazingly fast markup combinator library
LICENSE= BSD
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index 195c2548b4f2..d8c2ac50968f 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.2.tar.gz) = 15467d380656a8afc46568a54ed032ed7b3ffff8a877bb676e239d3256651cc7
-SIZE (cabal/blaze-markup-0.5.1.2.tar.gz) = 11892
+SHA256 (cabal/blaze-markup-0.5.1.4.tar.gz) = 39933d9b6f966c2f08ae72bc00142aa44277d50866240e90f166fb332136613c
+SIZE (cabal/blaze-markup-0.5.1.4.tar.gz) = 11889
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 7111a68f8f7d..a092b092d08e 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 7163e87893bc..faea1ff0c83a 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 0.4.0.3
+PORTVERSION= 0.4.0.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +10,7 @@ COMMENT= Case insensitive string comparison
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= hashable>=1.0 text>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 2cbbcc389e2e..10362bca2ab1 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-0.4.0.3.tar.gz) = ee57c6fbe4a57ec1ebcd93a75df3b9ed2023249636e36e0bdc35c6eeb8ebeed2
-SIZE (cabal/case-insensitive-0.4.0.3.tar.gz) = 3350
+SHA256 (cabal/case-insensitive-0.4.0.4.tar.gz) = 8d578b2ae3276121ab5cfb68fe9f4f008cb217eaf8b3beb7336d6d844cccf7f7
+SIZE (cabal/case-insensitive-0.4.0.4.tar.gz) = 3360
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 4bae8c548bd4..d8c15accc41a 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.6
+PORTVERSION= 0.3.7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 0a07dc5af690..4d63dde56f12 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.6.tar.gz) = 02173cb7e217b9cd962147ca7ffcf02ff4f7112ba1f5bc1bdce1bd138762bc7f
-SIZE (cabal/citeproc-hs-0.3.6.tar.gz) = 104345
+SHA256 (cabal/citeproc-hs-0.3.7.tar.gz) = 6bb498a3e1c4132565e729807119dfdce70704dacf990441a0a4a38afef1a947
+SIZE (cabal/citeproc-hs-0.3.7.tar.gz) = 105112
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 7218e58b1ba1..4d7f8ef5e81f 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 87a8a6e2fe2b..4b5b8647d571 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= double-conversion
-PORTVERSION= 0.2.0.5
+PORTVERSION= 0.2.0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast conversion between double-precision floating point and text
+COMMENT= Fast conversion between double-precision floating-point and text
LICENSE= BSD
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index 87cdcc72fa6c..e8d08bcbf0a7 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/double-conversion-0.2.0.5.tar.gz) = 0eaaa0469bbd11d40b724c47aa2b45ae1d95948d6c0a8b7c53b460eb345243fc
-SIZE (cabal/double-conversion-0.2.0.5.tar.gz) = 6830329
+SHA256 (cabal/double-conversion-0.2.0.6.tar.gz) = 57428dc3896628d9e5b6aef48104af112a90d992bddd06b723c4e1061ff0d0b0
+SIZE (cabal/double-conversion-0.2.0.6.tar.gz) = 7016270
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index e43fd92d51aa..a5a680dd9b87 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= feed
PORTVERSION= 0.3.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 8a2cae492cbb..42e4ac97e2fa 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hexpat
PORTVERSION= 0.20.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 0431537e0ed1..5bbfe88ed503 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.3.3
+PORTVERSION= 0.5.3.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 2a9a6f3845b8..6edf75bbe5be 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.3.tar.gz) = 5680414b3ca5a332f096b66bfebdfa7df185b4d2c4b58583dc644da096a05d22
-SIZE (cabal/highlighting-kate-0.5.3.3.tar.gz) = 639766
+SHA256 (cabal/highlighting-kate-0.5.3.5.tar.gz) = 637bf142fb40c7fc748b3f6ee97661799ef87c7d78fe4769b3e7f017c780e654
+SIZE (cabal/highlighting-kate-0.5.3.5.tar.gz) = 628362
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 864c263f01c5..85544129c79e 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 4.15
+PORTVERSION= 4.16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell bindings to bibutils, the bibliography conversion utilities
+COMMENT= Bindings to bibutils, the bibliography conversion utilities
LICENSE= GPLv2
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index e7aad05bca5f..0da465f8e1a3 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.15.tar.gz) = e9a75f9922667e6dd16556433d52b32a12061dc1fbe3b2dde5a9c3ea4dc45bc0
-SIZE (cabal/hs-bibutils-4.15.tar.gz) = 422396
+SHA256 (cabal/hs-bibutils-4.16.tar.gz) = abc7e96edc6dd8121252027fd14bc0f8196d1dc879e862dead8dd30e36760114
+SIZE (cabal/hs-bibutils-4.16.tar.gz) = 436535
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 2e0580653a28..74e0992e4c13 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= html-conduit
PORTVERSION= 0.1.0.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index ca5a4abe2286..b85292a2c042 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 230d817c76df..41885e1f8f6a 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 9857cc3772ee..6794b595feeb 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 73c840f414da..9653f138b360 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index 5d69dce1f762..e48d63f858f0 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 0ce27f946034..491839373a44 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.18.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index b6d901d4ad4f..24de02f19f6b 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 6964052303c8..98931676c394 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pandoc-types
PORTVERSION= 1.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7fff03286452..3bcc670b26cd 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pandoc
PORTVERSION= 1.9.4.5
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 492a95656c14..f0429c329e40 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -2,6 +2,7 @@
PORTNAME= parsec
PORTVERSION= 3.1.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index ead43e343706..065e049af281 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= polyparse
PORTVERSION= 1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 406bbe51853c..a749cc87d7b8 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 32ae29953b64..c2b4deaa5c69 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 3febeec8f8dc..1ccb9ab35ebb 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= regex-pcre-builtin
-PORTVERSION= 0.94.4.3.8.31
+PORTVERSION= 0.94.4.5.8.31
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 69c2ed0a0bc8..2d16d458674f 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 40d465882053af482b41c653c122fd26c279282a4388519413c98a36c8a76d79
-SIZE (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 287858
+SHA256 (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = ba43c3b7e711afca22363a9af4fae8a5bb2f1eae0acc48f3d549f52a194cf9b0
+SIZE (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = 287845
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 85164e98800d..233428590a16 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,6 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index d3b04482e263..65621a3b2bfc 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index 017f0617fad1..a87a92a744e0 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tagsoup
PORTVERSION= 0.12.8
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 1519a853ea28..091694c801ab 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 6c7f0e90a986..31c842e6be57 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.6.1.1
+PORTVERSION= 0.6.1.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index e737c29c24ad..b483e2df659c 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.1.1.tar.gz) = 5fe16f60c6dc282be989fb91e5074ccc5c785883612e2f6d88edc8bb650ad31b
-SIZE (cabal/texmath-0.6.1.1.tar.gz) = 43980
+SHA256 (cabal/texmath-0.6.1.3.tar.gz) = 0570c4feae01905b64656b03aeb6d0fdb7ebbc4968fcc3774b35532e939a50b8
+SIZE (cabal/texmath-0.6.1.3.tar.gz) = 43978
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index c4e0a72b8da4..cab760be4e19 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xhtml
PORTVERSION= 3000.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index f18d89c628d1..eb2c8b28625c 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-conduit
PORTVERSION= 1.0.3.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 429f138fe46d..e20ac244448c 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-types
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index e842370dc424..442426a02aeb 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xml
PORTVERSION= 1.3.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 123270d6370e..5e969e693a45 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xmlhtml
PORTVERSION= 0.2.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 034d89ef7a58..1682adf66199 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.1.1
+PORTVERSION= 0.8.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Low-level binding to the libyaml C library
+COMMENT= Support for parsing and rendering YAML documents
LICENSE= BSD
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 48741591b15a..ebeb5ce5fe6d 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.1.1.tar.gz) = 67a4e3bd1319e920724669d32947452663dcb620862f821ed9084be00a105558
-SIZE (cabal/yaml-0.8.1.1.tar.gz) = 65977
+SHA256 (cabal/yaml-0.8.2.tar.gz) = a8068a17c170e752e07647655615a4f60e14bc8cb68ac9c92f82049f5fdf03b1
+SIZE (cabal/yaml-0.8.2.tar.gz) = 66383
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index a54291edd46d..d8ca325e4a70 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -3,6 +3,7 @@
PORTNAME= HTTP
PORTVERSION= 4000.2.5
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 2319979f8ee1..3f05460c179f 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index fb1e94735016..702d408f6782 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= authenticate
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 8a8d67e281d8..bf0e3c7d2b87 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cgi
PORTVERSION= 3001.1.7.4
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= www haskell
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index 05d435464eaa..a4f9f0cc64cb 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cookie
PORTVERSION= 0.4.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 4977f575a590..eb3d1293afdd 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 78796f437d3c..9bcaf6524ffd 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index b7e216ad6e3d..9146ae9f7c7d 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.10.0.2
+PORTVERSION= 0.10.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,9 @@ COMMENT= Wiki using happstack, git or darcs, and pandoc
LICENSE= GPLv2
USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 cgi ConfigFile>=1 \
- feed>=0.3.6 filestore>=0.5 ghc-paths happstack-server>=7.0 \
+ feed>=0.3.6 filestore>=0.6 ghc-paths happstack-server>=7.0 \
highlighting-kate>=0.5.0.1 hslogger>=1 HStringTemplate>=0.6 \
- HTTP>=4000.0 json>=0.4 mtl network>=2.1.0.0 pandoc>=1.9.0.5 \
+ HTTP>=4000.0 json>=0.4 mtl network>=2.3 pandoc>=1.9.0.5 \
pandoc-types>=1.9.0.2 parsec random recaptcha>=0.1 safe SHA>1 \
syb tagsoup>=0.12 text url>=2.1 utf8-string>=0.3 \
xhtml xml>=1.3.5 xss-sanitize>=0.3 zlib>=0.5
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index 9f02bbdeb847..1b2acd82587b 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.0.2.tar.gz) = 3180e38c2d1b35cd1e215ac95a57c5e4b0cfbfae4d8c57bdba585102cba0d832
-SIZE (cabal/gitit-0.10.0.2.tar.gz) = 207370
+SHA256 (cabal/gitit-0.10.1.2.tar.gz) = 53d5074b7b2d34dbc0b2043791d52061f7e348e4fe6b877be99d99466de3c1b7
+SIZE (cabal/gitit-0.10.1.2.tar.gz) = 208344
diff --git a/www/hs-gitit/files/patch-gitit.cabal b/www/hs-gitit/files/patch-gitit.cabal
deleted file mode 100644
index 227467ec4ac2..000000000000
--- a/www/hs-gitit/files/patch-gitit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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-hS3/Makefile b/www/hs-hS3/Makefile
index d3244672e0b7..f86545cb302c 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
index 11b6247464fb..bb46432c37b4 100644
--- a/www/hs-hamlet/Makefile
+++ b/www/hs-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hamlet
-PORTVERSION= 1.1.1.1
+PORTVERSION= 1.1.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
index 5f427ce77339..5c6e47582678 100644
--- a/www/hs-hamlet/distinfo
+++ b/www/hs-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hamlet-1.1.1.1.tar.gz) = e876398ec043d1651017abd8aed13db1ad119ac8d685436097c1e96b13dcb66f
-SIZE (cabal/hamlet-1.1.1.1.tar.gz) = 18864
+SHA256 (cabal/hamlet-1.1.3.1.tar.gz) = 3154195d217cdc93b0ca13b7833fecf825c38179c3c9773ef1093a60b3d41813
+SIZE (cabal/hamlet-1.1.3.1.tar.gz) = 19012
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index f19807419448..b46bef8ce724 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= happstack-server
PORTVERSION= 7.1.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 79673d61ea32..0f2fda08bc9b 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,6 +2,7 @@
PORTNAME= happstack
PORTVERSION= 7.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 6580f16d3218..f370a3af9570 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.8.2
+PORTVERSION= 0.11.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An (x)html templating system
+COMMENT= Haskell template system supporting both HTML5 and XML
LICENSE= BSD
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 unordered-containers>=0.1.4 \
+ blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.3 \
+ hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
+ random>=1.0.1.0 text>=0.10 unordered-containers>=0.1.4 \
vector>=0.9 xmlhtml>=0.1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index f708e5a60ab6..893b546ef3b8 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.8.2.tar.gz) = 726684b48061495d7350bf018c6004214c185dc0ce2efbfb260524ecf67b557d
-SIZE (cabal/heist-0.8.2.tar.gz) = 38499
+SHA256 (cabal/heist-0.11.0.tar.gz) = fcccf0fdd7391e93ed209b97df3f59e89ed3f3c18e237ae206ddc8b6d45b7cfd
+SIZE (cabal/heist-0.11.0.tar.gz) = 59557
diff --git a/www/hs-heist/pkg-descr b/www/hs-heist/pkg-descr
index 7dccb35001b5..b6b890eae16b 100644
--- a/www/hs-heist/pkg-descr
+++ b/www/hs-heist/pkg-descr
@@ -1,3 +1,15 @@
-An xhtml templating system.
+Heist is a powerful template system that supports both HTML5 and XML.
+Some of Heist's features are:
+
+ * Designer-friendly HTML5 (or XML) syntax
+ * Templates can be reloaded to make changes visible without recompiling
+ your Haskell code
+ * Enforces near-perfect separation of business logic
+ and view
+ * Powerful abstraction primitives allowing you to eliminate repetition
+ * Easy creation of domain-specific markup languages
+ * Built-in support for including JSON and Markdown content in templates
+ * Simple mechanism for designer-specified template caching
+ * Optional merging of multiple <head> tags defined anywhere in the document
WWW: http://snapframework.com/
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index aa1debe8821e..5e6643e1db2e 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.3
+PORTVERSION= 0.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index bc6e0bf2142b..2cf660d929f9 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.3.tar.gz) = 8d7821562cc0107277af1867ddf79235c61b07e1708e5614467a4172aac6e753
-SIZE (cabal/hjsmin-0.1.3.tar.gz) = 12463
+SHA256 (cabal/hjsmin-0.1.4.tar.gz) = b6c33e6f18690cb871a3c43fb463721002ca6f0bc0773322a3c3f77381299cf0
+SIZE (cabal/hjsmin-0.1.4.tar.gz) = 116144
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 73398bbb1918..a4e95e2d53ec 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.8.4.3
+PORTVERSION= 1.8.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,12 +12,13 @@ LICENSE= BSD
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.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
+ certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.2 \
+ data-default failure>=0.1 http-types>=0.7 lifted-base>=0.1 \
+ mime-types>=0.1 monad-control>=0.3 mtl network>=2.3 \
+ random regex-compat resourcet>=0.3 socks>=0.4 text \
+ tls>=1.0.0 tls-extra>=0.5.0 transformers>=0.2 \
+ transformers-base>=0.4 utf8-string>=0.3.4 void>=0.5.5 \
+ zlib-conduit>=0.5
.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 4006518a520d..158e5c3c5987 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.8.4.3.tar.gz) = 79a44f3283972fb83358e56e0b57c8c1e9e06ca79dcc480a742deb5a45bc0cbd
-SIZE (cabal/http-conduit-1.8.4.3.tar.gz) = 32219
+SHA256 (cabal/http-conduit-1.8.7.tar.gz) = f124d0e883a3a213e362e2ba4719d3d5acb24e3ef73e2fa3a7cff4466ecf658b
+SIZE (cabal/http-conduit-1.8.7.tar.gz) = 42238
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 58a469fca52a..4540169e8188 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-date
-PORTVERSION= 0.0.3
+PORTVERSION= 0.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-date/distinfo b/www/hs-http-date/distinfo
index 39c3031115d0..df9dd8509260 100644
--- a/www/hs-http-date/distinfo
+++ b/www/hs-http-date/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-date-0.0.3.tar.gz) = d6ea5f7ba611ac2b3c534c1d57f03a1d3c5a596f613846e8031bb4f0bfa33e8a
-SIZE (cabal/http-date-0.0.3.tar.gz) = 4861
+SHA256 (cabal/http-date-0.0.4.tar.gz) = 25228b2456b319c7c777ea3673f441ddf68881da176b37c51feab2108d0175dd
+SIZE (cabal/http-date-0.0.4.tar.gz) = 4865
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index 8c0f4ddf8b76..0e94c8e835a3 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.1.0.6
+PORTVERSION= 0.1.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +12,10 @@ 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
+ classy-prelude-conduit>=0.3 conduit>=0.5 data-default \
+ http-conduit>=1.6 http-types>=0.6 lifted-base>=0.1 \
+ monad-control>=0.3 network network-conduit>=0.6 text>=0.11 \
+ wai>=1.3 warp>=1.3.4 word8>=0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index e349999924cb..6e124fbc78b8 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.1.0.6.tar.gz) = 8885e3a350e8fb9d77b8b9e2bb2e729c16695f5c18fc55f60c532c54a3ff7079
-SIZE (cabal/http-reverse-proxy-0.1.0.6.tar.gz) = 5693
+SHA256 (cabal/http-reverse-proxy-0.1.1.1.tar.gz) = 62529458a4dd6a8d04aa44c1c0906f627f0bac7c4e685f7539ab052301efe675
+SIZE (cabal/http-reverse-proxy-0.1.1.1.tar.gz) = 6323
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 1fd31b3e6a8c..a8c9f3855ba7 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 77bd379a2cba..77121eaec11c 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= http-types
PORTVERSION= 0.7.3.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 5b5182e92e1b..faf7d1e9f2a1 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= oeis
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 2846afba8b3a..b2caebb42c8e 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,6 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index b22801ce0595..607dc03822a6 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index 03a4afe41010..ed26a963b159 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -5,7 +5,7 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index 146828a4339e..d693cd267a4b 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -2,6 +2,7 @@
PORTNAME= shakespeare-css
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index 6dd05212f075..e16e2193c53b 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shakespeare-i18n
PORTVERSION= 1.0.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index 74e6f7f2fb20..725c3ab1ea2e 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-js
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
index 4ecd49756aba..a79360648dca 100644
--- a/www/hs-shakespeare-js/distinfo
+++ b/www/hs-shakespeare-js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-js-1.1.0.tar.gz) = 37412fe4e4ce4301393413c82fce2de70758e3ebb98563a360efee6e6a746165
-SIZE (cabal/shakespeare-js-1.1.0.tar.gz) = 6665
+SHA256 (cabal/shakespeare-js-1.1.1.tar.gz) = 2fab2e8c720d66a0db908cb2a5574a8090986e57b1c2104642447475e358f0f7
+SIZE (cabal/shakespeare-js-1.1.1.tar.gz) = 6750
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index 9066ae0a35f3..69f3b1a2efca 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -2,6 +2,7 @@
PORTNAME= shakespeare-text
PORTVERSION= 1.0.0.5
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index ecca6aebe408..0390f692e322 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -2,6 +2,7 @@
PORTNAME= shakespeare
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 9a925b5bcbb4..808dc53048ae 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-core
PORTVERSION= 0.9.2.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index f1196a93da88..5c49cd5c8c86 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-server
PORTVERSION= 0.9.2.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 135cc89ed11f..7a24325a456b 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.9.2.2
+PORTVERSION= 0.11.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,12 +12,13 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
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 \
+ comonad>=1.1 configurator>=0.1 directory-tree>=0.10 \
+ dlist>=0.5 either>=3.1 errors>=1.3 hashable>=1.1 \
+ heist>=0.11 lens>=3.7.0.1 logict>=0.4.2 \
MonadCatchIO-transformers>=0.2 mtl>2.0 mwc-random>=0.8 \
- 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 \
+ pwstore-fast>=2.3 regex-posix>=0.95 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 vector>=0.7.1 \
vector-algorithms>=0.4 xmlhtml>=0.1
EXECUTABLE= snap
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index 4316ee27f426..3f3085f09d1b 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.9.2.2.tar.gz) = 5cffd4c80b9afac3566192a631ae3e08aad808bd316a4ef9478d6595166289e2
-SIZE (cabal/snap-0.9.2.2.tar.gz) = 73548
+SHA256 (cabal/snap-0.11.0.tar.gz) = f65c9d56d48c36286675fd0544fc0aac12d5dd2e2cdb1ffe4a7f341965778157
+SIZE (cabal/snap-0.11.0.tar.gz) = 78524
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index eb3d361fd7b8..a37e9518b2c9 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 319d5f45638c..dc7e5da5e586 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 1.3.0.4
+PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index 2573234d210c..fa6975ffc69e 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-1.3.0.4.tar.gz) = d6464ab45fa458b32c62ee92bb1a3bcc7084d9d30e5f195417be481096e18fb5
-SIZE (cabal/wai-app-static-1.3.0.4.tar.gz) = 14841
+SHA256 (cabal/wai-app-static-1.3.1.tar.gz) = 930a8d0eb8d2cbe56346ee1c90474af2297f0b2407a9ee91aef6406c47874f64
+SIZE (cabal/wai-app-static-1.3.1.tar.gz) = 14806
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index 8705256b0a68..b0e4a73bddff 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.0.4
+PORTVERSION= 1.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index 869860fcfbd9..1e4c846fcdad 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.0.4.tar.gz) = 8cc9d864c88fc54644d10eae9c45d466afcb78fe9876c082099ddb7a234e20c5
-SIZE (cabal/wai-extra-1.3.0.4.tar.gz) = 30837
+SHA256 (cabal/wai-extra-1.3.2.tar.gz) = 03945d7bff2f10fa29ffb28ccc95b720b1f54cf277476b783e217a4996d30981
+SIZE (cabal/wai-extra-1.3.2.tar.gz) = 31367
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 3f76adc2e788..240ec7657301 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai-logger
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index 9a84f50d6f14..b6e6359835bb 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai-test
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 7217e0357089..dc4d02f7430d 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai
PORTVERSION= 1.3.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index b1714e4d31f7..57230ac48cf1 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.5
+PORTVERSION= 1.3.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 197ed9f99ea8..a185fd758bcc 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.5.tar.gz) = 9429e1d97667c98bbfc05ff36eb8a8e1b3b1da04ceb2fa658c9f5b70dbbeb143
-SIZE (cabal/warp-1.3.5.tar.gz) = 17566
+SHA256 (cabal/warp-1.3.7.1.tar.gz) = 143ec36c8065e7bb3c69c41664001c738fda6d65c2d20ebd8a0619267f674b4d
+SIZE (cabal/warp-1.3.7.1.tar.gz) = 17904
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index bc29409353fd..cdf077f90129 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
PORTVERSION= 0.12.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 260b338d7453..855a7b7cfbee 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xss-sanitize
-PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTVERSION= 0.3.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo
index 9e6f6075a25a..d3e8e0a5479b 100644
--- a/www/hs-xss-sanitize/distinfo
+++ b/www/hs-xss-sanitize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xss-sanitize-0.3.2.tar.gz) = 9db5e095347206229b9ca9261390c37760a2d9319fe6354102d1802886a0ef54
-SIZE (cabal/xss-sanitize-0.3.2.tar.gz) = 8366
+SHA256 (cabal/xss-sanitize-0.3.3.tar.gz) = 8a9cabdfa98b686fee05171af85e45ee45887ec161cac895e204d2c72dbade76
+SIZE (cabal/xss-sanitize-0.3.3.tar.gz) = 8495
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index b1b77e177eb3..0847c78d473d 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index 916879f1456b..fda7ec22b331 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.1.2.tar.gz) = 86866b63163bbf0fc79743dd27cf57c04748ddd6b06f22791b5c834271be814b
-SIZE (cabal/yesod-auth-1.1.2.tar.gz) = 17477
+SHA256 (cabal/yesod-auth-1.1.3.tar.gz) = 1f4c213371eb29a2ac8eee54ba51b871c1e263a2670d307ea89c81a5a5299766
+SIZE (cabal/yesod-auth-1.1.3.tar.gz) = 17918
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 56f63cfe373c..cfecc2fc7894 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.1.6.1
+PORTVERSION= 1.1.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +16,7 @@ USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
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 \
+ shakespeare-js>=1.0.2 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
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 0684c8151f8b..0b5fe3c65577 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.1.6.1.tar.gz) = ea3e68cdba6ce431c567178da2377ef0ddf4d5004559a1d69ab7bc7471bf675e
-SIZE (cabal/yesod-core-1.1.6.1.tar.gz) = 42497
+SHA256 (cabal/yesod-core-1.1.7.1.tar.gz) = 79b8f52264bf664a040d0b23ad7859cc98506dacfb01f33b04c67c88bc37301f
+SIZE (cabal/yesod-core-1.1.7.1.tar.gz) = 44613
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
index a598f0af1d96..0f7e43a3eeef 100644
--- a/www/hs-yesod-default/Makefile
+++ b/www/hs-yesod-default/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-default
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
index 4a10c5d4bf3d..33cbddd01c92 100644
--- a/www/hs-yesod-default/distinfo
+++ b/www/hs-yesod-default/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-default-1.1.2.tar.gz) = 68d815aa0576b9318a2378b6bc572adeafbffad2127fd4356ac0afe3544b5f2b
-SIZE (cabal/yesod-default-1.1.2.tar.gz) = 6964
+SHA256 (cabal/yesod-default-1.1.3.tar.gz) = 3e3a1b934526477cdd3e1a01aac0103470be261c9e097e41c1e22e40a55910bc
+SIZE (cabal/yesod-default-1.1.3.tar.gz) = 7089
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 4284fb3b10f6..01853c833fa8 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.2.0.1
+PORTVERSION= 1.2.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= MIT
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 \
+ persistent>=1.0 shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
yesod-core>=1.1 yesod-persistent>=1.1
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 2495348b39cb..d6f058042abf 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.2.0.1.tar.gz) = f04ae02a241d999d157fe8ced31d4004cc6cd92db72903fb137a73944354ee8f
-SIZE (cabal/yesod-form-1.2.0.1.tar.gz) = 19549
+SHA256 (cabal/yesod-form-1.2.0.2.tar.gz) = 7e6c3bf1b9a9ae251a26300feda7144ae87902dd6f4294281044d5fdb2386128
+SIZE (cabal/yesod-form-1.2.0.2.tar.gz) = 19597
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
index 87bd3c60080c..09ad16c57a57 100644
--- a/www/hs-yesod-json/Makefile
+++ b/www/hs-yesod-json/Makefile
@@ -2,6 +2,7 @@
PORTNAME= yesod-json
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index b0d1162e0272..02a457f524a5 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 39d9f7cdaa41..8f37ac5e578d 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.1.0.tar.gz) = 52a9252b613b0b05c663bd3c83a2f0b6d96850f496f97420503d26ff04db0c31
-SIZE (cabal/yesod-persistent-1.1.0.tar.gz) = 1796
+SHA256 (cabal/yesod-persistent-1.1.0.1.tar.gz) = 374c51b8ba61480053bbbed9f64118139fdcfd286cee252121c64535cf0aed4d
+SIZE (cabal/yesod-persistent-1.1.0.1.tar.gz) = 1899
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index 84a7168c1b04..4b428d75c4df 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.1.5
+PORTVERSION= 1.1.7.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,121 +9,137 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-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
+USE_CABAL= aeson==0.6.1.0 \
+ ansi-terminal==0.5.5.1 \
+ asn1-data==0.7.1_1 \
+ attoparsec==0.10.3.0 \
+ attoparsec-conduit==0.5.0.3_1 \
+ authenticate==1.3.2_1 \
+ base-unicode-symbols==0.2.2.4_1 \
+ base64-bytestring==1.0.0.0_1 \
+ base64-conduit==0.5.1 \
+ basic-prelude==0.3.2.0 \
+ blaze-builder==0.3.1.0_4 \
+ blaze-builder-conduit==0.5.0.3_1 \
+ blaze-html==0.5.1.3 \
+ blaze-markup==0.5.1.4 \
+ byteorder==1.0.3_4 \
+ case-insensitive==0.4.0.4 \
+ cereal==0.3.5.2_2 \
+ certificate==1.3.5 \
+ cipher-aes==0.1.7 \
+ cipher-rc4==0.1.2 \
+ classy-prelude==0.4.3 \
+ classy-prelude-conduit==0.4.3 \
+ clientsession==0.8.1 \
+ conduit==0.5.6 \
+ cookie==0.4.0.1_1 \
+ cprng-aes==0.3.4 \
+ crypto-api==0.10.2_3 \
+ crypto-conduit==0.4.3 \
+ crypto-numbers==0.1.3 \
+ crypto-pubkey==0.1.2 \
+ crypto-pubkey-types==0.2.0_1 \
+ crypto-random-api==0.2.0 \
+ cryptohash==0.8.3 \
+ css-text==0.1.1_4 \
+ data-default==0.5.0_1 \
+ date-cache==0.3.0_1 \
+ dlist==0.5_8 \
+ email-validate==0.3.2_1 \
+ entropy==0.2.1_4 \
+ failure==0.2.0.1_3 \
+ fast-logger==0.3.1_1 \
+ file-embed==0.0.4.7 \
+ filesystem-conduit==0.5.0.2_1 \
+ fsnotify==0.0.6 \
+ ghc-paths==0.1.0.9 \
+ hamlet==1.1.3.1 \
+ hashable==1.2.0.5 \
+ hjsmin==0.1.4 \
+ hspec==1.4.3 \
+ hspec-expectations==0.3.0.3_1 \
+ html-conduit==0.1.0.4_1 \
+ http-conduit==1.8.7 \
+ http-date==0.0.4 \
+ http-reverse-proxy==0.1.1.1 \
+ http-types==0.7.3.0.1_1 \
+ language-javascript==0.5.7_1 \
+ largeword==1.0.4 \
+ lifted-base==0.2.0.2 \
+ mime-mail==0.4.1.2_1 \
+ mime-types==0.1.0.2 \
+ monad-control==0.3.1.4_1 \
+ monad-logger==0.2.3.2 \
+ network-conduit==0.6.2.2 \
+ optparse-applicative==0.5.2.1 \
+ path-pieces==0.1.2_1 \
+ pem==0.1.2 \
+ persistent==1.1.4 \
+ persistent-template==1.1.2.1 \
+ pool-conduit==0.1.1 \
+ primitive==0.5.0.1_1 \
+ project-template==0.1.1 \
+ pureMD5==2.1.2.1_1 \
+ pwstore-fast==2.3_1 \
+ ranges==0.2.4_4 \
+ ReadArgs==1.2.1_1 \
+ resource-pool==0.2.1.1_1 \
+ resourcet==0.4.4_1 \
+ safe==0.3.3_4 \
+ semigroups==0.9 \
+ setenv==0.1.0_1 \
+ SHA==1.6.1_1 \
+ shakespeare==1.0.2_1 \
+ shakespeare-css==1.0.2_1 \
+ shakespeare-i18n==1.0.0.2_3 \
+ shakespeare-js==1.1.1 \
+ shakespeare-text==1.0.0.5_1 \
+ silently==1.2.4.1 \
+ simple-sendfile==0.2.10 \
+ skein==0.1.0.11 \
+ socks==0.4.2_1 \
+ split==0.2.1.1_1 \
+ stringsearch==0.3.6.4_1 \
+ system-fileio==0.3.11 \
+ system-filepath==0.4.7_1 \
+ tagged==0.4.4_1 \
+ tagsoup==0.12.8_1 \
+ tagstream-conduit==0.5.3_1 \
+ tar==0.4.0.1_1 \
+ tls==1.1.1 \
+ tls-extra==0.6.1 \
+ transformers-base==0.4.1_4 \
+ unix-compat==0.4.1.0 \
+ unordered-containers==0.2.3.0 \
+ utf8-light==0.4.0.1_3 \
+ utf8-string==0.3.7_4 \
+ vault==0.2.0.4 \
+ vector==0.10.0.1_1 \
+ void==0.5.11 \
+ wai==1.3.0.1_1 \
+ wai-app-static==1.3.1_1 \
+ wai-extra==1.3.2 \
+ wai-logger==0.3.0_1 \
+ wai-test==1.3.0_1 \
+ warp==1.3.7.1 \
+ word8==0.0.3 \
+ xml-conduit==1.0.3.3_1 \
+ xml-types==0.3.3_1 \
+ xss-sanitize==0.3.3 \
+ yaml==0.8.2 \
+ yesod==1.1.7.2 \
+ yesod-auth==1.1.3 \
+ yesod-core==1.1.7.1 \
+ yesod-default==1.1.3 \
+ yesod-form==1.2.0.2 \
+ yesod-json==1.1.2_1 \
+ yesod-persistent==1.1.0.1 \
+ yesod-routes==1.1.1.1_1 \
+ yesod-static==1.1.1.2 \
+ yesod-test==0.3.3 \
+ zlib-bindings==0.1.1.3 \
+ zlib-conduit==0.5.0.3_1
IGNORE_DYNAMIC= yes
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index ed1192b01aeb..023cb4bceb16 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.1.5.tar.gz) = 32be89dc69c3e3328b01c012fd9624b8d0e380931aa198e2e98c2d8ecbcec16b
-SIZE (cabal/yesod-platform-1.1.5.tar.gz) = 2626
+SHA256 (cabal/yesod-platform-1.1.7.2.tar.gz) = 15afde94e2e641a4be019933f63bfdd291ea16112057c35caaa92e5281c78b81
+SIZE (cabal/yesod-platform-1.1.7.2.tar.gz) = 2669
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index fba24da8af44..02ab46ac7b79 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= yesod-routes
PORTVERSION= 1.1.1.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 344414dd265d..c4ef676f5b0f 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.1.1.1
+PORTVERSION= 1.1.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index 98c006dca698..e7231f665915 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.1.1.1.tar.gz) = 5a2254ce8e596974421b312ee42506706512ddc00bd06fdcb5292acda38ce3f2
-SIZE (cabal/yesod-static-1.1.1.1.tar.gz) = 6741
+SHA256 (cabal/yesod-static-1.1.1.2.tar.gz) = 5c836f2cb9d0db62bb93ae4864a02bcc56694cbcc5d71d577524b686f1cf7b74
+SIZE (cabal/yesod-static-1.1.1.2.tar.gz) = 6735
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index 814d120f372a..cd4786a50e01 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 0.3.1.1
+PORTVERSION= 0.3.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,11 +9,12 @@ 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.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
+USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
+ blaze-markup>=0.5.1 case-insensitive>=0.2 cookie hspec>=1.4 \
+ html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \
+ network>=2.2 persistent>=1.0 pool-conduit text \
+ transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \
+ xml-types>=0.3
.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 2407538aee57..465d58ed7245 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-0.3.1.1.tar.gz) = 6fd9c2bab18f007feed74840a3593d328abdc5c05b4cf9b7308c75c03d48645c
-SIZE (cabal/yesod-test-0.3.1.1.tar.gz) = 10874
+SHA256 (cabal/yesod-test-0.3.3.tar.gz) = a3178abdae5c25b36053c188efd84b6878bf6c2a330bc8b5118d1790320864c9
+SIZE (cabal/yesod-test-0.3.3.tar.gz) = 10952
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index 2b1d0a3fd4fa..d7634fb2724d 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.1.4.1
+PORTVERSION= 1.1.7.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,14 +13,14 @@ 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 \
+ monad-control>=0.3 network network-conduit \
+ optparse-applicative>=0.4 parsec>=2.1 project-template>=0.1.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-core>=1.1.5 yesod-default>=1.1.3 yesod-form>=1.1 \
yesod-json>=1.1 yesod-persistent>=1.1 zlib>=0.5
EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index b2a387db83fa..154405ebd6be 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.1.4.1.tar.gz) = 8309a920f38e2cae1f8460e7bedd42e77fbdfa88b228134718815f0759f2e337
-SIZE (cabal/yesod-1.1.4.1.tar.gz) = 279377
+SHA256 (cabal/yesod-1.1.7.2.tar.gz) = a0ae89e16f4be18e2df3fdbec4a4622c0aa91b20974630deb14d0f732bfbbd57
+SIZE (cabal/yesod-1.1.7.2.tar.gz) = 282720
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 66ee5d39ff96..5916874a3780 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= GLUT
PORTVERSION= 2.1.2.1
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index dfb4e94ad04d..685b58e77dd7 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenGL
PORTVERSION= 2.2.3.1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index 4a1bb60e2f2f..e7a0cc21a5e1 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gtk
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 1ce8b55b7ecb..bb445bae6d7f 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtk2hs
PORTVERSION= 0.12.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index 805847f1ba8d..68d68940b85c 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtkglext
PORTVERSION= 0.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 003f11dc5893..81fc71b513de 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.12.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 24f5a8305601..ca02c77519c3 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pango
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index cc58e6677c37..4f309de38991 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vte
PORTVERSION= 0.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 0b798c3aac5c..02f9b70a0c68 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wx
PORTVERSION= 0.90.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 2bcd16367a97..3cbecf8259be 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxc
PORTVERSION= 0.90.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 9d63750832e9..5d146c9555a2 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxcore
PORTVERSION= 0.90.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index e4d4747108ee..fc94df2cd0f3 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxdirect
PORTVERSION= 0.90.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 9e3c55efe1a8..ef88a9d5a18c 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
-PORTVERSION= 0.10
-PORTREVISION= 4
+PORTVERSION= 0.11
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
+COMMENT= Third-party extensions for xmonad
LICENSE= BSD
-USE_CABAL= mtl random utf8-string X11>=1.5.0.0 xmonad>=0.10
+USE_CABAL= mtl random utf8-string X11>=1.6 xmonad>=0.11
USE_XORG= x11
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
@@ -19,13 +18,15 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
OPTIONS_DEFINE= XFT
OPTIONS_DEFAULT= XFT
-XFT_DESC= Enable Xft support for fonts
+XFT_DESC= Use Xft to render text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+= --flags="use_xft"
USE_CABAL+= X11-xft>=0.2
+.else
+CONFIGURE_ARGS+= --flags="-use_xft"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 51fc3c2547c0..29efffcbc110 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.10.tar.gz) = d8c1a37d88270a45b68e347c056e0f487f739780af413b87265ede9c4cc6e752
-SIZE (cabal/xmonad-contrib-0.10.tar.gz) = 364522
+SHA256 (cabal/xmonad-contrib-0.11.tar.gz) = 40cf6f0b895d609165a0ddc9d6e34255ab6b39418248215aaf7c2c13b4cf0ba1
+SIZE (cabal/xmonad-contrib-0.11.tar.gz) = 402567
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 4d8b2f81f01d..3a47eb57afa8 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= xmonad
-PORTVERSION= 0.10
-PORTREVISION= 4
+PORTVERSION= 0.11
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Xmonad is a minimalist and tiling window manager for X
+COMMENT= Tiling window manager
LICENSE= BSD
-USE_CABAL= mtl utf8-string>=0.3 X11>=1.5.0.0
+USE_CABAL= mtl utf8-string>=0.3 X11>=1.5
USE_XORG= x11
MAN1= xmonad.1
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index 5df8891dfc5e..175ac674dd3e 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-0.10.tar.gz) = 4676717615d367abaf2e2bb609cf532427edfd87455268fa48552f7fcdf0e5a7
-SIZE (cabal/xmonad-0.10.tar.gz) = 57681
+SHA256 (cabal/xmonad-0.11.tar.gz) = e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb
+SIZE (cabal/xmonad-0.11.tar.gz) = 59119
diff --git a/x11-wm/hs-xmonad/pkg-descr b/x11-wm/hs-xmonad/pkg-descr
index 8b12cb63b0a8..383a980a46e0 100644
--- a/x11-wm/hs-xmonad/pkg-descr
+++ b/x11-wm/hs-xmonad/pkg-descr
@@ -1,10 +1,11 @@
-xmonad is a tiling window manager for X. Windows are arranged
+xmonad is a tiling window manager for X. Windows are arranged
automatically to tile the screen without gaps or overlap, maximising
-screen use. All features of the window manager are accessible from the
-keyboard: a mouse is strictly optional. xmonad is written and extensible
-in Haskell. Custom layout algorithms, and other extensions, may be
-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.
+screen use. All features of the window manager are accessible from the
+keyboard: a mouse is strictly optional. xmonad is written and
+extensible in Haskell. Custom layout algorithms, and other extensions,
+may be 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/
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 3623d3d824ea..e507ea8a36e1 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 54a2a91f2b07..b872356b9b8e 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -2,32 +2,17 @@
# $FreeBSD$
PORTNAME= X11
-PORTVERSION= 1.5.0.1
-PORTREVISION= 3
+PORTVERSION= 1.6.0.2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= X11 bindings for Haskell programs
+COMMENT= Binding to the X11 graphics library
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= syb
-USE_XORG= x11 xext sm
-OPTIONS_DEFINE= XINERAMA
-OPTIONS_DEFAULT= XINERAMA
-
-XINERAMA_DESC= Build with Xinerama support
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+= xinerama
-CONFIGURE_ARGS+= --configure-option="--with-xinerama"
-.else
-CONFIGURE_ARGS+= --configure-option="--without-xinerama"
-.endif
+USE_XORG= x11 xrandr xext
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-X11/distinfo b/x11/hs-X11/distinfo
index df3293144dff..5cf7b74e564b 100644
--- a/x11/hs-X11/distinfo
+++ b/x11/hs-X11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/X11-1.5.0.1.tar.gz) = 29c07a609cc4943e743ce68a99b8d4c089e66a74a55ac76b88464fba211d1369
-SIZE (cabal/X11-1.5.0.1.tar.gz) = 176346
+SHA256 (cabal/X11-1.6.0.2.tar.gz) = 1c6a7823155bf251c4676981a1370b61af112e77d7f82f744c6bae2fe6482f7c
+SIZE (cabal/X11-1.6.0.2.tar.gz) = 179112
diff --git a/x11/hs-X11/pkg-descr b/x11/hs-X11/pkg-descr
index ba10e1af57ec..66f6c2fd2d33 100644
--- a/x11/hs-X11/pkg-descr
+++ b/x11/hs-X11/pkg-descr
@@ -1,7 +1,5 @@
-A Haskell binding to the X11 library.
+A Haskell binding to the X11 library. The binding is a direct
+translation of C binding.
-The binding is a direct translation of C binding;
-for documentation of these calls, refer to /The Xlib Programming Manual/,
-available online at <http://tronche.com/gui/x/xlib/>.
+WWW: https://github.com/haskell-pkg-janitors/X11
-WWW: http://darcs.haskell.org/X11
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index a658438b67a2..4985ab32b452 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,34 +2,36 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.14
-PORTREVISION= 3
+PORTVERSION= 0.16
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A minimalistic text based status bar
+COMMENT= Minimalistic text-based status bar
LICENSE= BSD
-USE_CABAL= mtl parsec stm X11>=1.3.0
-USE_XORG= x11 xrandr
+USE_CABAL= mtl parsec stm>=2.3 X11
+USE_XORG= xrandr
EXECUTABLE= xmobar
STANDALONE= yes
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${DATADIR}
-OPTIONS_DEFINE= XFT UTF8 MPD
-OPTIONS_DEFAULT= UFT8
+OPTIONS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED
+OPTIONS_DEFAULT= UTF8
XFT_DESC= Use Xft to render text (UTF-8 support included)
UTF8_DESC= UTF-8 support
MPD_DESC= mpd support
+INOTIFY_DESC= inotify support
+DATEZONE_DESC= Localized date support
+THREADED_DESC= Use threaded runtime
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-# Disable Linux-only options
-CONFIGURE_ARGS+= --flags="-with_inotify -with_iwlib"
+# Disable unsupported options
+CONFIGURE_ARGS+= --flags="-with_iwlib -with_dbus -with_mpris"
.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+= --flags="with_xft"
@@ -54,5 +56,25 @@ USE_CABAL+= libmpd
CONFIGURE_ARGS+= --flags="-with_mpd"
.endif
+.if ${PORT_OPTIONS:MINOTIFY}
+CONFIGURE_ARGS+= --flags="with_inotify"
+USE_CABAL+= hinotify>=0.3
+.else
+CONFIGURE_ARGS+= --flags="-with_inotify"
+.endif
+
+.if ${PORT_OPTIONS:MDATEZONE}
+CONFIGURE_ARGS+= --flags="with_datezone"
+USE_CABAL+= timezone-olson>=0.1 timezone-series>=0.1
+.else
+CONFIGURE_ARGS+= --flags="-with_datezone"
+.endif
+
+.if ${PORT_OPTIONS:MTHREADED}
+CONFIGURE_ARGS+= --flags="with_threaded"
+.else
+CONFIGURE_ARGS+= --flags="-with_threaded"
+.endif
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index ae203e6f4515..826b865f8d4d 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmobar-0.14.tar.gz) = 70c39b0bd98a95fb362a78305cc9b10d4f9c24aa6431597fd81da65d945846f8
-SIZE (cabal/xmobar-0.14.tar.gz) = 64977
+SHA256 (cabal/xmobar-0.16.tar.gz) = 115d602018ca20c62b35206864f63008c2ede4739a1229892c8cdcff3c9fa4b7
+SIZE (cabal/xmobar-0.16.tar.gz) = 76102
diff --git a/x11/hs-xmobar/pkg-descr b/x11/hs-xmobar/pkg-descr
index e6fd56693605..f9b40a20c4c2 100644
--- a/x11/hs-xmobar/pkg-descr
+++ b/x11/hs-xmobar/pkg-descr
@@ -1,5 +1,5 @@
-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.
+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/