aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--archivers/hs-zip-archive/Makefile2
-rw-r--r--archivers/hs-zip-archive/distinfo4
-rw-r--r--archivers/hs-zlib-conduit/Makefile5
-rw-r--r--archivers/hs-zlib-conduit/distinfo4
-rw-r--r--audio/hs-ALUT/Makefile2
-rw-r--r--audio/hs-OpenAL/Makefile3
-rw-r--r--audio/hs-OpenAL/distinfo4
-rw-r--r--benchmarks/hs-criterion/Makefile1
-rw-r--r--converters/hs-aeson/Makefile1
-rw-r--r--databases/hs-persistent-sqlite/Makefile7
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-template/Makefile2
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent/Makefile2
-rw-r--r--databases/hs-persistent/distinfo4
-rw-r--r--devel/Makefile2
-rw-r--r--devel/hs-Boolean/Makefile4
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-ansi-terminal/Makefile2
-rw-r--r--devel/hs-ansi-terminal/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile1
-rw-r--r--devel/hs-base64-bytestring/Makefile3
-rw-r--r--devel/hs-base64-bytestring/distinfo4
-rw-r--r--devel/hs-base64-conduit/Makefile4
-rw-r--r--devel/hs-base64-conduit/distinfo4
-rw-r--r--devel/hs-basic-prelude/Makefile2
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile2
-rw-r--r--devel/hs-bifunctors/distinfo4
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile5
-rw-r--r--devel/hs-blaze-builder-conduit/distinfo4
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile4
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo4
-rw-r--r--devel/hs-classy-prelude/Makefile7
-rw-r--r--devel/hs-classy-prelude/distinfo4
-rw-r--r--devel/hs-cmdargs/Makefile3
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-conduit/Makefile2
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile1
-rw-r--r--devel/hs-darcs/Makefile7
-rw-r--r--devel/hs-darcs/distinfo4
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs12
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal29
-rw-r--r--devel/hs-darcs/files/patch-src__Darcs__Repository.hs26
-rw-r--r--devel/hs-either/Makefile2
-rw-r--r--devel/hs-either/distinfo4
-rw-r--r--devel/hs-errors/Makefile4
-rw-r--r--devel/hs-errors/distinfo4
-rw-r--r--devel/hs-fast-logger/Makefile2
-rw-r--r--devel/hs-filestore/Makefile5
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-filesystem-conduit/Makefile5
-rw-r--r--devel/hs-filesystem-conduit/distinfo4
-rw-r--r--devel/hs-geniplate/Makefile17
-rw-r--r--devel/hs-geniplate/distinfo2
-rw-r--r--devel/hs-geniplate/pkg-descr3
-rw-r--r--devel/hs-git-annex/Makefile21
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal11
-rw-r--r--devel/hs-hashtables/Makefile5
-rw-r--r--devel/hs-hashtables/distinfo4
-rw-r--r--devel/hs-haskeline/Makefile7
-rw-r--r--devel/hs-haskeline/distinfo4
-rw-r--r--devel/hs-haskeline/pkg-descr1
-rw-r--r--devel/hs-hint/Makefile3
-rw-r--r--devel/hs-hint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile6
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hspec/Makefile8
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-lens/Makefile5
-rw-r--r--devel/hs-lens/distinfo4
-rw-r--r--devel/hs-logict/Makefile5
-rw-r--r--devel/hs-logict/distinfo4
-rw-r--r--devel/hs-monad-logger/Makefile4
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-par/Makefile5
-rw-r--r--devel/hs-monad-par/distinfo4
-rw-r--r--devel/hs-monad-par/pkg-descr10
-rw-r--r--devel/hs-mueval/Makefile10
-rw-r--r--devel/hs-mueval/distinfo4
-rw-r--r--devel/hs-pool-conduit/Makefile1
-rw-r--r--devel/hs-profunctor-extras/Makefile1
-rw-r--r--devel/hs-profunctors/Makefile2
-rw-r--r--devel/hs-profunctors/distinfo4
-rw-r--r--devel/hs-project-template/Makefile4
-rw-r--r--devel/hs-project-template/distinfo4
-rw-r--r--devel/hs-reactive/Makefile3
-rw-r--r--devel/hs-readline/Makefile5
-rw-r--r--devel/hs-readline/distinfo4
-rw-r--r--devel/hs-reflection/Makefile4
-rw-r--r--devel/hs-reflection/distinfo4
-rw-r--r--devel/hs-resourcet/Makefile3
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-show/Makefile9
-rw-r--r--devel/hs-show/distinfo4
-rw-r--r--devel/hs-simple-reflect/Makefile3
-rw-r--r--devel/hs-simple-reflect/distinfo4
-rw-r--r--devel/hs-smallcheck/Makefile8
-rw-r--r--devel/hs-smallcheck/distinfo4
-rw-r--r--devel/hs-smallcheck/files/patch-smallcheck.cabal13
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile2
-rw-r--r--devel/hs-test-framework/Makefile2
-rw-r--r--devel/hs-testpack/Makefile5
-rw-r--r--devel/hs-testpack/distinfo4
-rw-r--r--devel/hs-testpack/files/patch-testpack.cabal11
-rw-r--r--devel/hs-threads/Makefile3
-rw-r--r--devel/hs-threads/distinfo4
-rw-r--r--devel/hs-time-compat/Makefile3
-rw-r--r--devel/hs-time-compat/distinfo4
-rw-r--r--devel/hs-unix-time/Makefile3
-rw-r--r--devel/hs-unix-time/distinfo4
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile2
-rw-r--r--devel/hs-uuagc/Makefile2
-rw-r--r--devel/hs-uuid/Makefile17
-rw-r--r--devel/hs-uuid/distinfo2
-rw-r--r--devel/hs-uuid/pkg-descr4
-rw-r--r--devel/hs-uulib/Makefile3
-rw-r--r--devel/hs-uulib/distinfo4
-rw-r--r--graphics/hs-HGL/Makefile2
-rw-r--r--lang/ghc/bsd.cabal.options.mk7
-rw-r--r--lang/ghc/bsd.hackage.mk6
-rw-r--r--mail/hs-email-validate/Makefile5
-rw-r--r--mail/hs-email-validate/distinfo4
-rw-r--r--mail/hs-mime-mail/Makefile2
-rw-r--r--mail/hs-mime-types/Makefile2
-rw-r--r--mail/hs-mime-types/distinfo4
-rw-r--r--math/Makefile1
-rw-r--r--math/hs-Agda-executable/Makefile21
-rw-r--r--math/hs-Agda-executable/distinfo2
-rw-r--r--math/hs-Agda-executable/pkg-descr5
-rw-r--r--math/hs-Agda/Makefile23
-rw-r--r--math/hs-Agda/distinfo4
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal47
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Compiler__MAlonzo__Compiler.hs11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs24
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs13
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs11
-rw-r--r--math/hs-Agda/pkg-message9
-rw-r--r--math/hs-NumInstances/Makefile3
-rw-r--r--math/hs-NumInstances/distinfo4
-rw-r--r--math/hs-comonad-transformers/Makefile1
-rw-r--r--math/hs-comonad/Makefile2
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-comonads-fd/Makefile1
-rw-r--r--math/hs-contravariant/Makefile5
-rw-r--r--math/hs-contravariant/distinfo4
-rw-r--r--math/hs-contravariant/files/patch-contravariant.cabal12
-rw-r--r--math/hs-data-lens-template/Makefile2
-rw-r--r--math/hs-data-lens/Makefile2
-rw-r--r--math/hs-distributive/Makefile2
-rw-r--r--math/hs-distributive/distinfo4
-rw-r--r--math/hs-groupoids/Makefile1
-rw-r--r--math/hs-math-functions/Makefile3
-rw-r--r--math/hs-math-functions/distinfo4
-rw-r--r--math/hs-pointed/Makefile1
-rw-r--r--math/hs-semigroupoid-extras/Makefile1
-rw-r--r--math/hs-semigroupoids/Makefile1
-rw-r--r--math/hs-statistics/Makefile2
-rw-r--r--math/hs-vector-space/Makefile2
-rw-r--r--net/Makefile2
-rw-r--r--net/hs-maccatcher/Makefile17
-rw-r--r--net/hs-maccatcher/distinfo2
-rw-r--r--net/hs-maccatcher/pkg-descr3
-rw-r--r--net/hs-network-conduit/Makefile4
-rw-r--r--net/hs-network-conduit/distinfo4
-rw-r--r--net/hs-publicsuffixlist/Makefile15
-rw-r--r--net/hs-publicsuffixlist/distinfo2
-rw-r--r--net/hs-publicsuffixlist/pkg-descr3
-rw-r--r--net/hs-sendfile/Makefile3
-rw-r--r--net/hs-sendfile/distinfo4
-rw-r--r--net/hs-simple-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/distinfo4
-rw-r--r--net/hs-socks/Makefile3
-rw-r--r--net/hs-socks/distinfo4
-rw-r--r--print/hs-hscolour/Makefile9
-rw-r--r--security/hs-RSA/Makefile2
-rw-r--r--security/hs-certificate/Makefile1
-rw-r--r--security/hs-clientsession/Makefile1
-rw-r--r--security/hs-cprng-aes/Makefile1
-rw-r--r--security/hs-crypto-api/Makefile5
-rw-r--r--security/hs-crypto-api/distinfo4
-rw-r--r--security/hs-crypto-conduit/Makefile4
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-pubkey/Makefile1
-rw-r--r--security/hs-cryptocipher/Makefile1
-rw-r--r--security/hs-cryptohash/Makefile1
-rw-r--r--security/hs-monadcryptorandom/Makefile3
-rw-r--r--security/hs-monadcryptorandom/distinfo4
-rw-r--r--security/hs-pem/Makefile1
-rw-r--r--security/hs-pureMD5/Makefile4
-rw-r--r--security/hs-pwstore-fast/Makefile2
-rw-r--r--security/hs-skein/Makefile2
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-tls-extra/Makefile1
-rw-r--r--security/hs-tls/Makefile2
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--sysutils/hs-angel/Makefile1
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/hs-HStringTemplate/Makefile5
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile5
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile2
-rw-r--r--textproc/hs-attoparsec/Makefile2
-rw-r--r--textproc/hs-attoparsec/distinfo4
-rw-r--r--textproc/hs-blaze-html/Makefile2
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-case-insensitive/Makefile4
-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-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile2
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-html-conduit/Makefile7
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile7
-rw-r--r--textproc/hs-hxt-regex-xmlschema/distinfo4
-rw-r--r--textproc/hs-hxt/Makefile2
-rw-r--r--textproc/hs-pandoc-types/Makefile3
-rw-r--r--textproc/hs-pandoc-types/distinfo4
-rw-r--r--textproc/hs-pandoc/Makefile38
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs12
-rw-r--r--textproc/hs-pandoc/pkg-descr9
-rw-r--r--textproc/hs-regex-tdfa/Makefile15
-rw-r--r--textproc/hs-regex-tdfa/distinfo2
-rw-r--r--textproc/hs-regex-tdfa/pkg-descr3
-rw-r--r--textproc/hs-tagstream-conduit/Makefile8
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/Makefile9
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xmlhtml/Makefile3
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-yaml/Makefile2
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--www/hs-activehs/Makefile11
-rw-r--r--www/hs-activehs/distinfo4
-rw-r--r--www/hs-activehs/files/patch-Main.hs10
-rw-r--r--www/hs-activehs/files/patch-Simple.hs19
-rw-r--r--www/hs-activehs/files/patch-Smart.hs10
-rw-r--r--www/hs-activehs/files/patch-Special.hs20
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal15
-rw-r--r--www/hs-authenticate/Makefile8
-rw-r--r--www/hs-authenticate/distinfo4
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile8
-rw-r--r--www/hs-fastcgi/distinfo4
-rw-r--r--www/hs-gitit/Makefile10
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-hS3/Makefile8
-rw-r--r--www/hs-hS3/distinfo4
-rw-r--r--www/hs-hamlet/Makefile2
-rw-r--r--www/hs-hamlet/distinfo4
-rw-r--r--www/hs-happstack-server/Makefile5
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile2
-rw-r--r--www/hs-heist/Makefile4
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile2
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-http-conduit/Makefile9
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-date/Makefile1
-rw-r--r--www/hs-http-reverse-proxy/Makefile11
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-server/Makefile6
-rw-r--r--www/hs-http-server/distinfo4
-rw-r--r--www/hs-http-types/Makefile3
-rw-r--r--www/hs-http-types/distinfo4
-rw-r--r--www/hs-shakespeare-css/Makefile3
-rw-r--r--www/hs-shakespeare-css/distinfo4
-rw-r--r--www/hs-shakespeare-i18n/Makefile2
-rw-r--r--www/hs-shakespeare-js/Makefile4
-rw-r--r--www/hs-shakespeare-js/distinfo4
-rw-r--r--www/hs-shakespeare-text/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile8
-rw-r--r--www/hs-snap-core/distinfo4
-rw-r--r--www/hs-snap-server/Makefile9
-rw-r--r--www/hs-snap-server/distinfo4
-rw-r--r--www/hs-snap/Makefile15
-rw-r--r--www/hs-snap/distinfo4
-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/Makefile2
-rw-r--r--www/hs-wai-test/Makefile3
-rw-r--r--www/hs-wai-test/distinfo4
-rw-r--r--www/hs-wai-test/pkg-descr2
-rw-r--r--www/hs-wai/Makefile3
-rw-r--r--www/hs-wai/distinfo4
-rw-r--r--www/hs-warp/Makefile4
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-xss-sanitize/Makefile1
-rw-r--r--www/hs-yesod-auth/Makefile17
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-core/Makefile2
-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/Makefile2
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-json/Makefile3
-rw-r--r--www/hs-yesod-json/distinfo4
-rw-r--r--www/hs-yesod-persistent/Makefile1
-rw-r--r--www/hs-yesod-platform/Makefile156
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal11
-rw-r--r--www/hs-yesod-routes/Makefile3
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-static/Makefile2
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-test/Makefile2
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod/Makefile2
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile2
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo4
-rw-r--r--x11-wm/hs-xmonad/Makefile1
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile3
-rw-r--r--x11/hs-X11/distinfo4
-rw-r--r--x11/hs-xmobar/Makefile1
334 files changed, 936 insertions, 871 deletions
diff --git a/MOVED b/MOVED
index ad3528416c6..d58d58d6464 100644
--- a/MOVED
+++ b/MOVED
@@ -4190,3 +4190,4 @@ www/pecl-zendoptimizerplus|www/pecl-zendopcache|2013-03-27|Renamed
print/kdeutils4-printer-applet||2013-03-27|Superseded by print/kde4-print-manager
print/system-config-printer-kde||2013-03-27|Superseded by print/kde4-print-manager
science/py-biolccc|science/pyteomics.biolccc|2013-03-28|Renamed upstream
+math/hs-Agda-executable||2013-03-29|Removed: it has become part of math/hs-Agda
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index c26b4ad3478..d31bedf760c 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.1.3.3
+PORTVERSION= 0.1.3.4
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 1f696c76411..f4b39a75387 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.3.3.tar.gz) = 914bfcee21b9f1f5773525a9cb4b119b5b316fe42ef41e362e636b6ab4d1f77f
-SIZE (cabal/zip-archive-0.1.3.3.tar.gz) = 11214
+SHA256 (cabal/zip-archive-0.1.3.4.tar.gz) = cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643
+SIZE (cabal/zip-archive-0.1.3.4.tar.gz) = 11250
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
index 420f079db03..dfed27ff87f 100644
--- a/archivers/hs-zlib-conduit/Makefile
+++ b/archivers/hs-zlib-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zlib-conduit
-PORTVERSION= 0.5.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Streaming compression/decompression via conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.5 transformers>=0.2.2 void zlib-bindings>=0.1
+USE_CABAL= conduit>=1.0 transformers>=0.2.2 void zlib-bindings>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/archivers/hs-zlib-conduit/distinfo b/archivers/hs-zlib-conduit/distinfo
index a4999e2607d..2edd2c0aad7 100644
--- a/archivers/hs-zlib-conduit/distinfo
+++ b/archivers/hs-zlib-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-conduit-0.5.0.3.tar.gz) = 4bdb01fc548a5ad5f805a8ce199cef78a9e76b8e245db7f4152561ceba5f3417
-SIZE (cabal/zlib-conduit-0.5.0.3.tar.gz) = 3507
+SHA256 (cabal/zlib-conduit-1.0.0.tar.gz) = 7b81c7902e7c0b3fc1ec089764d4eaa11fa2964020121b8e949c091738261460
+SIZE (cabal/zlib-conduit-1.0.0.tar.gz) = 3461
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 7ca7d49c139..e79d496305b 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ALUT
PORTVERSION= 2.2.0.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index b3a94039ba5..3646171858f 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= OpenAL
-PORTVERSION= 1.4.0.1
-PORTREVISION= 3
+PORTVERSION= 1.4.0.2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/distinfo b/audio/hs-OpenAL/distinfo
index 8e02f19d1cc..35403acdcbb 100644
--- a/audio/hs-OpenAL/distinfo
+++ b/audio/hs-OpenAL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenAL-1.4.0.1.tar.gz) = dbc3390e4f73bb115df9a02b638160b172e1974874d802d10a0d4e2535410ea0
-SIZE (cabal/OpenAL-1.4.0.1.tar.gz) = 114389
+SHA256 (cabal/OpenAL-1.4.0.2.tar.gz) = 7febf0d9ab1832275208ca1387fb238e5452e363e0978420066370114bbb04a7
+SIZE (cabal/OpenAL-1.4.0.2.tar.gz) = 116835
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 4b11f60adb5..7bf27e76abd 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -3,6 +3,7 @@
PORTNAME= criterion
PORTVERSION= 0.6.2.1
+PORTREVISION= 1
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 677238da471..2205af56d3f 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -2,6 +2,7 @@
PORTNAME= aeson
PORTVERSION= 0.6.1.0
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index 13c35c16216..e3064910d01 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.5
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,9 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
-USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 persistent>=1.1.2 \
- text>=0.7 transformers>=0.2.1
+USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 \
+ monad-logger>=0.2.4 persistent>=1.1.5 text>=0.7 \
+ transformers>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 2c9442fea2c..78bcd58a3a0 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-1.1.2.tar.gz) = e30604324b39bd0e34f3591c7fbe4a693e148569d657d1880e47cba3ce14655d
-SIZE (cabal/persistent-sqlite-1.1.2.tar.gz) = 1285013
+SHA256 (cabal/persistent-sqlite-1.1.5.tar.gz) = 94993b3b4f09d27846c149b68e3e9ba73a2bd6e361a6e74519dff5ad31b81dcf
+SIZE (cabal/persistent-sqlite-1.1.5.tar.gz) = 1285378
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 7fe7455c4ea..f0e0f4f7f18 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 1.1.2.1
+PORTVERSION= 1.1.2.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 7717033fb89..db4aa39e53d 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-1.1.2.1.tar.gz) = dab4a604af8073f2f0341652c353ee33018c1788bb470e93e4beb34310ce580b
-SIZE (cabal/persistent-template-1.1.2.1.tar.gz) = 10770
+SHA256 (cabal/persistent-template-1.1.2.4.tar.gz) = 09962d07000c7eee8bdc76fde8ab7640b7efcad1cb4055a136654093cbf6583b
+SIZE (cabal/persistent-template-1.1.2.4.tar.gz) = 11436
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 6335d393e52..b7845ebc8aa 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 1.1.4
+PORTVERSION= 1.1.5.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index 9abf5bd79de..ab4fa11dbde 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-1.1.4.tar.gz) = f2e55ab379452fb195bd15f12ab8cfd9de791818c7fd040bdebd5074bd873dbb
-SIZE (cabal/persistent-1.1.4.tar.gz) = 30980
+SHA256 (cabal/persistent-1.1.5.1.tar.gz) = df3a2eaf2765797382672f26a4b48ea3fdbb75f7b7c6d3a7aac0bcf7ebc040b7
+SIZE (cabal/persistent-1.1.5.1.tar.gz) = 31484
diff --git a/devel/Makefile b/devel/Makefile
index 90e53376252..4bd413f8b18 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -720,6 +720,7 @@
SUBDIR += hs-filesystem-conduit
SUBDIR += hs-fsnotify
SUBDIR += hs-generic-deriving
+ SUBDIR += hs-geniplate
SUBDIR += hs-gconf
SUBDIR += hs-ghc-events
SUBDIR += hs-ghc-mtl
@@ -821,6 +822,7 @@
SUBDIR += hs-uuagc
SUBDIR += hs-uuagc-bootstrap
SUBDIR += hs-uuagc-cabal
+ SUBDIR += hs-uuid
SUBDIR += hs-uulib
SUBDIR += hs-vault
SUBDIR += hs-vector
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 5d6ecc83599..ab76edc71bd 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.1.2
+PORTVERSION= 0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Generalized booleans
+COMMENT= Generalized Booleans and numbers
LICENSE= BSD
FILE_LICENSE= COPYING
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index e29472ca699..60aaddf4e06 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.1.2.tar.gz) = a6d7d80e9962dbe1767e95cbe057db3723850cceabbd84f1a914a2e47e7ab01e
-SIZE (cabal/Boolean-0.1.2.tar.gz) = 4349
+SHA256 (cabal/Boolean-0.2.tar.gz) = 23fff11419defab048b71eec4eea4a4d1154788a2cf9764721d749b79cde18e5
+SIZE (cabal/Boolean-0.2.tar.gz) = 6547
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 820cdbee6a4..addef7de6ca 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.5.5.1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 6d8594d61eb..fa8046ee241 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-terminal-0.5.5.1.tar.gz) = 8c0247c0e5dc2089a72575dd5074583a3075adf7a4d87b349f5aef96c8c5d390
-SIZE (cabal/ansi-terminal-0.5.5.1.tar.gz) = 13132
+SHA256 (cabal/ansi-terminal-0.6.tar.gz) = 6f3a505ece863f707d069e0bbdc5f99673730dd096a2ca844644660f10cebf28
+SIZE (cabal/ansi-terminal-0.6.tar.gz) = 13165
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index ad1ed48b0b2..5111280b08f 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 1c4cb314831..f6af383c91e 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= base64-bytestring
-PORTVERSION= 1.0.0.0
-PORTREVISION= 1
+PORTVERSION= 1.0.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/distinfo b/devel/hs-base64-bytestring/distinfo
index b115cf08b7a..7e8b3be0249 100644
--- a/devel/hs-base64-bytestring/distinfo
+++ b/devel/hs-base64-bytestring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/base64-bytestring-1.0.0.0.tar.gz) = 759fbb0f8f3ff26c4ad3e71fbcccfd472bc1a4eefe4b5508ce78a8793305197c
-SIZE (cabal/base64-bytestring-1.0.0.0.tar.gz) = 8861
+SHA256 (cabal/base64-bytestring-1.0.0.1.tar.gz) = ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50
+SIZE (cabal/base64-bytestring-1.0.0.1.tar.gz) = 9080
diff --git a/devel/hs-base64-conduit/Makefile b/devel/hs-base64-conduit/Makefile
index 2d3d1284265..7106e181ed7 100644
--- a/devel/hs-base64-conduit/Makefile
+++ b/devel/hs-base64-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= base64-conduit
-PORTVERSION= 0.5.1
+PORTVERSION= 1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Base64-encode and decode streams of bytes
LICENSE= BSD
-USE_CABAL= base64-bytestring>=0.1.1.1 conduit>=0.5
+USE_CABAL= base64-bytestring>=0.1.1.1 conduit>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base64-conduit/distinfo b/devel/hs-base64-conduit/distinfo
index d300edc8a20..fa3692c5f7f 100644
--- a/devel/hs-base64-conduit/distinfo
+++ b/devel/hs-base64-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/base64-conduit-0.5.1.tar.gz) = 3481c4695747985516e3e2bdfd4f76e9e0acd43f5fa5c24f3f4ce5527634b7fe
-SIZE (cabal/base64-conduit-0.5.1.tar.gz) = 2508
+SHA256 (cabal/base64-conduit-1.0.0.tar.gz) = 38552198c2a399a98efdd0a8f5eebab84d36fc0e298a7a2522aa95d9637b9283
+SIZE (cabal/base64-conduit-1.0.0.tar.gz) = 2488
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index a7320baa283..f7faf88e2d8 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.2.0
+PORTVERSION= 0.3.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 82654c4a086..27a3999bbab 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.2.0.tar.gz) = 92cd64b41d1374b7ee97f6252ff6f4e60286d9a1541ad04cdaa8ebdc139cbce9
-SIZE (cabal/basic-prelude-0.3.2.0.tar.gz) = 4534
+SHA256 (cabal/basic-prelude-0.3.4.0.tar.gz) = e66b61f4fed3a5a7c89e2d9908579f5bd349d841d2a94f5c25ae1dd70c605e51
+SIZE (cabal/basic-prelude-0.3.4.0.tar.gz) = 4639
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 6c1c61002d0..9227c189bc2 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 3.2
+PORTVERSION= 3.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index 364ddfc0003..8830986c1d2 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bifunctors-3.2.tar.gz) = 0a7427a16b2a5e39ca92c7a5c63e16f0fcffea2b4f2d59e32c3c1e1182fb7a0d
-SIZE (cabal/bifunctors-3.2.tar.gz) = 7327
+SHA256 (cabal/bifunctors-3.2.0.1.tar.gz) = a6ce8c875b79d9d28d7a7ae1156aad3095e95bde1fce7de2ff1c91f8416731ae
+SIZE (cabal/bifunctors-3.2.0.1.tar.gz) = 7332
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
index b1c0c9f73b3..269beb620e4 100644
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ b/devel/hs-blaze-builder-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder-conduit
-PORTVERSION= 0.5.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Convert streams of builders to streams of bytestrings
LICENSE= BSD
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 text>=0.11 \
+USE_CABAL= blaze-builder>=0.2.1.4 conduit>=1.0 text>=0.11 \
transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-blaze-builder-conduit/distinfo b/devel/hs-blaze-builder-conduit/distinfo
index ed3dc00516b..75e1cc66e48 100644
--- a/devel/hs-blaze-builder-conduit/distinfo
+++ b/devel/hs-blaze-builder-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-conduit-0.5.0.3.tar.gz) = dc72abd4df279580d995e58c472b34a45f8f2336ba445529dc0bbc9f04ac7e35
-SIZE (cabal/blaze-builder-conduit-0.5.0.3.tar.gz) = 3991
+SHA256 (cabal/blaze-builder-conduit-1.0.0.tar.gz) = 8665a9a4f2e627968b6b20a16173af357c2e6b4d0e9325384b37f75626580097
+SIZE (cabal/blaze-builder-conduit-1.0.0.tar.gz) = 3952
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index f6c7d1423e8..2df4b559411 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.3
+PORTVERSION= 0.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= classy-prelude>=0.4.3 conduit>=0.5.4.1 monad-control \
+USE_CABAL= classy-prelude>=0.5.3 conduit>=0.5.4.1 monad-control \
resourcet transformers void xml-conduit>=1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index c41aad1fbfe..d959ed4bb5c 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.3.tar.gz) = 64b841c5d86734de207cef4e1411c45a103d79aaa3a5c7e034cf44f34dd4c45b
-SIZE (cabal/classy-prelude-conduit-0.4.3.tar.gz) = 6460
+SHA256 (cabal/classy-prelude-conduit-0.5.3.tar.gz) = 1fe634987ad343579133335169c99aa5ac1a760f5aeca1c5f737ca36d320bde6
+SIZE (cabal/classy-prelude-conduit-0.5.3.tar.gz) = 1767
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 9e21f45e89a..e88a51d2735 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.4.3
+PORTVERSION= 0.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,9 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= basic-prelude>=0.3.2 hashable system-filepath>=0.4 text \
- transformers unordered-containers vector
+USE_CABAL= basic-prelude>=0.3.4 hashable lifted-base>=0.2 \
+ system-filepath>=0.4 text transformers unordered-containers \
+ vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index acaf3be5521..f05fb5ded49 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.4.3.tar.gz) = d88c8df50d173b4125b93c5036cefb4fe3bd659b97227afd57480fa0e4d751cc
-SIZE (cabal/classy-prelude-0.4.3.tar.gz) = 9517
+SHA256 (cabal/classy-prelude-0.5.3.tar.gz) = 4de9dd739cfa64986f5271b99d947be27f92fe0d4ed0c6914ff2e7dd676f9076
+SIZE (cabal/classy-prelude-0.5.3.tar.gz) = 13754
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index b0b7bd423c4..11e00d069b6 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.1
-PORTREVISION= 1
+PORTVERSION= 0.10.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index c8e84dee8c5..e4c29994448 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.10.1.tar.gz) = e83b1be217a337fd3b445373eef0acc2c6933877fb8c70ff5dc16a550cfcee5c
-SIZE (cabal/cmdargs-0.10.1.tar.gz) = 60350
+SHA256 (cabal/cmdargs-0.10.2.tar.gz) = e4650aeeef712c337079a5efc6db311c816eb7f735c125645cca4f954c61c76e
+SIZE (cabal/cmdargs-0.10.2.tar.gz) = 60343
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index b36f327b6b6..a8521d882ef 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 0.5.6
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index f33f789e00e..616acb21e78 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-0.5.6.tar.gz) = ba3381e1fd0251128b85ae549b26eecaa453c4798af00fcfd753caa11bbbaaa8
-SIZE (cabal/conduit-0.5.6.tar.gz) = 35200
+SHA256 (cabal/conduit-1.0.2.tar.gz) = 0e8c90c9fd0faa4a96475567400caa38542edc9e190fd3f9f66fcd2da9cf1e0e
+SIZE (cabal/conduit-1.0.2.tar.gz) = 29928
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 3b161242989..bd737e892c0 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.2.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 6fba544e536..b8716f6abf3 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.8.3
-PORTREVISION= 1
+PORTVERSION= 2.8.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,9 +12,9 @@ LICENSE= GPLv2
FILE_LICENSE= COPYING
USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html \
- mtl>=1.0 parsec>=2.0 random regex-compat>=0.95.1 \
+ mtl>=1.0 parsec>=2.2 random regex-compat>=0.95.1 \
regex-posix>=0.95.1 tar>=0.4 text>=0.11.0.6 unix-compat>=0.1.2 \
- vector>=0.7 zlib>=0.5.1.0
+ utf8-string>=0.3.6 vector>=0.7 zlib>=0.5.1.0
EXECUTABLE= darcs
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 0e7662e0cca..c2655e42837 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.3.tar.gz) = 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59
-SIZE (cabal/darcs-2.8.3.tar.gz) = 1289187
+SHA256 (cabal/darcs-2.8.4.tar.gz) = 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98
+SIZE (cabal/darcs-2.8.4.tar.gz) = 1301464
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index df31ea37151..c2ecc0e43c6 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,15 +1,15 @@
---- ./Setup.lhs.orig 2011-02-11 00:35:43.000000000 +0100
-+++ ./Setup.lhs 2011-03-13 18:05:02.180256196 +0100
-@@ -21,7 +21,7 @@
+--- Setup.lhs.orig 2013-02-06 07:07:21.000000000 +0100
++++ Setup.lhs 2013-02-10 10:48:49.000000000 +0100
+@@ -26,7 +26,7 @@
import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
+ import Distribution.Simple.PackageIndex ( topologicalOrder )
+ import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
import Distribution.Simple.Setup
- (buildVerbosity, copyDest, copyVerbosity, fromFlag,
- haddockVerbosity, installVerbosity, sDistVerbosity)
-@@ -180,7 +180,7 @@
+@@ -200,7 +200,7 @@
-> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy =
copyFiles verbosity
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
deleted file mode 100644
index e07520c7078..00000000000
--- a/devel/hs-darcs/files/patch-darcs.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./darcs.cabal.orig 2012-05-14 13:10:13.000000000 +0200
-+++ ./darcs.cabal 2012-05-15 15:33:40.000000000 +0200
-@@ -371,7 +371,7 @@
- haskeline >= 0.6.3 && < 0.7,
- hashed-storage >= 0.5.6 && < 0.6,
- vector >= 0.7,
-- tar == 0.3.*
-+ tar == 0.4.*
-
- if !os(windows)
- build-depends: unix >= 1.0 && < 2.6
-@@ -532,7 +532,7 @@
- haskeline >= 0.6.3 && < 0.7,
- hashed-storage >= 0.5.6 && < 0.6,
- vector >= 0.7,
-- tar == 0.3.*
-+ tar == 0.4.*
-
- if !os(windows)
- build-depends: unix >= 1.0 && < 2.6
-@@ -729,7 +729,7 @@
- array >= 0.1 && < 0.5,
- hashed-storage >= 0.5.6 && < 0.6,
- vector >= 0.7,
-- tar == 0.3.*,
-+ tar == 0.4.*,
- random == 1.0.*
-
- if flag(mmap) && !os(windows)
diff --git a/devel/hs-darcs/files/patch-src__Darcs__Repository.hs b/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
deleted file mode 100644
index 1bbacd8dd90..00000000000
--- a/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/Darcs/Repository.hs.orig 2012-04-22 17:14:14.000000000 +0200
-+++ ./src/Darcs/Repository.hs 2012-05-10 16:44:09.000000000 +0200
-@@ -302,19 +302,19 @@
- removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
- filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
-
--unpackBasic :: Cache -> Tar.Entries -> IO ()
-+unpackBasic :: Cache -> Tar.Entries Tar.FormatError -> IO ()
- unpackBasic c x = do
- withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
- removeMetaFiles
-
--unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
-+unpackPatches :: Cache -> [String] -> Tar.Entries Tar.FormatError -> IO ()
- unpackPatches c ps x = do
- withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
- removeMetaFiles
-
--unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
-+unpackTar :: Cache -> IO () -> Tar.Entries Tar.FormatError -> IO ()
- unpackTar _ _ Tar.Done = return ()
--unpackTar _ _ (Tar.Fail e)= fail e
-+unpackTar _ _ (Tar.Fail e) = fail $ show e
- unpackTar c mh (Tar.Next x xs) = case Tar.entryContent x of
- Tar.NormalFile x' _ -> do
- let p = Tar.entryPath x
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 1b2196e6fb8..6cfbfa37693 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 3.1
+PORTVERSION= 3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 300d1a2c480..9073f6d40af 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/either-3.1.tar.gz) = 55b73518e14650a07c9a1cf8eb92be96ecaaf61cf4da02b5185976d1a0a34fdd
-SIZE (cabal/either-3.1.tar.gz) = 4945
+SHA256 (cabal/either-3.4.tar.gz) = e2c71edae6e117b31cfe7156f36fb212576eeebf593733452a9883721fbacb16
+SIZE (cabal/either-3.4.tar.gz) = 5314
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index dc7bbbfc303..30ea7fe8cdb 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 1.3.1
+PORTVERSION= 1.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= either>=3.0.1 safe>=0.3.3 transformers>=0.2
+USE_CABAL= either>=3.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
index cbe7b6512ae..d16e37569f9 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/errors-1.3.1.tar.gz) = 33babc5bee751efd9f426ef410fbe1dbc031ddd56538e5e55ec28c1fe7b5d76d
-SIZE (cabal/errors-1.3.1.tar.gz) = 6048
+SHA256 (cabal/errors-1.4.1.tar.gz) = 80b01229cf6dc9318e227ef6d501136903f744b6fe769c565400fa653277d7a2
+SIZE (cabal/errors-1.4.1.tar.gz) = 6910
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 2e042693fa9..0a3969355e0 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fast-logger
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index 8e73236e9aa..c97805c9a62 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6
+PORTVERSION= 0.6.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD
-USE_CABAL= Diff>=0.2 HUnit>=1.2 mtl parsec>=2 split>=0.1 \
- utf8-string>=0.3 xml>=1.3
+USE_CABAL= Diff>=0.2 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 b8ee3facc87..1d65d6e10e0 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.6.tar.gz) = 6076b3cb8e702520d0c98526babd96d9942a87cf5af10e604887e33873c7baae
-SIZE (cabal/filestore-0.6.tar.gz) = 29622
+SHA256 (cabal/filestore-0.6.0.1.tar.gz) = 6eabe0a7d5c8c95a3c827f92db80fe84a14c514f2a74dfca66cf4a56e30243d1
+SIZE (cabal/filestore-0.6.0.1.tar.gz) = 29807
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
index e650e872968..4eea1a3f596 100644
--- a/devel/hs-filesystem-conduit/Makefile
+++ b/devel/hs-filesystem-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= filesystem-conduit
-PORTVERSION= 0.5.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Use system-filepath data types with conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.5 system-fileio>=0.3.3 system-filepath>=0.4.3 \
+USE_CABAL= conduit>=1.0 system-fileio>=0.3.3 system-filepath>=0.4.3 \
text>=0.11 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-filesystem-conduit/distinfo b/devel/hs-filesystem-conduit/distinfo
index 1a2488ca268..a28be43136f 100644
--- a/devel/hs-filesystem-conduit/distinfo
+++ b/devel/hs-filesystem-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filesystem-conduit-0.5.0.2.tar.gz) = d8f934889839492f04c2e5812aefa62af1a53c67c94f8b22dd641c33c5a0fd6e
-SIZE (cabal/filesystem-conduit-0.5.0.2.tar.gz) = 3075
+SHA256 (cabal/filesystem-conduit-1.0.0.tar.gz) = db4448dfec7b8cc1c74a7a3164712949fd3b3745af61b9f5a8e65dcc608ce3bb
+SIZE (cabal/filesystem-conduit-1.0.0.tar.gz) = 3066
diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate/Makefile
new file mode 100644
index 00000000000..8877e4d2724
--- /dev/null
+++ b/devel/hs-geniplate/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= geniplate
+PORTVERSION= 0.6.0.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Use template Haskell to generate Uniplate-like functions
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= mtl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-geniplate/distinfo b/devel/hs-geniplate/distinfo
new file mode 100644
index 00000000000..1d3e94b05ee
--- /dev/null
+++ b/devel/hs-geniplate/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/geniplate-0.6.0.3.tar.gz) = 76eeb3356a3c588fd80b31fde44d4c8df97fd8f53f9262e57138d9f94eb9e3d8
+SIZE (cabal/geniplate-0.6.0.3.tar.gz) = 6824
diff --git a/devel/hs-geniplate/pkg-descr b/devel/hs-geniplate/pkg-descr
new file mode 100644
index 00000000000..32cc193147f
--- /dev/null
+++ b/devel/hs-geniplate/pkg-descr
@@ -0,0 +1,3 @@
+Use template Haskell to generate Uniplate-like functions.
+
+WWW: http://hackage.haskell.org/package/geniplate
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 4b9fb4f56b2..924b8a98953 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 3.20130124
+PORTVERSION= 4.20130323
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,10 +13,10 @@ FILE_LICENSE= COPYRIGHT
CABAL_SETUP= Setup.hs
-USE_CABAL= async bloomfilter dataenc edit-distance hslogger HTTP IfElse \
- json lifted-base MissingH monad-control mtl network pcre-light \
- QuickCheck>=2.1 SafeSemaphore SHA text transformers-base \
- utf8-string
+USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse json \
+ lifted-base MissingH monad-control mtl network pcre-light \
+ QuickCheck>=2.1 regex-tdfa SafeSemaphore SHA text \
+ transformers-base utf8-string uuid
USE_GMAKE= yes
USE_PERL5_BUILD= yes
@@ -30,7 +30,7 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
-OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING
+OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION
OPTIONS_DEFAULT= S3 ASSISTANT
S3_DESC= S3 support
@@ -38,6 +38,7 @@ ASSISTANT_DESC= 'assistant' and 'watch' commands
INOTIFY_DESC= File system notifications support
WEBAPP_DESC= Web application (req. assistant)
PAIRING_DESC= Enable pairing (req. web application)
+PRODUCTION_DESC= Production build
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
@@ -50,7 +51,7 @@ CONFIGURE_ARGS+= --flags="-S3"
.if ${PORT_OPTIONS:MASSISTANT}
CONFIGURE_ARGS+= --flags="Assistant"
-USE_CABAL+= stm>=2.3
+USE_CABAL+= async stm>=2.3
.else
CONFIGURE_ARGS+= --flags="-Assistant"
.endif
@@ -82,5 +83,11 @@ CONFIGURE_ARGS+= --flags="-Pairing"
# Disable all the other options
CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus"
+.if ${PORT_OPTIONS:MPRODUCTION}
+CONFIGURE_ARGS+= --flags="Production"
+.else
+CONFIGURE_ARGS+= --flags="-Production"
+.endif
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index 360618a0db2..ca821cf3cac 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-3.20130124.tar.gz) = 02498f5806344aae49ebcf6b67d370da29fc8d770a38dfad8cd8de59c127a290
-SIZE (cabal/git-annex-3.20130124.tar.gz) = 2173150
+SHA256 (cabal/git-annex-4.20130323.tar.gz) = 1f940d88b8ef91e18155a778b3665c7151f61567945259d41921e389beab779f
+SIZE (cabal/git-annex-4.20130323.tar.gz) = 2578033
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
new file mode 100644
index 00000000000..f19e74277f8
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -0,0 +1,11 @@
+--- ./git-annex.cabal.orig 2013-03-14 22:09:41.000000000 +0100
++++ ./git-annex.cabal 2013-03-22 03:43:51.000000000 +0100
+@@ -112,7 +112,7 @@
+ if (! os(windows) && ! os(solaris) && ! os(linux))
+ CPP-Options: -DWITH_KQUEUE
+ C-Sources: Utility/libkqueue.c
+- Includes: sys/event.h
++ Includes: sys/types.h sys/event.h
+
+ if os(linux) && flag(Dbus)
+ Build-Depends: dbus (>= 0.10.3)
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 50ac0a9b329..db96d0b49f7 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.0.1.8
-PORTREVISION= 1
+PORTVERSION= 1.1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable>=1.1 primitive>=0.4 vector>=0.7
+USE_CABAL= hashable>=1.1 primitive vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index 7208dedd536..91bd54a6231 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashtables-1.0.1.8.tar.gz) = 28fed49706e8fc7fe30b6393d9ed05c6d6b3f4bd0eda300c791054adfefe796a
-SIZE (cabal/hashtables-1.0.1.8.tar.gz) = 48392
+SHA256 (cabal/hashtables-1.1.0.2.tar.gz) = e92edb65f776e06e1ae52f16d2452a377c4af231d7990a9f7f109990371b2034
+SIZE (cabal/hashtables-1.1.0.2.tar.gz) = 48598
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index c9f0c729783..446d041c085 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -2,18 +2,17 @@
# $FreeBSD$
PORTNAME= haskeline
-PORTVERSION= 0.6.4.7
-PORTREVISION= 3
+PORTVERSION= 0.7.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A command-line interface for user input, written in Haskell
+COMMENT= Command-line interface for user input, written in Haskell
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= mtl>=1.1 utf8-string>=0.3.6
+USE_CABAL= transformers>=0.2
USE_ICONV= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskeline/distinfo b/devel/hs-haskeline/distinfo
index 5e0044b3697..4a3df6b79a1 100644
--- a/devel/hs-haskeline/distinfo
+++ b/devel/hs-haskeline/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskeline-0.6.4.7.tar.gz) = 301a7c21c73f52efe56763cf25d807d22dac3faea70538175ca843134524aaa2
-SIZE (cabal/haskeline-0.6.4.7.tar.gz) = 62258
+SHA256 (cabal/haskeline-0.7.0.3.tar.gz) = 4f23c5dc8b4e9f5ed67b966300ba4322467db25bf26d74e2418fccd69210ac83
+SIZE (cabal/haskeline-0.7.0.3.tar.gz) = 67803
diff --git a/devel/hs-haskeline/pkg-descr b/devel/hs-haskeline/pkg-descr
index 50be300a674..ee03e3397bb 100644
--- a/devel/hs-haskeline/pkg-descr
+++ b/devel/hs-haskeline/pkg-descr
@@ -1,7 +1,6 @@
Haskeline provides a user interface for line input in command-line programs.
This library is similar in purpose to readline, but since it is written in
Haskell it is (hopefully) more easily used in other Haskell programs.
-
Haskeline runs both on POSIX-compatible systems and on Windows.
WWW: http://trac.haskell.org/haskeline
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index e0caac78826..849367da862 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.3.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.3.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 920e879eec2..834a37403a2 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hint-0.3.3.5.tar.gz) = 98562846596b7835c18c630e7c3d3c2ae39000facea4ab889b51b002c222ed26
-SIZE (cabal/hint-0.3.3.5.tar.gz) = 28562
+SHA256 (cabal/hint-0.3.3.6.tar.gz) = 5631b14854d80e8772b0da8b1a07fb7e9cb9df5da425282cb9e9d19474b31c20
+SIZE (cabal/hint-0.3.3.6.tar.gz) = 28600
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index ebc7180da00..9b7b7808396 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.15
+PORTVERSION= 4.2.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell API Search
-LICENSE= GPLv2
+LICENSE= BSD
FILE_LICENSE= docs/LICENSE
CABAL_SETUP= Setup.hs
@@ -16,7 +16,7 @@ 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>=0.7 \
parsec>=2.1 random safe tagsoup>=0.11 transformers>=0.2 \
- uniplate wai>=1.1 warp>=1.1
+ uniplate>=1.6 wai>=1.1 warp>=1.1
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index 5ba3c6b0c41..d39112a891c 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.15.tar.gz) = 717efbc7dbf890fe805a2954cd3b441e015c74f61db6f1fb2f141efcd76a1d56
-SIZE (cabal/hoogle-4.2.15.tar.gz) = 118793
+SHA256 (cabal/hoogle-4.2.16.tar.gz) = 0a39ec2557928866fce8dd79edc51fae529b4586aef7dd49956ae66621e655c1
+SIZE (cabal/hoogle-4.2.16.tar.gz) = 118748
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 4678cb43a42..cf9d7697106 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.4.3
+PORTVERSION= 1.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Behavior Driven Development for Haskell
+COMMENT= Behavior-Driven Development for Haskell
LICENSE= BSD
-USE_CABAL= ansi-terminal hspec-expectations HUnit>=1.2.5 \
- QuickCheck>=2.4.0.1 setenv silently>=1.1.1 transformers>=0.2.0
+USE_CABAL= ansi-terminal>=0.5 hspec-expectations HUnit>=1.2.5 \
+ QuickCheck>=2.4.0.1 setenv silently>=1.1.1 transformers>=0.2.2.0
EXECUTABLE= hspec-discover
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 319fd634679..174b72a38d5 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.4.3.tar.gz) = accab7dbfa0ce09a8c679b0e1c34ee230232089ff918a69c1ad1fbaaba1b2645
-SIZE (cabal/hspec-1.4.3.tar.gz) = 25080
+SHA256 (cabal/hspec-1.4.4.tar.gz) = b948d7115d4f892a2b56ddd2b87ab1166f6d91bcdfe66899dc43dd8f69db9927
+SIZE (cabal/hspec-1.4.4.tar.gz) = 26269
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index cc09a4653e0..967b84ff475 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 3.8.5
+PORTVERSION= 3.8.7.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +15,8 @@ USE_CABAL= bifunctors>=3 comonad>=3 comonad-transformers>=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
+ transformers>=0.3 unordered-containers>=0.2 vector>=0.9 \
+ void>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 8dac094b662..663d5d2c07c 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lens-3.8.5.tar.gz) = 769bfa066991237a660cbf8a2ffa4ffadb9dfc44eb0297a02f47e27ae08fe227
-SIZE (cabal/lens-3.8.5.tar.gz) = 195783
+SHA256 (cabal/lens-3.8.7.3.tar.gz) = 0948c0b8a4dec7cdce6935b84f20951fe07236a43bac3b9afee27d33c7de487c
+SIZE (cabal/lens-3.8.7.3.tar.gz) = 196610
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 7b9837be5cf..3765baad6b1 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= logict
-PORTVERSION= 0.5.0.2
-PORTREVISION= 1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A backtracking logic-programming monad
+COMMENT= Backtracking logic-programming monad
LICENSE= BSD
diff --git a/devel/hs-logict/distinfo b/devel/hs-logict/distinfo
index e040c23d541..0a4269f39e8 100644
--- a/devel/hs-logict/distinfo
+++ b/devel/hs-logict/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/logict-0.5.0.2.tar.gz) = 3fe821d0d69259599a24ead377746f558d841e4027c0c471eb6b070368290a54
-SIZE (cabal/logict-0.5.0.2.tar.gz) = 5276
+SHA256 (cabal/logict-0.6.tar.gz) = 2e915fbc82068692beb595e8153c49275c8611ccad5683272aa453be7fe4e4da
+SIZE (cabal/logict-0.6.tar.gz) = 5287
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index a858803b8ca..f44f7223fb8 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.2
+PORTVERSION= 0.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= conduit>=0.5 fast-logger>=0.2 monad-control mtl \
+USE_CABAL= conduit>=1.0 fast-logger>=0.2 monad-control mtl \
resourcet>=0.4 text transformers transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 06811f85708..92bbe5f763e 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.2.3.2.tar.gz) = 65febe4a9f0214adb68d696879d169029391bc262796cab86af72c5d7f75b22c
-SIZE (cabal/monad-logger-0.2.3.2.tar.gz) = 4500
+SHA256 (cabal/monad-logger-0.3.0.1.tar.gz) = 59975cca315c3399cf383e219ab71ab47bea96e151fdcd99101617273463fc16
+SIZE (cabal/monad-logger-0.3.0.1.tar.gz) = 4619
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index ef598b4ff16..c0b1ff42240 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3
-PORTREVISION= 3
+PORTVERSION= 0.3.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for parallel programming based on a monad
+COMMENT= Library for parallel programming based on a monad
LICENSE= BSD
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index ca091a9002c..43aec1f70f1 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-0.3.tar.gz) = 4dff74044354c05676c7d69454f3b11a4855eb8ebe92c5f223e8a30d31fa7fa7
-SIZE (cabal/monad-par-0.3.tar.gz) = 25388
+SHA256 (cabal/monad-par-0.3.4.1.tar.gz) = a8727ee5523699fbc90b86657e2123b69e8a166d402c26eaabfb27b27fb70f6c
+SIZE (cabal/monad-par-0.3.4.1.tar.gz) = 27821
diff --git a/devel/hs-monad-par/pkg-descr b/devel/hs-monad-par/pkg-descr
index 67b988eb206..0c9cedb71b1 100644
--- a/devel/hs-monad-par/pkg-descr
+++ b/devel/hs-monad-par/pkg-descr
@@ -1,9 +1,5 @@
-This library offers an alternative parallel programming API to that
-provided by the 'parallel' package. The Par monad allows the simple
-description of parallel computations, and can be used to add parallelism
-to pure Haskell code. The basic API is straightforward: the monad
-supports forking and simple communication in terms of IVars. The library
-comes with an efficient work-stealing implementation, but the internals
-are also exposed so that you can build your own scheduler if necessary.
+The Par monad offers a simple API for parallel programming. The library
+works for parallelising both pure and IO computations, although only the
+pure version is deterministic.
WWW: http://github.com/simonmar/monad-par
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 95ea93c60d6..54f9e212070 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,21 +2,19 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTVERSION= 0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Safely evaluate Haskell expressions
+COMMENT= Safely evaluate pure Haskell expressions
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= hint>=0.3.1 mtl show>=0.3 utf8-string
-EXECUTABLE= mueval mueval-core
+USE_CABAL= hint>=0.3.1 mtl>2 show>=0.3 simple-reflect utf8-string
-SHOW_PKGMSG= yes
+EXECUTABLE= mueval mueval-core
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index a0d1ae7ba25..24c29be11c6 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mueval-0.8.2.tar.gz) = b8e515cbe56a0c64f1768420d621704ad16f4ede3046ef124e12545d3e684dab
-SIZE (cabal/mueval-0.8.2.tar.gz) = 14906
+SHA256 (cabal/mueval-0.9.tar.gz) = eba209424b5a877be6156fa849631023f9e70c53e7ab1c222cb47fdaf61fd6f8
+SIZE (cabal/mueval-0.9.tar.gz) = 15501
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
index b8ed7864982..9a76486a43e 100644
--- a/devel/hs-pool-conduit/Makefile
+++ b/devel/hs-pool-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pool-conduit
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctor-extras/Makefile b/devel/hs-profunctor-extras/Makefile
index 9d3f08eff30..c07e8326f31 100644
--- a/devel/hs-profunctor-extras/Makefile
+++ b/devel/hs-profunctor-extras/Makefile
@@ -2,6 +2,7 @@
PORTNAME= profunctor-extras
PORTVERSION= 3.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index b4f8e02c750..5db8119120e 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 3.2
+PORTVERSION= 3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index 6bce3487899..e42747366ed 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/profunctors-3.2.tar.gz) = ccbf75c45a8bbd17d162870b99f854407c8fa73e1478c9d931dfc132af20e230
-SIZE (cabal/profunctors-3.2.tar.gz) = 6172
+SHA256 (cabal/profunctors-3.3.tar.gz) = 523e9e0b2eb0f7560b4596cf283cae2ce128d58ac247c871a5c0799131c86a33
+SIZE (cabal/profunctors-3.3.tar.gz) = 6472
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index 22c75f8543c..4a17fd11f20 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= base64-bytestring base64-conduit classy-prelude-conduit>=0.4 \
+USE_CABAL= base64-bytestring base64-conduit classy-prelude>=0.4 \
conduit>=0.5.4 mtl>=2.0 resourcet>=0.4.3 system-fileio>=0.3 \
system-filepath>=0.4 text>=0.11 transformers>=0.2
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 42e34ae9864..e9d7f950ef9 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/project-template-0.1.1.tar.gz) = ca160d5d1cce4e39e5a791738725bdb59f39ed92a9f0885fc2fe1c0aa1c3d0a0
-SIZE (cabal/project-template-0.1.1.tar.gz) = 3810
+SHA256 (cabal/project-template-0.1.3.tar.gz) = b5b6251ce85f1e2bcd3a99c7b85257e0a793eda61e72adbd05eda8a447244cdb
+SIZE (cabal/project-template-0.1.3.tar.gz) = 3930
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 7d16b2d2082..72b921b9a9b 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -3,8 +3,7 @@
PORTNAME= reactive
PORTVERSION= 0.11.5
-PORTREVISION= 8
-
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index ca02901c368..a5546c0b1ec 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= readline
-PORTVERSION= 1.0.1.0
-PORTREVISION= 8
+PORTVERSION= 1.0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell interface to the GNU readline library
+COMMENT= Interface to the GNU readline library
LICENSE= GPLv2
diff --git a/devel/hs-readline/distinfo b/devel/hs-readline/distinfo
index b7833261a4c..a19af54e3f3 100644
--- a/devel/hs-readline/distinfo
+++ b/devel/hs-readline/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/readline-1.0.1.0.tar.gz) = 07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d
-SIZE (cabal/readline-1.0.1.0.tar.gz) = 52394
+SHA256 (cabal/readline-1.0.3.0.tar.gz) = c0b9e174910620db0edea8f9fd6fb6c1d7b066260d523e9a7208294c46a75feb
+SIZE (cabal/readline-1.0.3.0.tar.gz) = 52261
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index 23abde9fe2c..712c5ba2b25 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Reifies arbitrary terms into types that can be reflected back into term
LICENSE= BSD
-USE_CABAL= tagged>=0.2.3
+USE_CABAL= tagged>=0.4.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 30dc1f51033..2dd563537fc 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/reflection-1.1.6.tar.gz) = 7cd255fbde19be97e303439b1ba5f1c4b65010b53f540caafa2ccc8b54e81ec6
-SIZE (cabal/reflection-1.1.6.tar.gz) = 6193
+SHA256 (cabal/reflection-1.1.7.tar.gz) = 9fd0eee6635e6cf8923974c6edca66b3039c991557868b9db6076e97804f7b1c
+SIZE (cabal/reflection-1.1.7.tar.gz) = 6672
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index e23da3fd995..33afb905f3b 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.4.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index ff766ed45b6..acc9f0d541e 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-0.4.4.tar.gz) = 3f8c9cfc3b91d1b2247dbb3d667b85cc516ff72b69419617691127ba0e85a129
-SIZE (cabal/resourcet-0.4.4.tar.gz) = 8515
+SHA256 (cabal/resourcet-0.4.5.tar.gz) = d1beb54a909d57d133f86bfb27d50361411e9e442e85619d889fb698890756c4
+SIZE (cabal/resourcet-0.4.5.tar.gz) = 8686
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index a83f37d6632..4418514db59 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -2,17 +2,18 @@
# $FreeBSD$
PORTNAME= show
-PORTVERSION= 0.4.1.2
-PORTREVISION= 4
+PORTVERSION= 0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell Show instances for Lambdabot
+COMMENT= 'Show' instances for Lambdabot
LICENSE= GPLv2
CABAL_SETUP= Setup.hs
-USE_CABAL= QuickCheck>=2.4 smallcheck>=0.4 syb
+
+USE_CABAL= QuickCheck>=2.4 random simple-reflect smallcheck>=1.0 \
+ syb
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-show/distinfo b/devel/hs-show/distinfo
index 944c842de62..b44569a04fd 100644
--- a/devel/hs-show/distinfo
+++ b/devel/hs-show/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/show-0.4.1.2.tar.gz) = bcb4ad34c529c47547d52debba61d0ff4b8af7ea7b0fcb2668e7d9ae648757e1
-SIZE (cabal/show-0.4.1.2.tar.gz) = 11094
+SHA256 (cabal/show-0.5.tar.gz) = 8e50d61f702f339bff5f606f67d1d381a1825e8ef49993531965a4c016e436e9
+SIZE (cabal/show-0.5.tar.gz) = 8818
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 4b9d7cda40b..ff163bc48df 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= simple-reflect
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
index 38757a83b13..38ca573ac2b 100644
--- a/devel/hs-simple-reflect/distinfo
+++ b/devel/hs-simple-reflect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-reflect-0.2.tar.gz) = 83a2beaffa7d57401abbe208d9f95216f69e8ff07f71b7163621899964629c6b
-SIZE (cabal/simple-reflect-0.2.tar.gz) = 4166
+SHA256 (cabal/simple-reflect-0.3.1.tar.gz) = daf0d8cdc82011b5b97077939507101611c0a6008543832ba07c2131dd6137a1
+SIZE (cabal/simple-reflect-0.3.1.tar.gz) = 4286
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index ef670778910..329dad07657 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -2,19 +2,17 @@
# $FreeBSD$
PORTNAME= smallcheck
-PORTVERSION= 0.6.2
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A property-based testing library
+COMMENT= Property-based testing library
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= dlist>=0.2
-
-INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+USE_CABAL= logict mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index c7b8871f778..ad3940b7d2c 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/smallcheck-0.6.2.tar.gz) = d9af8f30a54846565000c88ce096d537a6dfcf80f376a49f3e2a86338755e77b
-SIZE (cabal/smallcheck-0.6.2.tar.gz) = 23125
+SHA256 (cabal/smallcheck-1.0.2.tar.gz) = b1adf57b922c28e57ec79e04e1e6ee7e6e2b38ff7ffd08e5e4f23ebeded6f427
+SIZE (cabal/smallcheck-1.0.2.tar.gz) = 13850
diff --git a/devel/hs-smallcheck/files/patch-smallcheck.cabal b/devel/hs-smallcheck/files/patch-smallcheck.cabal
deleted file mode 100644
index 1f59e8b9d1a..00000000000
--- a/devel/hs-smallcheck/files/patch-smallcheck.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./smallcheck.cabal.orig 2011-12-11 12:08:40.000000000 +0100
-+++ ./smallcheck.cabal 2011-12-16 17:57:48.000000000 +0100
-@@ -27,9 +27,9 @@
- examples/numeric/README, examples/logical/README, examples/imperative/README,
- examples/listy/README, examples/regular/README, examples/circuits/README,
- examples/binarytries/README,
-- README.md, CREDITS.md, CHANGES.md,
- examples/run-examples.sh
-
-+Data-files: README.md CREDITS.md CHANGES.md
-
-
- Source-repository head
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 52911f6aa59..012d1070f38 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index fa761d787d0..76e2af41004 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 1716a8cdfc9..4043c672f39 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index 6324249b4de..8457e7319b3 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= testpack
-PORTVERSION= 2.1.2
-PORTREVISION= 3
+PORTVERSION= 2.1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ FILE_LICENSE= COPYRIGHT
CABAL_SETUP= Setup.hs
-USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3
+USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-testpack/distinfo b/devel/hs-testpack/distinfo
index 2f66fe53c14..6261b2adb87 100644
--- a/devel/hs-testpack/distinfo
+++ b/devel/hs-testpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/testpack-2.1.2.tar.gz) = 2e7604b7e42c173611d9ed329921d96f9bcc8d0417dcb9296f9503bf35a2b089
-SIZE (cabal/testpack-2.1.2.tar.gz) = 14812
+SHA256 (cabal/testpack-2.1.2.1.tar.gz) = 4096465f44f1add5a24134bebdcef5259bff31661680cc1061900bbd936fa4ba
+SIZE (cabal/testpack-2.1.2.1.tar.gz) = 14795
diff --git a/devel/hs-testpack/files/patch-testpack.cabal b/devel/hs-testpack/files/patch-testpack.cabal
new file mode 100644
index 00000000000..f349491c00c
--- /dev/null
+++ b/devel/hs-testpack/files/patch-testpack.cabal
@@ -0,0 +1,11 @@
+--- ./testpack.cabal.orig 2013-02-25 16:03:46.000000000 +0100
++++ ./testpack.cabal 2013-03-09 17:54:39.000000000 +0100
+@@ -39,7 +39,7 @@
+
+ Build-Depends: base >= 3 && < 5,
+ mtl, HUnit,
+- QuickCheck >= 2.1.0.3 && < 2.5
++ QuickCheck >= 2.1.0.3 && < 2.6
+
+ If flag(splitBase)
+ Build-Depends: base >= 3 && < 5, containers, random
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index fd254cbe7dd..3f7039ff9e7 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.0.1
-PORTREVISION= 1
+PORTVERSION= 0.5.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index 8686d9edb63..4b1131b6cc1 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threads-0.5.0.1.tar.gz) = de5383ebbda62ed292a2dc89dc8ae41510861d1bdb2c658300db60705457be2a
-SIZE (cabal/threads-0.5.0.1.tar.gz) = 7304
+SHA256 (cabal/threads-0.5.0.2.tar.gz) = 559a0750565289de60bd6b26784d7978ee85c2662c84feeb504910539eac8c91
+SIZE (cabal/threads-0.5.0.2.tar.gz) = 7337
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 64716d4f861..c2daea5b41b 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= time-compat
-PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTVERSION= 0.1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-compat/distinfo b/devel/hs-time-compat/distinfo
index 40084338fd3..5967d17ffb2 100644
--- a/devel/hs-time-compat/distinfo
+++ b/devel/hs-time-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/time-compat-0.1.0.2.tar.gz) = 0bc6766a085058aeb518dd4bf49c6267db341312162d3cf5b94268bc675f0719
-SIZE (cabal/time-compat-0.1.0.2.tar.gz) = 2255
+SHA256 (cabal/time-compat-0.1.0.3.tar.gz) = 590711214510c0d2d09780c7fe3b21748bc4802e9053f78ccd6658e951fe0f7f
+SIZE (cabal/time-compat-0.1.0.3.tar.gz) = 2256
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index bf0bc8f1eee..ddf67779066 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.1.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index aec56f6cb2b..907aa0a2a27 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-time-0.1.4.tar.gz) = 855bed734cccd25bce95c36d306acf11cb29e9c760bee863239f4c594e4e1fa9
-SIZE (cabal/unix-time-0.1.4.tar.gz) = 34957
+SHA256 (cabal/unix-time-0.1.5.tar.gz) = 8f430221439647f1093d5c7e83dd880bfe1ce1de488a10f4aaa164a867d1b38f
+SIZE (cabal/unix-time-0.1.5.tar.gz) = 34977
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 74f57a4b911..c3edb5f0749 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= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index ae78f759fb4..8cca701ffa8 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 460fdb206ab..579e8b73035 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.42.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
new file mode 100644
index 00000000000..462bcb96bcb
--- /dev/null
+++ b/devel/hs-uuid/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= uuid
+PORTVERSION= 1.2.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Creating, comparing, parsing and printing Universally Unique Identifiers
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= cryptohash>=0.7 maccatcher>=1.0 random>=1.0.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
new file mode 100644
index 00000000000..d7c0b8dba9e
--- /dev/null
+++ b/devel/hs-uuid/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/uuid-1.2.9.tar.gz) = 515377e2fa68b70b9a6a1fbd87259f51a28bd4a8ab3516c93921f1201c5c1c21
+SIZE (cabal/uuid-1.2.9.tar.gz) = 13527
diff --git a/devel/hs-uuid/pkg-descr b/devel/hs-uuid/pkg-descr
new file mode 100644
index 00000000000..c30322f5bbe
--- /dev/null
+++ b/devel/hs-uuid/pkg-descr
@@ -0,0 +1,4 @@
+This library is useful for creating, comparing, parsing and printing
+Universally Unique Identifiers.
+
+WWW: http://projects.haskell.org/uuid/
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index ff2270bde0e..0ef1b55b265 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.14
-PORTREVISION= 4
+PORTVERSION= 0.9.15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index bf0540255f7..6f9c58ee09a 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uulib-0.9.14.tar.gz) = 1f643f741a8238344d33fe399bf57d08d4dab525be3dd508c6f085eb1215262e
-SIZE (cabal/uulib-0.9.14.tar.gz) = 44115
+SHA256 (cabal/uulib-0.9.15.tar.gz) = f58b806ab7ec896f8d66b5f51742fc28057fbfaba969102b26808d4420d46310
+SIZE (cabal/uulib-0.9.15.tar.gz) = 44135
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index 893b9ddf5a8..e94bcbbf034 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index 1310cff6636..53ad1d0da70 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -16,6 +16,7 @@ PKGNAMEPREFIX?= ${HSPREFIX}
LOCALBASE?= /usr/local
GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
+HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
GHC_VERSION= 7.4.2
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
@@ -32,8 +33,12 @@ OPTIONS_DEFINE+= PROFILE
.endif
.if !exists(${GHC_CMD}) || ((exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) && !defined(NOPORTDOCS))
-OPTIONS_DEFINE+= DOCS HSCOLOUR
+OPTIONS_DEFINE+= DOCS
OPTIONS_DEFAULT+= DOCS
+
+.if (${PORTNAME} != hscolour || exists(${HSCOLOUR_CMD})) && !defined(IGNORE_HSCOLOUR)
+OPTIONS_DEFINE+= HSCOLOUR
+.endif
.endif
.if defined(OPTIONSMKINCLUDED)
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 749258a2e05..b724a4c7eb7 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -17,7 +17,6 @@ activehs_port= www/hs-activehs
activehs-base_port= devel/hs-activehs-base
aeson_port= converters/hs-aeson
Agda_port= math/hs-Agda # executable
-Agda-executable_port= math/hs-Agda-executable # executable
alex_port= devel/hs-alex # executable
ALUT_port= audio/hs-ALUT
angel_port= sysutils/hs-angel
@@ -131,6 +130,7 @@ filesystem-conduit_port= devel/hs-filesystem-conduit
fsnotify_port= devel/hs-fsnotify
gconf_port= devel/hs-gconf
generic-deriving_port= devel/hs-generic-deriving
+geniplate_port= devel/hs-geniplate
ghc-events_port= devel/hs-ghc-events # executable
ghc-mtl_port= devel/hs-ghc-mtl
ghc-paths_port= devel/hs-ghc-paths
@@ -207,6 +207,7 @@ libxml_port= textproc/hs-libxml
lifted-base_port= devel/hs-lifted-base
List_port= devel/hs-List
logict_port= devel/hs-logict
+maccatcher_port= net/hs-maccatcher
math-functions_port= math/hs-math-functions
MaybeT_port= devel/hs-MaybeT
MemoTrie_port= devel/hs-MemoTrie
@@ -261,6 +262,7 @@ profunctor-extras_port= devel/hs-profunctor-extras
profunctors_port= devel/hs-profunctors
project-template_port= devel/hs-project-template
PSQueue_port= devel/hs-PSQueue
+publicsuffixlist_port= net/hs-publicsuffixlist
pureMD5_port= security/hs-pureMD5
pwstore-fast_port= security/hs-pwstore-fast
QuickCheck_port= devel/hs-QuickCheck
@@ -275,6 +277,7 @@ regex-base_port= textproc/hs-regex-base
regex-compat_port= textproc/hs-regex-compat
regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin
regex-posix_port= textproc/hs-regex-posix
+regex-tdfa_port= textproc/hs-regex-tdfa
resource-pool_port= devel/hs-resource-pool
resourcet_port= devel/hs-resourcet
RSA_port= security/hs-RSA
@@ -352,6 +355,7 @@ utility-ht_port= devel/hs-utility-ht
uuagc_port= devel/hs-uuagc # executable
uuagc-bootstrap_port= devel/hs-uuagc-bootstrap # executable
uuagc-cabal_port= devel/hs-uuagc-cabal
+uuid_port= devel/hs-uuid
uulib_port= devel/hs-uulib
vault_port= devel/hs-vault
vector_port= devel/hs-vector
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 07429467678..64628002f19 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Validating an email address string against RFC 5322
LICENSE= BSD
-USE_CABAL= parsec ranges>=0.2.2
+USE_CABAL= attoparsec>=0.10.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index 1d31c58a515..8eccda5d0c3 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/email-validate-0.3.2.tar.gz) = 18d6c65b52f41b6b107d6d4c5ee8b95eff8b4a0ea2be07d8b13b061701cd5033
-SIZE (cabal/email-validate-0.3.2.tar.gz) = 41930
+SHA256 (cabal/email-validate-1.0.0.tar.gz) = 4fafd67509e804675e52d97b6ad0dde4b459f7569891c74843155c95ec66416a
+SIZE (cabal/email-validate-1.0.0.tar.gz) = 7205
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 3aefaa69205..149370ce0fe 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mime-mail
PORTVERSION= 0.4.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 5ac720ece15..705e4e47952 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.2
+PORTVERSION= 0.1.0.3
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
index ed8f9dbd8e5..77841e91150 100644
--- a/mail/hs-mime-types/distinfo
+++ b/mail/hs-mime-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-types-0.1.0.2.tar.gz) = 9ab9a912b905a8682fb284cd621115b195f3696499561e14c7068d2126ca70de
-SIZE (cabal/mime-types-0.1.0.2.tar.gz) = 2738
+SHA256 (cabal/mime-types-0.1.0.3.tar.gz) = c19b2acd46c1843f15d273e8a09f7fd7b82a6ac83a3361794d3a5b2a199ef057
+SIZE (cabal/mime-types-0.1.0.3.tar.gz) = 10953
diff --git a/math/Makefile b/math/Makefile
index 7ad6fe32ac5..c855f02a45c 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -155,7 +155,6 @@
SUBDIR += grpn
SUBDIR += gsl
SUBDIR += hs-Agda
- SUBDIR += hs-Agda-executable
SUBDIR += hs-NumInstances
SUBDIR += hs-categories
SUBDIR += hs-comonad
diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile
deleted file mode 100644
index 44e6d041df1..00000000000
--- a/math/hs-Agda-executable/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= Agda-executable
-PORTVERSION= 2.3.0.1
-PORTREVISION= 3
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Command-line program for type-checking and compiling Agda programs
-
-CABAL_SETUP= Setup.hs
-USE_CABAL= Agda>=2.3.0 Agda<2.3.1
-
-USE_ICONV= yes
-
-EXECUTABLE= agda
-STANDALONE= yes
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-Agda-executable/distinfo b/math/hs-Agda-executable/distinfo
deleted file mode 100644
index 6adb590872c..00000000000
--- a/math/hs-Agda-executable/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/Agda-executable-2.3.0.1.tar.gz) = 614594c414c828c87abb1913741db66447c09617d57b92e58ffe445ceffed694
-SIZE (cabal/Agda-executable-2.3.0.1.tar.gz) = 1765
diff --git a/math/hs-Agda-executable/pkg-descr b/math/hs-Agda-executable/pkg-descr
deleted file mode 100644
index e6525337a1d..00000000000
--- a/math/hs-Agda-executable/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package provides a command-line program for type-checking and compiling
-Agda programs. The program can also generate hyperlinked, highlighted HTML
-files from Agda sources.
-
-WWW: http://wiki.portal.chalmers.se/agda/
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index a323aeef942..d86e179601d 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,42 +2,33 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.3.0.1
-PORTREVISION= 3
+PORTVERSION= 2.3.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A dependently typed functional programming language and proof assistant
+COMMENT= Dependently typed functional programming language and proof assistant
CABAL_SETUP= Setup.hs
-USE_CABAL= hashable>=1.2 hashtables haskeline>=0.6.3.2 \
- haskell-src-exts>=1.9.6 mtl QuickCheck>=2.3 syb>=0.1 \
+USE_CABAL= geniplate>=0.6.0.3 hashable>=1.2 hashtables \
+ haskeline>=0.6.3.2 haskell-src-exts>=1.9.6 mtl \
+ QuickCheck>=2.3 parallel syb>=0.1 unordered-containers>=0.2 \
xhtml zlib>=0.4.0.1
USE_ALEX= yes
USE_HAPPY= yes
USE_ICONV= yes
-EXECUTABLE= agda-mode
+EXECUTABLE= agda-mode agda
INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}; \
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DATADIR})
-SHOW_PKGMSG= yes
+OPTIONS_DEFINE= EPIC
-OPTIONS_DEFINE= USE_LOCALE EPIC
-
-USE_LOCALE_DESC= Use encoding specified by the locale
EPIC_DESC= Install the Epic compiler
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.if ${PORT_OPTIONS:MUSE_LOCALE}
-CONFIGURE_ARGS+= --flags="use-locale"
-.else
-CONFIGURE_ARGS+= --flags="-use-locale"
-.endif
-
.if ${PORT_OPTIONS:MEPIC}
CONFIGURE_ARGS+= --flags="epic"
USE_CABAL+= epic>=0.1.13
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index 5ed05c7e570..485c853062a 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Agda-2.3.0.1.tar.gz) = 5cc016a6cf113979d92af05c10b1e92dead4bf87861086177a017ce1d7605338
-SIZE (cabal/Agda-2.3.0.1.tar.gz) = 612342
+SHA256 (cabal/Agda-2.3.2.tar.gz) = d47a0b2a0806ea5c109b59280211a47b980b47a8f6ac0ab9fca673f3d4c6e0f6
+SIZE (cabal/Agda-2.3.2.tar.gz) = 726462
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index ad9b3b70f9a..208d469dd4d 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,38 +1,13 @@
---- ./Agda.cabal.orig 2012-03-12 11:09:34.000000000 +0100
-+++ ./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
- else
-- build-depends: base == 4.1.*,
-+ build-depends: base >= 4.1,
- utf8-string == 0.3.*
- if flag(epic)
- build-depends: epic >= 0.1.13 && < 0.10
-- build-depends: mtl == 2.0.*,
-- QuickCheck >= 2.3 && < 2.5,
-- haskell-src-exts >= 1.9.6 && < 1.12,
-+ build-depends: mtl >= 2.0,
-+ QuickCheck >= 2.3 && < 2.6,
-+ haskell-src-exts >= 1.9.6,
- containers >= 0.1 && < 0.5,
- pretty >= 1.0 && < 1.2,
- directory >= 1.0 && < 1.2,
-@@ -90,7 +90,7 @@
+--- ./Agda.cabal.orig 2012-11-12 01:25:25.000000000 +0100
++++ ./Agda.cabal 2013-03-09 17:44:08.000000000 +0100
+@@ -82,8 +82,8 @@
process >= 1.0.1.0 && < 1.2,
- haskeline >= 0.6.3.2 && < 0.7,
+ haskeline >= 0.6.3.2 && < 0.8,
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
- else
-- build-depends: base == 4.1.*,
-+ build-depends: base >= 4.1,
- utf8-string == 0.3.*
- build-depends: filepath >= 1.1 && < 1.4,
- process >= 1.0.1.0 && < 1.2,
+- hashable >= 1.1.2.3 && < 1.2,
+- hashtables == 1.0.*,
++ hashable >= 1.1.2.3 && < 1.3,
++ hashtables == 1.1.*,
+ geniplate >= 0.6.0.3 && < 0.7,
+ parallel < 3.3,
+ deepseq == 1.3.*,
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Compiler__MAlonzo__Compiler.hs b/math/hs-Agda/files/patch-src__full__Agda__Compiler__MAlonzo__Compiler.hs
deleted file mode 100644
index bae4ce30dd1..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Compiler__MAlonzo__Compiler.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/full/Agda/Compiler/MAlonzo/Compiler.hs.orig 2012-03-12 11:09:33.000000000 +0100
-+++ ./src/full/Agda/Compiler/MAlonzo/Compiler.hs 2012-04-08 22:51:55.000000000 +0200
-@@ -466,7 +466,7 @@
- ]
- where
- parse = HS.parseWithMode
-- HS.defaultParseMode{HS.extensions = [HS.ExplicitForall]}
-+ HS.defaultParseMode{HS.extensions = [HS.ExplicitForAll]}
-
- ok (HS.ParseOk d) = d
- ok HS.ParseFailed{} = __IMPOSSIBLE__
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
new file mode 100644
index 00000000000..5108666a583
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
@@ -0,0 +1,24 @@
+--- ./src/full/Agda/Syntax/Abstract/Name.hs.orig 2012-11-12 01:25:21.000000000 +0100
++++ ./src/full/Agda/Syntax/Abstract/Name.hs 2013-02-10 15:14:44.000000000 +0100
+@@ -239,8 +239,8 @@
+ show x = show (nameConcrete x) -- ++ "|" ++ show (nameId x)
+
+ instance Hashable Name where
+- {-# INLINE hash #-}
+- hash = hash . nameId
++ {-# INLINE hashWithSalt #-}
++ hashWithSalt salt = hashWithSalt salt . nameId
+
+ instance Show QName where
+ show q = concat $ intersperse "." $ map show $ qnameToList q
+@@ -255,8 +255,8 @@
+ compare = compare `on` qnameName
+
+ instance Hashable QName where
+- {-# INLINE hash #-}
+- hash = hash . qnameName
++ {-# INLINE hashWithSalt #-}
++ hashWithSalt salt = hashWithSalt salt . qnameName
+
+ instance HasRange Name where
+ getRange = getRange . nameConcrete
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
new file mode 100644
index 00000000000..b071c8448e1
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
@@ -0,0 +1,13 @@
+--- ./src/full/Agda/Syntax/Common.hs.orig 2012-11-12 01:25:21.000000000 +0100
++++ ./src/full/Agda/Syntax/Common.hs 2013-02-10 15:12:42.000000000 +0100
+@@ -272,8 +272,8 @@
+ fromEnum (NameId n _) = fromIntegral n
+
+ instance Hashable NameId where
+- {-# INLINE hash #-}
+- hash (NameId n m) = hash (n, m)
++ {-# INLINE hashWithSalt #-}
++ hashWithSalt salt (NameId n m) = hashWithSalt salt (n, m)
+
+ newtype Constr a = Constr a
+
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs b/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs
deleted file mode 100644
index 907f0bed527..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Termination__Lexicographic.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/full/Agda/Termination/Lexicographic.hs.orig 2012-03-12 11:09:33.000000000 +0100
-+++ ./src/full/Agda/Termination/Lexicographic.hs 2012-10-03 23:48:30.000000000 +0200
-@@ -230,7 +230,7 @@
- , quickCheck' prop_fromDiagonals
- , quickCheck' prop_newBehaviour
- , quickCheckWith' stdArgs{ maxSuccess = 50
-- , maxDiscard = 200
-+ , maxDiscardRatio = 200
- , maxSize = 20
- }
- prop_lexOrder
diff --git a/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs b/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs
deleted file mode 100644
index ef6fa31298e..00000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__TypeChecking__Serialise.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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-Agda/files/patch-src__full__Agda__Utils__Pointer.hs b/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
new file mode 100644
index 00000000000..1d480e01d10
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
@@ -0,0 +1,11 @@
+--- ./src/full/Agda/Utils/Pointer.hs.orig 2012-11-12 01:25:22.000000000 +0100
++++ ./src/full/Agda/Utils/Pointer.hs 2013-02-10 15:11:53.000000000 +0100
+@@ -71,7 +71,7 @@
+ compare = compare `on` ptrTag
+
+ instance Hashable (Ptr a) where
+- hash = hash . ptrTag
++ hashWithSalt salt = hashWithSalt salt . ptrTag
+
+ instance NFData (Ptr a) where
+
diff --git a/math/hs-Agda/pkg-message b/math/hs-Agda/pkg-message
deleted file mode 100644
index 10d2fc595c3..00000000000
--- a/math/hs-Agda/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-Note that if you want to use the command-line program (agda), then
-you should also install the Agda-executable package. The Agda
-package includes an Emacs mode for Agda, but you need to set up the
-Emacs mode yourself (for instance by running agda-mode setup; see
-the README).
-
-Note also that this library does not follow the package versioning
-policy, because the library is only intended to be used by the Emacs
-mode and the Agda-executable package.
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index d1e974d076e..6ab70bcd169 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= NumInstances
-PORTVERSION= 1.0
-PORTREVISION= 4
+PORTVERSION= 1.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-NumInstances/distinfo b/math/hs-NumInstances/distinfo
index eeddcb7b286..769849faf73 100644
--- a/math/hs-NumInstances/distinfo
+++ b/math/hs-NumInstances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/NumInstances-1.0.tar.gz) = dea19248d921dcb90c28d0ebeddbc2c76840bc2545762c1442aea8caa91eafba
-SIZE (cabal/NumInstances-1.0.tar.gz) = 2695
+SHA256 (cabal/NumInstances-1.2.tar.gz) = a95c45280f794ef54ac1968a2938c2a87feb7c0c42e3923ea326bc0ee0904668
+SIZE (cabal/NumInstances-1.2.tar.gz) = 3701
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
index 753c865fb41..f63e2d26180 100644
--- a/math/hs-comonad-transformers/Makefile
+++ b/math/hs-comonad-transformers/Makefile
@@ -2,6 +2,7 @@
PORTNAME= comonad-transformers
PORTVERSION= 3.0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index dc29fc0526a..5719cc6db63 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 3.0.1.1
+PORTVERSION= 3.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 02bf21e22a8..2a8f812b7bf 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-3.0.1.1.tar.gz) = 82418cd6783a166e6b9c17040ea1be6b3d0a17b3f55b9f8db3a61bdf71eef807
-SIZE (cabal/comonad-3.0.1.1.tar.gz) = 4302
+SHA256 (cabal/comonad-3.0.2.tar.gz) = 5e3999df99acb4a956b6593718a0aa099c5386fc7f88915c963517d6998bde67
+SIZE (cabal/comonad-3.0.2.tar.gz) = 7660
diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile
index 060347d9369..ea1c212a898 100644
--- a/math/hs-comonads-fd/Makefile
+++ b/math/hs-comonads-fd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= comonads-fd
PORTVERSION= 3.0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 5883a9326a0..2c8d500e5d8 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= contravariant
-PORTVERSION= 0.2.0.2
-PORTREVISION= 3
+PORTVERSION= 0.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Haskell 98 contravariant functors
LICENSE= BSD
-USE_CABAL= transformers>=0.2.2
+USE_CABAL= tagged>=0.4.4 transformers>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index 92a8a022957..16145605d7e 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/contravariant-0.2.0.2.tar.gz) = 77b8e9fcc65df51714eb95615b23371aa3bd864e8c6dedb775eb939058d08204
-SIZE (cabal/contravariant-0.2.0.2.tar.gz) = 2929
+SHA256 (cabal/contravariant-0.4.tar.gz) = 8361967a6ee1a3fe113a57242507f56364d8c3daf558370633db74b613a31adb
+SIZE (cabal/contravariant-0.4.tar.gz) = 3277
diff --git a/math/hs-contravariant/files/patch-contravariant.cabal b/math/hs-contravariant/files/patch-contravariant.cabal
new file mode 100644
index 00000000000..8dccf0102fe
--- /dev/null
+++ b/math/hs-contravariant/files/patch-contravariant.cabal
@@ -0,0 +1,12 @@
+--- ./contravariant.cabal.orig 2013-02-05 23:24:34.000000000 +0100
++++ ./contravariant.cabal 2013-02-10 10:56:13.000000000 +0100
+@@ -25,8 +25,7 @@
+ build-depends:
+ base < 5,
+ tagged >= 0.4.4 && < 1,
+- transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 1
++ transformers >= 0.3 && < 0.4
+ exposed-modules:
+ Data.Functor.Contravariant
+ Data.Functor.Contravariant.Compose
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index 0d2fbd8c766..b2cfe132cbd 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens-template
PORTVERSION= 2.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 6c74b09e98a..c15785b9570 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens
PORTVERSION= 2.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index de6f5ef4f37..833163d382e 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.3
+PORTVERSION= 0.3.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index 05e44530a90..3cbeeb3c357 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/distributive-0.3.tar.gz) = 4e8c782dea78698d7de89e20ddaa4c907ec0e3ba41267d53bf3b242ba6e2db7c
-SIZE (cabal/distributive-0.3.tar.gz) = 5899
+SHA256 (cabal/distributive-0.3.1.tar.gz) = 6c49c36c7c098b3640ff03c3379d766ef23c9914053d671e584ba7df03e6c37d
+SIZE (cabal/distributive-0.3.1.tar.gz) = 5900
diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile
index cf2050cc57a..2ded1df0b28 100644
--- a/math/hs-groupoids/Makefile
+++ b/math/hs-groupoids/Makefile
@@ -2,6 +2,7 @@
PORTNAME= groupoids
PORTVERSION= 3.0.1.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 9139b85d952..c6d2b9d3872 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= math-functions
-PORTVERSION= 0.1.1.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3.0
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-math-functions/distinfo b/math/hs-math-functions/distinfo
index 7c501450802..32964fffb4d 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/math-functions-0.1.1.2.tar.gz) = 3b192313ff99bcdde0fce04de41fafa111e321c424e480223f6feffe0f310927
-SIZE (cabal/math-functions-0.1.1.2.tar.gz) = 16338
+SHA256 (cabal/math-functions-0.1.3.0.tar.gz) = c5abf1f44ef52c30e5dab9675e8fb8605e6568ea356ed1fd9d4f57b81cca9d1b
+SIZE (cabal/math-functions-0.1.3.0.tar.gz) = 23729
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 9b4b9f5ad34..e9c3856d54c 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pointed
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile
index cf90c8c57d0..ba64da80dd5 100644
--- a/math/hs-semigroupoid-extras/Makefile
+++ b/math/hs-semigroupoid-extras/Makefile
@@ -2,6 +2,7 @@
PORTNAME= semigroupoid-extras
PORTVERSION= 3.0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index d7af1561f6b..8e47f38a201 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -2,6 +2,7 @@
PORTNAME= semigroupoids
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 895ac101efe..985dc499bb6 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -3,7 +3,7 @@
PORTNAME= statistics
PORTVERSION= 0.10.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 8ba80b0aff2..14f81263fc5 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vector-space
PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/Makefile b/net/Makefile
index 5169ea5ec90..6786d095d25 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -221,11 +221,13 @@
SUBDIR += hping
SUBDIR += hping-devel
SUBDIR += hs-hostname
+ SUBDIR += hs-maccatcher
SUBDIR += hs-network
SUBDIR += hs-network-conduit
SUBDIR += hs-network-info
SUBDIR += hs-network-multicast
SUBDIR += hs-pcap
+ SUBDIR += hs-publicsuffixlist
SUBDIR += hs-sendfile
SUBDIR += hs-simple-sendfile
SUBDIR += hs-socks
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
new file mode 100644
index 00000000000..17f98d40185
--- /dev/null
+++ b/net/hs-maccatcher/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= maccatcher
+PORTVERSION= 2.1.5
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Obtain the host MAC address on *NIX and Windows
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= parsec
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-maccatcher/distinfo b/net/hs-maccatcher/distinfo
new file mode 100644
index 00000000000..600eb5dc15a
--- /dev/null
+++ b/net/hs-maccatcher/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/maccatcher-2.1.5.tar.gz) = cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c
+SIZE (cabal/maccatcher-2.1.5.tar.gz) = 4947
diff --git a/net/hs-maccatcher/pkg-descr b/net/hs-maccatcher/pkg-descr
new file mode 100644
index 00000000000..fb4c6372c11
--- /dev/null
+++ b/net/hs-maccatcher/pkg-descr
@@ -0,0 +1,3 @@
+Obtain the host MAC address on *NIX and Windows.
+
+WWW: http://hackage.haskell.org/package/maccatcher
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
index 7429be6f70d..571fb593743 100644
--- a/net/hs-network-conduit/Makefile
+++ b/net/hs-network-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network-conduit
-PORTVERSION= 0.6.2.2
+PORTVERSION= 1.0.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Stream socket data using conduits
LICENSE= BSD
-USE_CABAL= conduit>=0.5 lifted-base>=0.1 monad-control>=0.3 \
+USE_CABAL= conduit>=1.0 lifted-base>=0.1 monad-control>=0.3 \
network>=2.3 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-network-conduit/distinfo b/net/hs-network-conduit/distinfo
index b58b9cf364e..94d0fadad12 100644
--- a/net/hs-network-conduit/distinfo
+++ b/net/hs-network-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-conduit-0.6.2.2.tar.gz) = ac0a0019871730fc7a2719dabd9d826b2d4580ef2b433d213a199e93385c0aed
-SIZE (cabal/network-conduit-0.6.2.2.tar.gz) = 5814
+SHA256 (cabal/network-conduit-1.0.0.tar.gz) = 63de6be7775d99a56485be57af965aea957c228ea9cae8389b20d03bb9796f9a
+SIZE (cabal/network-conduit-1.0.0.tar.gz) = 5853
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
new file mode 100644
index 00000000000..3c623f0f87a
--- /dev/null
+++ b/net/hs-publicsuffixlist/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= publicsuffixlist
+PORTVERSION= 0.0.3
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Is a given string a domain suffix?
+
+LICENSE= BSD
+
+USE_CABAL= cereal data-default text>=0.11 utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-publicsuffixlist/distinfo b/net/hs-publicsuffixlist/distinfo
new file mode 100644
index 00000000000..d043640385e
--- /dev/null
+++ b/net/hs-publicsuffixlist/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/publicsuffixlist-0.0.3.tar.gz) = 9161ef67b0d52a590f70d5a9ff9b3fcb90cefe7b2319e07f4ec280717fa83ab7
+SIZE (cabal/publicsuffixlist-0.0.3.tar.gz) = 36122
diff --git a/net/hs-publicsuffixlist/pkg-descr b/net/hs-publicsuffixlist/pkg-descr
new file mode 100644
index 00000000000..db2bcf2ee94
--- /dev/null
+++ b/net/hs-publicsuffixlist/pkg-descr
@@ -0,0 +1,3 @@
+Is a given string a domain suffix?
+
+WWW: https://github.com/litherum/publicsuffixlist
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index da52943ce0e..0f00f79b652 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= sendfile
-PORTVERSION= 0.7.8
-PORTREVISION= 1
+PORTVERSION= 0.7.9
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/distinfo b/net/hs-sendfile/distinfo
index 5cb44a3e7d9..56eb2caf27a 100644
--- a/net/hs-sendfile/distinfo
+++ b/net/hs-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/sendfile-0.7.8.tar.gz) = b47be35bd1f8f9f55fdf6df0c89c74996502091f1fe501e97a84903c6364c977
-SIZE (cabal/sendfile-0.7.8.tar.gz) = 10659
+SHA256 (cabal/sendfile-0.7.9.tar.gz) = 102fdf6db8c00f5a5981c6eed5acba1368a2d79b2970ce5b22ceb180aa0fdc42
+SIZE (cabal/sendfile-0.7.9.tar.gz) = 10656
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 28be573ec3e..adf21643a16 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.10
+PORTVERSION= 0.2.11
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index be40ced2787..74441c13ab9 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-sendfile-0.2.10.tar.gz) = 55253bee2269e8f310fa95fb89881b06ae2fd8598930cd87de4279ef130a5a1e
-SIZE (cabal/simple-sendfile-0.2.10.tar.gz) = 7329
+SHA256 (cabal/simple-sendfile-0.2.11.tar.gz) = d26162f7025660e9a6cb38b866522a76444a289307381a94b1d3c9b43b4d35e1
+SIZE (cabal/simple-sendfile-0.2.11.tar.gz) = 7166
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 7b1d48d29fd..a60bb8c9f37 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= socks
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-socks/distinfo b/net/hs-socks/distinfo
index 235da18514f..37bd784a149 100644
--- a/net/hs-socks/distinfo
+++ b/net/hs-socks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/socks-0.4.2.tar.gz) = 19711104679ab984ca66bb226e70fc9e40a602201a190a1496b3c828a5e870d9
-SIZE (cabal/socks-0.4.2.tar.gz) = 5779
+SHA256 (cabal/socks-0.5.0.tar.gz) = 47e3dd9c8d0cf6bbde2c01db428c345b70cc3e7e1ac484fef9b61855faf666d2
+SIZE (cabal/socks-0.5.0.tar.gz) = 7306
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index bcb8b52ea4b..bea0e5cc260 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -19,12 +19,3 @@ EXECUTABLE= HsColour
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
-
-pre-everything::
-.if ${PORT_OPTIONS:MHSCOLOUR}
- @${ECHO_MSG} "================================================================="
- @${ECHO_MSG} " Please note that you will not be able to build HsColour-enabled "
- @${ECHO_MSG} " documentation without installing HsColour without that first. "
- @${ECHO_MSG} "================================================================="
- @sleep 5
-.endif
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 0b2849ef17c..177943f0601 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= RSA
PORTVERSION= 1.2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index d837627bd09..cc33a5fbbad 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= certificate
PORTVERSION= 1.3.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index c58591c8491..aa4c7b96897 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -2,6 +2,7 @@
PORTNAME= clientsession
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index 8837818cec2..d805d5a8655 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index e8911d10f96..6be8bb425b4 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-api
-PORTVERSION= 0.10.2
-PORTREVISION= 3
+PORTVERSION= 0.11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.2 entropy largeword>=1.0.0 tagged>=0.1
+USE_CABAL= cereal>=0.2 entropy tagged>=0.1 transformers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-api/distinfo b/security/hs-crypto-api/distinfo
index 964f09a43d9..63391f73a59 100644
--- a/security/hs-crypto-api/distinfo
+++ b/security/hs-crypto-api/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-api-0.10.2.tar.gz) = ba929decee6fe3ed143d8491f3f67e71fdef9f56d0c9eb142b0e0aee79dbab19
-SIZE (cabal/crypto-api-0.10.2.tar.gz) = 44538
+SHA256 (cabal/crypto-api-0.11.tar.gz) = 3e563725a0fa6f4dcaa238e2b3413e420f0684e264fc5bcbca0b75466a6d82ec
+SIZE (cabal/crypto-api-0.11.tar.gz) = 15684
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 1479023787b..832fc819d6a 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-conduit
-PORTVERSION= 0.4.3
+PORTVERSION= 0.5.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= cereal>=0.3 conduit>=0.5 crypto-api>=0.9 transformers>=0.2
+USE_CABAL= cereal>=0.3 conduit>=1.0 crypto-api>=0.9 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index 169b97d7781..6c464680188 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.4.3.tar.gz) = 33fbfb08a9c7eeb4eade92dea43f3223d65934fadfd26a0e12bf628850ae2d41
-SIZE (cabal/crypto-conduit-0.4.3.tar.gz) = 6884
+SHA256 (cabal/crypto-conduit-0.5.0.tar.gz) = 22a9e41f52e4878e386c13ad6a74f860f1602b6fee778da5f31c70820e158e56
+SIZE (cabal/crypto-conduit-0.5.0.tar.gz) = 6853
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index 5c7314146fa..b03b5701642 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-pubkey
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 706e05cd2b5..cd8d4f0dd2e 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cryptocipher
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 1f2d5d3fce2..31eb52b1661 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cryptohash
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 91741c386ee..f09f1185877 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monadcryptorandom
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-monadcryptorandom/distinfo b/security/hs-monadcryptorandom/distinfo
index 2d574a5e3a0..36459022780 100644
--- a/security/hs-monadcryptorandom/distinfo
+++ b/security/hs-monadcryptorandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monadcryptorandom-0.5.tar.gz) = 4b70ceb0dee5df63a7c2dde8c77b0002505b6c33382a6075e8b5d6ed5e4d4ba7
-SIZE (cabal/monadcryptorandom-0.5.tar.gz) = 4116
+SHA256 (cabal/monadcryptorandom-0.5.1.tar.gz) = a6a1712f83ff6345bb3104f3b7158ca4fa893bf88df198d6a398c11301eb8a83
+SIZE (cabal/monadcryptorandom-0.5.1.tar.gz) = 4603
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 581bcf430ac..8170c0343ef 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index c35d43d0a29..301c1185c53 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,11 +2,11 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell-only implementation of MD5 digest (hash) yalgorithm
+COMMENT= A Haskell-only implementation of MD5 digest (hash) yalgorithm
LICENSE= BSD
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 20e454c6d69..7217c6f631a 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 3bc6bfd52d6..fd6922a5edb 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 0.1.0.11
+PORTVERSION= 0.1.0.12
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index 1bc0d9ec186..22dcbe54132 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-0.1.0.11.tar.gz) = 3808b64716083630c2a900e86006ca3cfedf77b59b3e56e8f271fefeb31b3e9a
-SIZE (cabal/skein-0.1.0.11.tar.gz) = 117775
+SHA256 (cabal/skein-0.1.0.12.tar.gz) = 6abc01432df1fe290a46b18dbf21383a3b03af123672780f93b4fee34153a0db
+SIZE (cabal/skein-0.1.0.12.tar.gz) = 117780
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index 5c2f5955044..37d6e3cd5d0 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tls-extra
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index a4ef867f3a4..10345ddb194 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index f2c24748af7..6cfabc30ca6 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-1.1.1.tar.gz) = f8faea5f050e7fb2a095bffa9327c37aef04e5ec45fa978d32ceecf1cb1a284a
-SIZE (cabal/tls-1.1.1.tar.gz) = 47518
+SHA256 (cabal/tls-1.1.2.tar.gz) = 0fcbc6c4609c0ed176b8c43bb9bfefdaebed392457de7511d1af7766beade1ed
+SIZE (cabal/tls-1.1.2.tar.gz) = 47559
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 957e55bcf1f..3d3a0c2d455 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= angel
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/Makefile b/textproc/Makefile
index b1709f2ade3..7cc8e091bc0 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -266,6 +266,7 @@
SUBDIR += hs-regex-compat
SUBDIR += hs-regex-pcre-builtin
SUBDIR += hs-regex-posix
+ SUBDIR += hs-regex-tdfa
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index d42715455fb..2fd545d3dcb 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.6.12
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD
-USE_CABAL= blaze-builder mtl parsec syb syb-with-class text utf8-string
+USE_CABAL= blaze-builder mtl parsec syb text utf8-string void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index d95bedbb358..78a7998fa05 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.6.12.tar.gz) = 371c0603eb85c47376394476e3999bd481af164dec5ba483bb5d12bdb0005d0a
-SIZE (cabal/HStringTemplate-0.6.12.tar.gz) = 16091
+SHA256 (cabal/HStringTemplate-0.7.1.tar.gz) = 8d12e36b69c8c98974f2b449b7308cecc8cf59a82049c43985f1ab6e12090c43
+SIZE (cabal/HStringTemplate-0.7.1.tar.gz) = 16457
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 35017507d09..c8514302d44 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-conduit
-PORTVERSION= 0.5.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Consume attoparsec parsers via conduit
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 conduit>=0.5 text>=0.11 transformers>=0.2.2
+USE_CABAL= attoparsec>=0.10 conduit>=1.0 text>=0.11 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
index f8731ccef53..c5e4a7c5836 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = bc7947c9a57e46098f024efb7d35e4644528a6fb4749af4ccfaa8e84ebd965d8
-SIZE (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = 3779
+SHA256 (cabal/attoparsec-conduit-1.0.0.tar.gz) = 68c50163ab30c614d8d2fe125d332812e693548ceac1af4cbbbc43ce703880ab
+SIZE (cabal/attoparsec-conduit-1.0.0.tar.gz) = 3761
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 20285e3330d..78b2f004a3c 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index bb39514275a..c10b051905a 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.10.3.0
+PORTVERSION= 0.10.4.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index dddb24578e6..f7172f96066 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-0.10.3.0.tar.gz) = a04426cf283367814e8e69751fd6ae3a2ba4d834765cd0b7cb375b6f9fb38cd0
-SIZE (cabal/attoparsec-0.10.3.0.tar.gz) = 36214
+SHA256 (cabal/attoparsec-0.10.4.0.tar.gz) = b6b84e0dbd1c3beec1dedea578ac2f4d62afbe66b383582b7b3349406866d346
+SIZE (cabal/attoparsec-0.10.4.0.tar.gz) = 36268
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 3bff6de6fbd..85a4f5734dd 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.3
+PORTVERSION= 0.6.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 2384f90c44e..3262656819f 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.5.1.3.tar.gz) = 3c40a8a1169207baea6267ce2b657f9d0d136e023815c48931875143c6bc4745
-SIZE (cabal/blaze-html-0.5.1.3.tar.gz) = 77446
+SHA256 (cabal/blaze-html-0.6.0.0.tar.gz) = 94b6927d5a268fccc5156e0e9f1a54a800f2da20174ab4bcbb49684675bd1259
+SIZE (cabal/blaze-html-0.6.0.0.tar.gz) = 77780
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index faea1ff0c83..cd88aaf4f64 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.4
+PORTVERSION= 1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ 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 10362bca2ab..5b7543ed72c 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-0.4.0.4.tar.gz) = 8d578b2ae3276121ab5cfb68fe9f4f008cb217eaf8b3beb7336d6d844cccf7f7
-SIZE (cabal/case-insensitive-0.4.0.4.tar.gz) = 3360
+SHA256 (cabal/case-insensitive-1.0.tar.gz) = f323b4b486523a1778841c1c5d0917a1dfd7dca68298dc8a022341efcb3a83f4
+SIZE (cabal/case-insensitive-1.0.tar.gz) = 4772
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index d8c15accc41..1626e64cfa2 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.7
+PORTVERSION= 0.3.8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 4d63dde56f1..4a477d271b9 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.7.tar.gz) = 6bb498a3e1c4132565e729807119dfdce70704dacf990441a0a4a38afef1a947
-SIZE (cabal/citeproc-hs-0.3.7.tar.gz) = 105112
+SHA256 (cabal/citeproc-hs-0.3.8.tar.gz) = e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72
+SIZE (cabal/citeproc-hs-0.3.8.tar.gz) = 105544
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 5bbfe88ed50..aa73b37bf36 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.5
+PORTVERSION= 0.5.3.8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 6edf75bbe5b..b55f6b5c5f7 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.5.tar.gz) = 637bf142fb40c7fc748b3f6ee97661799ef87c7d78fe4769b3e7f017c780e654
-SIZE (cabal/highlighting-kate-0.5.3.5.tar.gz) = 628362
+SHA256 (cabal/highlighting-kate-0.5.3.8.tar.gz) = 5ca00f73773b1638bbbdae736d41c889d3f971dbdfbfacdf7ab5001e21afafb9
+SIZE (cabal/highlighting-kate-0.5.3.8.tar.gz) = 661579
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 85544129c79..dcc2b1efb26 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 4.16
+PORTVERSION= 4.17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 0da465f8e1a..34cf13114ce 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.16.tar.gz) = abc7e96edc6dd8121252027fd14bc0f8196d1dc879e862dead8dd30e36760114
-SIZE (cabal/hs-bibutils-4.16.tar.gz) = 436535
+SHA256 (cabal/hs-bibutils-4.17.tar.gz) = aff139a7f589d71ebbaa918f9e1be55a0f2d1d5378f77db9b36171bebac6616f
+SIZE (cabal/hs-bibutils-4.17.tar.gz) = 443548
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 74e0992e4c1..ac1efd77255 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 0.1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,9 +11,9 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= conduit>=0.5 filesystem-conduit>=0.5 resourcet>=0.3 \
+USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \
system-filepath>=0.4 tagstream-conduit>=0.4 text \
- transformers xml-conduit>=1.0 xml-types>=0.3
+ transformers xml-conduit>=1.1 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index af6d2c66e5c..5b21bb9b1ea 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-0.1.0.4.tar.gz) = e8c4a66e4a093cf19e50fbf9d2bc278a025e2c1060525d48692afc660a3a41bc
-SIZE (cabal/html-conduit-0.1.0.4.tar.gz) = 3797
+SHA256 (cabal/html-conduit-1.1.0.tar.gz) = a3d47dee8983828688bf9ebceccfa256c3bf1414664010a79fc82e48efc9b386
+SIZE (cabal/html-conduit-1.1.0.tar.gz) = 3789
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 6794b595fee..59e74dae053 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= hxt-regex-xmlschema
-PORTVERSION= 9.0.4
-PORTREVISION= 4
+PORTVERSION= 9.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A regular expression library for W3C XML Schema regular expressions
+COMMENT= Regular expression library for W3C XML Schema regular expressions
+
+LICENSE= MIT
CABAL_SETUP= Setup.hs
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index b1e833ddd29..8e7f39a485f 100644
--- a/textproc/hs-hxt-regex-xmlschema/distinfo
+++ b/textproc/hs-hxt-regex-xmlschema/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-regex-xmlschema-9.0.4.tar.gz) = eef1c9ae42b3d2ed78019bec6bed92034b1395ea5aa725a459df9ca5d34d884a
-SIZE (cabal/hxt-regex-xmlschema-9.0.4.tar.gz) = 27212
+SHA256 (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 99bf7f8c7e2b0d930c84ce699861549e02408716902f1e5febf51abaf3cc2751
+SIZE (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 26675
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index e48d63f858f..f61ae640769 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 98931676c39..1087e1488cb 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.9.1
-PORTREVISION= 3
+PORTVERSION= 1.10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 711c6f548b9..d7768952287 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.9.1.tar.gz) = 3188ea41957a0276fded01b64147b439e5da8fc50f663c870de78117d5b4e484
-SIZE (cabal/pandoc-types-1.9.1.tar.gz) = 13941
+SHA256 (cabal/pandoc-types-1.10.tar.gz) = e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5
+SIZE (cabal/pandoc-types-1.10.tar.gz) = 13830
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 3bcc670b26c..0003ff03c21 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.9.4.5
-PORTREVISION= 1
+PORTVERSION= 1.11.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,37 +13,28 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4.3.0 citeproc-hs>=0.3.4 \
- highlighting-kate>=0.5.0.2 HTTP>=4000.0.5 json>=0.4 \
- mtl>=1.1 network>=2 pandoc-types>=1.9.0.2 parsec>=3.1 \
- random>=1 syb>=0.1 tagsoup>=0.12.5 temporary>=1.1 \
- texmath>=0.6.0.2 utf8-string>=0.3 xml>=1.3.12 \
- zip-archive>=0.1.1.7 zlib>=0.5
+USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
+ citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
+ HTTP>=4000.0.5 json>=0.4 mtl>=1.1 network>=2 \
+ pandoc-types>=1.10 parsec>=3.1 random>=1 syb>=0.1 \
+ tagsoup>=0.12.5 temporary>=1.1 texmath>=0.6.1.3 \
+ text>=0.11 xml>=1.3.12 zip-archive>=0.1.3.3 zlib>=0.5
+
+EXECUTABLE= pandoc
MAN1= pandoc.1
MAN5= pandoc_markdown.5
-OPTIONS_MULTI= FORMAT
-OPTIONS_MULTI_FORMAT= EXECUTABLE LIBRARY
-OPTIONS_DEFAULT= EXECUTABLE LIBRARY
+OPTIONS_DEFINE= EMBED_DATA_FILES
-EXECUTABLE_DESC= Build the pandoc executable
-LIBRARY_DESC= Build the pandoc library
+EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="exectuable"
-EXECUTABLE+= pandoc
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
-
-.if ${PORT_OPTIONS:MLIBRARY}
-CONFIGURE_ARGS+= --flags="library"
+.if ${PORT_OPTIONS:MEMBED_DATA_FILES}
+CONFIGURE_ARGS+= --flags="embed_data_files"
.else
-CONFIGURE_ARGS+= --flags="-library"
-STANDALONE= yes
+CONFIGURE_ARGS+= --flags="-embed_data_files"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index b064335c32a..f0ca3b6cb90 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.4.5.tar.gz) = cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816
-SIZE (cabal/pandoc-1.9.4.5.tar.gz) = 574992
+SHA256 (cabal/pandoc-1.11.1.tar.gz) = ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c
+SIZE (cabal/pandoc-1.11.1.tar.gz) = 1093354
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 27c5e204c9f..244447974f1 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,18 +1,20 @@
---- ./Setup.hs.orig 2012-10-21 23:06:41.000000000 +0200
-+++ ./Setup.hs 2012-10-23 18:33:48.000000000 +0200
-@@ -6,7 +6,7 @@
+--- ./Setup.hs.orig 2013-01-29 01:14:38.000000000 +0100
++++ ./Setup.hs 2013-02-17 00:48:54.000000000 +0100
+@@ -8,7 +8,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
- import Distribution.Simple.Utils (installOrdinaryFiles)
+ import Distribution.Simple.Utils (installOrdinaryFiles, info)
import Prelude hiding (catch)
import System.Process ( rawSystem )
-@@ -49,5 +49,5 @@
+@@ -53,7 +53,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
- installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+ installOrdinaryFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> manDir)
(zip (repeat manDir) manpages)
+
+ ppBlobSuffixHandler :: PPSuffixHandler
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 4c16865ec93..dab008ebc87 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,9 +1,10 @@
Pandoc is a Haskell library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
-markdown and (subsets of) reStructuredText, HTML, LaTeX and Textile, and
-it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
-OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man pages,
-plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5 and Slidy and
+markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
+MediaWiki markup, and Textile, and it can write markdown,
+reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, Word
+docx, RTF, MediaWiki, Textile, groff man pages, plain text, Emacs
+Org-Mode, AsciiDoc, EPUB (v2 and v3), FictionBook2, and S5, Slidy and
Slideous HTML slide shows. Pandoc extends standard markdown syntax with
footnotes, embedded LaTeX, definition lists, tables, and other features.
A compatibility mode is provided for those who need a drop-in
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
new file mode 100644
index 00000000000..69350b0c825
--- /dev/null
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= regex-tdfa
+PORTVERSION= 1.1.8
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Replaces/Enhances Text.Regex
+
+CABAL_SETUP= Setup.hs
+
+USE_CABAL= mtl parsec regex-base>=0.93.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
new file mode 100644
index 00000000000..3b82ec9b7dd
--- /dev/null
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/regex-tdfa-1.1.8.tar.gz) = 7d9ca2ff95e602c46090dfa56f3176fe903d8d08ac9d725c79af56be0aece5d4
+SIZE (cabal/regex-tdfa-1.1.8.tar.gz) = 65948
diff --git a/textproc/hs-regex-tdfa/pkg-descr b/textproc/hs-regex-tdfa/pkg-descr
new file mode 100644
index 00000000000..da68fb6f639
--- /dev/null
+++ b/textproc/hs-regex-tdfa/pkg-descr
@@ -0,0 +1,3 @@
+A new all Haskell "tagged" DFA regex engine, inspired by libtre.
+
+WWW: http://hackage.haskell.org/package/regex-tdfa
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 091694c801a..d7e03be2464 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagstream-conduit
-PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTVERSION= 0.5.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,8 +11,9 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= attoparsec blaze-builder blaze-builder-conduit>=0.5 \
- conduit>=0.5 text
+USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \
+ blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
+ text transformers>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index 104114dd36b..689383ea8f7 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.3.tar.gz) = b4590928ccefed3e099a0b4e7b8a8d47eee7e907aa544f81bcb9a6b25623e321
-SIZE (cabal/tagstream-conduit-0.5.3.tar.gz) = 6963
+SHA256 (cabal/tagstream-conduit-0.5.4.tar.gz) = 1119944e51796b76138b47b52f02ce5ed669054f4e201d2b6f9ad461a7314eb6
+SIZE (cabal/tagstream-conduit-0.5.4.tar.gz) = 7904
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index eb2c8b28625..0668cede374 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.0.3.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=0.5 blaze-builder>=0.2 \
- blaze-builder-conduit>=0.5 blaze-html>=0.5 blaze-markup>=0.5 \
- conduit>=0.5 data-default failure>=0.1 monad-control>=0.3 \
+USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=1.0 blaze-builder>=0.2 \
+ blaze-builder-conduit>=1.0 blaze-html>=0.5 blaze-markup>=0.5 \
+ conduit>=1.0 data-default failure>=0.1 monad-control>=0.3 \
resourcet>=0.3 system-filepath>=0.4 text>=0.7 \
transformers>=0.2 xml-types>=0.3.3
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 7ee915e6851..14fe3cd4be8 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.0.3.3.tar.gz) = dfe2775aad74b68a6e8a06bc12645bb53118577c97c836df44b22f5637c9814b
-SIZE (cabal/xml-conduit-1.0.3.3.tar.gz) = 29317
+SHA256 (cabal/xml-conduit-1.1.0.3.tar.gz) = 24aed3c6b2e30ab7f9f4fb2af6f83ab4d14cda62893e02b6da70ae95a4b1b612
+SIZE (cabal/xml-conduit-1.1.0.3.tar.gz) = 29449
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 5e969e693a4..d3fc9dc08ad 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.0.3
-PORTREVISION= 1
+PORTVERSION= 0.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index f788a0990a0..d97bade9a97 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.0.3.tar.gz) = 6b07154e09ce6ed1c4b9f984de35a58ea832b215a9d266390b807dd546d57c0d
-SIZE (cabal/xmlhtml-0.2.0.3.tar.gz) = 120231
+SHA256 (cabal/xmlhtml-0.2.1.tar.gz) = cf2988cffcbe95835f44af33bae4ceca7fc3acbfc677bae5edffe47fe19213db
+SIZE (cabal/xmlhtml-0.2.1.tar.gz) = 124425
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 1682adf6619..6faa529bb6b 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.2
+PORTVERSION= 0.8.2.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index ebeb5ce5fe6..50907395878 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.tar.gz) = a8068a17c170e752e07647655615a4f60e14bc8cb68ac9c92f82049f5fdf03b1
-SIZE (cabal/yaml-0.8.2.tar.gz) = 66383
+SHA256 (cabal/yaml-0.8.2.3.tar.gz) = 8a8fce53772722087631a1c7475ff2eb50a975751128e8449dafcff5924946b7
+SIZE (cabal/yaml-0.8.2.3.tar.gz) = 66311
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 3f05460c179..669699ee8b4 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= activehs
-PORTVERSION= 0.3.0.1
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +11,11 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= activehs-base>=0.2 Agda>=2.3.0.1 blaze-html>=0.5 \
- blaze-markup>=0.5.1.0 cmdargs>=0.7 data-pprint>=0.2 \
- dia-base>=0.1 dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
+USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
+ cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
+ dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
highlighting-kate>=0.5 hint>=0.3.3.2 hoogle>=4.2.11 mtl>=2.0 \
- pandoc>=1.8 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
+ pandoc>=1.10 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
snap-core>=0.6 snap-server>=0.6 split>=0.1 syb>=0.2 \
text>=0.11 utf8-string>=0.3 xhtml>=3000.2
diff --git a/www/hs-activehs/distinfo b/www/hs-activehs/distinfo
index bb773e290fc..6846af2f701 100644
--- a/www/hs-activehs/distinfo
+++ b/www/hs-activehs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/activehs-0.3.0.1.tar.gz) = 860556c074cde2dad353cf4ca68a47271947e574c4680c237e79fe8bbb8c5627
-SIZE (cabal/activehs-0.3.0.1.tar.gz) = 35745
+SHA256 (cabal/activehs-0.3.1.tar.gz) = 0c0ab3ef3338d713d0bde0ce288199ce28c6401e27545691f04e08450403ea0f
+SIZE (cabal/activehs-0.3.1.tar.gz) = 33193
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
new file mode 100644
index 00000000000..0920ef39498
--- /dev/null
+++ b/www/hs-activehs/files/patch-Main.hs
@@ -0,0 +1,10 @@
+--- ./Main.hs.orig 2013-02-12 20:23:46.000000000 +0100
++++ ./Main.hs 2013-02-18 19:59:53.000000000 +0100
+@@ -31,7 +31,6 @@
+ import System.Locale (defaultTimeLocale)
+ import Data.Time (getCurrentTime, formatTime, diffUTCTime)
+ import Data.Maybe (listToMaybe)
+---import Prelude hiding (catch)
+
+ ---------------------------------------------------------------
+
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
new file mode 100644
index 00000000000..bc6f6eeca66
--- /dev/null
+++ b/www/hs-activehs/files/patch-Simple.hs
@@ -0,0 +1,19 @@
+--- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Simple.hs 2013-02-18 19:59:53.000000000 +0100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
++{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts, CPP #-}
+
+ module Simple
+ ( Task (..), TaskChan
+@@ -23,7 +23,9 @@
+ import Control.Monad (when, forever)
+ import Control.Monad.Error (MonadError, catchError)
+ import Data.List (isPrefixOf)
+---import Prelude hiding (catch)
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
+
+ -------------------------
+
diff --git a/www/hs-activehs/files/patch-Smart.hs b/www/hs-activehs/files/patch-Smart.hs
new file mode 100644
index 00000000000..ad3d8eb0ba5
--- /dev/null
+++ b/www/hs-activehs/files/patch-Smart.hs
@@ -0,0 +1,10 @@
+--- ./Smart.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Smart.hs 2013-02-18 19:59:53.000000000 +0100
+@@ -37,7 +37,6 @@
+ import qualified Data.Data as D
+ import Data.List (nub)
+ import Data.Char (isAlpha)
+---import Prelude hiding (catch)
+
+
+ ----------------------------------------------------------------------
diff --git a/www/hs-activehs/files/patch-Special.hs b/www/hs-activehs/files/patch-Special.hs
new file mode 100644
index 00000000000..af4c8ebd5c9
--- /dev/null
+++ b/www/hs-activehs/files/patch-Special.hs
@@ -0,0 +1,20 @@
+--- ./Special.hs.orig 2013-02-12 20:23:46.000000000 +0100
++++ ./Special.hs 2013-02-18 19:59:53.000000000 +0100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns #-}
++{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns, CPP #-}
+
+ module Special
+ ( SpecialTask (..), exerciseServer'
+@@ -25,8 +25,9 @@
+ import System.Directory (getTemporaryDirectory)
+
+ import Control.Concurrent (threadDelay, forkIO, killThread)
+---import Prelude hiding (catch)
+-
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
+
+ ---------------------------------------------------------------
+
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 5bbbc957064..0528ec55bb3 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,10 +1,17 @@
---- ./activehs.cabal.orig 2012-10-10 11:22:11.000000000 +0200
-+++ ./activehs.cabal 2012-11-03 20:34:38.000000000 +0100
-@@ -77,6 +77,7 @@
+--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
++++ ./activehs.cabal 2013-03-10 13:53:48.000000000 +0100
+@@ -76,11 +76,12 @@
+ bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,
- blaze-html >= 0.4 && < 0.6,
+- blaze-html >= 0.4 && < 0.6,
++ blaze-html >= 0.4 && < 0.7,
+ blaze-markup == 0.5.1.*,
pureMD5 >= 2.1 && < 2.2,
deepseq >= 1.1 && < 1.4,
split >= 0.1 && < 0.3,
+- pandoc >= 1.10 && < 1.11,
++ pandoc >= 1.10 && < 1.12,
+ time >= 1.2 && < 1.5,
+ old-time >= 1.0 && < 1.2,
+ process >= 1.0 && < 1.2,
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 702d408f678..989957610dc 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.2.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,8 @@ COMMENT= Authentication methods for Haskell web applications
LICENSE= BSD
-USE_CABAL= aeson>=0.5 attoparsec blaze-builder blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 http-conduit>=1.5 \
- http-types>=0.6 monad-control>=0.3 network resourcet>=0.3 \
+USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \
+ conduit>=0.5 http-conduit>=1.5 http-types>=0.6 network \
tagsoup>=0.12 text transformers>=0.1 unordered-containers \
xml-conduit>=1.0
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 90f12bb9fd9..2af618b464d 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/authenticate-1.3.2.tar.gz) = 35b531dea3acdd66abfd95684184062bd47da91e35a7920df8de0a0662766faf
-SIZE (cabal/authenticate-1.3.2.tar.gz) = 8436
+SHA256 (cabal/authenticate-1.3.2.6.tar.gz) = 3f4b5b35e85083c22b3ff1cfa2bb18964f203b9d36695b118452aa69b0894f8b
+SIZE (cabal/authenticate-1.3.2.6.tar.gz) = 8426
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index eb3d1293afd..8da00df7300 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= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 9bcaf6524ff..a1fd23576fb 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= fastcgi
-PORTVERSION= 3001.0.2.3
-PORTREVISION= 7
+PORTVERSION= 3001.0.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for writing FastCGI programs
+COMMENT= Haskell library for writing FastCGI programs
LICENSE= BSD
-USE_CABAL= cgi>=3000
+USE_CABAL= cgi>=3000.0.0
+
LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-fastcgi/distinfo b/www/hs-fastcgi/distinfo
index 21b85e54617..d3c0a365532 100644
--- a/www/hs-fastcgi/distinfo
+++ b/www/hs-fastcgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fastcgi-3001.0.2.3.tar.gz) = 4a88ba6c93f64f539bc2ef8d27f39b7b2ef48cbd41a4134f49f1e36d75c335f7
-SIZE (cabal/fastcgi-3001.0.2.3.tar.gz) = 4490
+SHA256 (cabal/fastcgi-3001.0.2.4.tar.gz) = b91faff0f2316105147d4d95bd4ff5f9f3437a8007aac93feb830094003fe152
+SIZE (cabal/fastcgi-3001.0.2.4.tar.gz) = 4497
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 9146ae9f7c7..09a237d26d6 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.10.1.2
+PORTVERSION= 0.10.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +12,10 @@ LICENSE= GPLv2
USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 cgi ConfigFile>=1 \
feed>=0.3.6 filestore>=0.6 ghc-paths happstack-server>=7.0 \
highlighting-kate>=0.5.0.1 hslogger>=1 HStringTemplate>=0.6 \
- HTTP>=4000.0 json>=0.4 mtl network>=2.3 pandoc>=1.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
+ HTTP>=4000.0 json>=0.4 mtl network>=2.3 pandoc>=1.10.0.5 \
+ pandoc-types>=1.10 parsec random recaptcha>=0.1 safe SHA>1 \
+ syb tagsoup>=0.12 text url utf8-string>=0.3 xhtml xml>=1.3.5 \
+ xss-sanitize>=0.3 zlib>=0.5
EXECUTABLE= expireGititCache gitit
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index 1b2acd82587..a5cf3d56839 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.1.2.tar.gz) = 53d5074b7b2d34dbc0b2043791d52061f7e348e4fe6b877be99d99466de3c1b7
-SIZE (cabal/gitit-0.10.1.2.tar.gz) = 208344
+SHA256 (cabal/gitit-0.10.3.1.tar.gz) = a5aabbac331436121d7178533fad5482fb0e4469852dea48b32063ef7ccea6ea
+SIZE (cabal/gitit-0.10.3.1.tar.gz) = 209218
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index f86545cb302..9457a301e5d 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hS3
-PORTVERSION= 0.5.6
-PORTREVISION= 5
+PORTVERSION= 0.5.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,11 @@ COMMENT= Interface to Amazon's Simple Storage Service (S3)
LICENSE= BSD
-USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
- MissingH>=0.18.6 network regex-compat utf8-string
CABAL_SETUP= Setup.hs
+USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
+ MissingH>=0.18.6 network random regex-compat utf8-string
+
EXECUTABLE= hs3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo
index 1aa2bcec33b..6f7ce3b312e 100644
--- a/www/hs-hS3/distinfo
+++ b/www/hs-hS3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hS3-0.5.6.tar.gz) = ec0be701f8e46d725b2ceb5d54a1889823cb41668e53c43f05d74d07f76fa6b1
-SIZE (cabal/hS3-0.5.6.tar.gz) = 19626
+SHA256 (cabal/hS3-0.5.7.tar.gz) = c29979436fc81fb9a9b12a6cb18ab8d419d7d85bba8238e29d25e2aff836b7dc
+SIZE (cabal/hS3-0.5.7.tar.gz) = 19543
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
index bb46432c37b..c692eaacddc 100644
--- a/www/hs-hamlet/Makefile
+++ b/www/hs-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hamlet
-PORTVERSION= 1.1.3.1
+PORTVERSION= 1.1.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
index 5c6e4758267..8b9a6b4c84a 100644
--- a/www/hs-hamlet/distinfo
+++ b/www/hs-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hamlet-1.1.3.1.tar.gz) = 3154195d217cdc93b0ca13b7833fecf825c38179c3c9773ef1093a60b3d41813
-SIZE (cabal/hamlet-1.1.3.1.tar.gz) = 19012
+SHA256 (cabal/hamlet-1.1.6.3.tar.gz) = 5a5b79cfaad1823a3a83384e1e563454430452b10e5862866b95457a8844f2ce
+SIZE (cabal/hamlet-1.1.6.3.tar.gz) = 20596
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index b46bef8ce72..83ccca8dbef 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.1.1
-PORTREVISION= 1
+PORTVERSION= 7.1.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
-USE_CABAL= base64-bytestring blaze-html hslogger>=1.0.2 html \
+USE_CABAL= base64-bytestring blaze-html>=0.5 hslogger>=1.0.2 html \
monad-control>=0.3 mtl>=2 network>=2.2.3 parsec \
sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
threads>=0.5 time-compat transformers>=0.1.3 \
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 7065d2926b8..0bf201058c5 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.1.1.tar.gz) = eaac533246ee0b67c05a217b967e55a9e0118d1ada0b64aada3d163c47a22260
-SIZE (cabal/happstack-server-7.1.1.tar.gz) = 75704
+SHA256 (cabal/happstack-server-7.1.7.tar.gz) = e7d5bf684c7a9644cd87116f2639423c161f2f5cb939429457047c2284c2a7bd
+SIZE (cabal/happstack-server-7.1.7.tar.gz) = 76019
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 0f2fda08bc9..1b294f53ff2 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= happstack
PORTVERSION= 7.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index f370a3af957..5b30430bc53 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.11.0
+PORTVERSION= 0.11.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
- blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.3 \
+ blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.4 \
hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
random>=1.0.1.0 text>=0.10 unordered-containers>=0.1.4 \
vector>=0.9 xmlhtml>=0.1.6
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 893b546ef3b..cd8571e3d96 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.11.0.tar.gz) = fcccf0fdd7391e93ed209b97df3f59e89ed3f3c18e237ae206ddc8b6d45b7cfd
-SIZE (cabal/heist-0.11.0.tar.gz) = 59557
+SHA256 (cabal/heist-0.11.1.tar.gz) = 50e6f3586e0a757f17d6f8109428fa3b891a47b1d4f2d134faaef4fe9897a69d
+SIZE (cabal/heist-0.11.1.tar.gz) = 61291
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 5e6643e1db2..0f2d1e58196 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.4
+PORTVERSION= 0.1.4.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 2cf660d929f..6200d8cf8c8 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.4.tar.gz) = b6c33e6f18690cb871a3c43fb463721002ca6f0bc0773322a3c3f77381299cf0
-SIZE (cabal/hjsmin-0.1.4.tar.gz) = 116144
+SHA256 (cabal/hjsmin-0.1.4.1.tar.gz) = 2a2ca985c9ba648c0c96ca684c9d9f26998af1d8e68d28ea6af50c3b4d83e364
+SIZE (cabal/hjsmin-0.1.4.1.tar.gz) = 116268
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index a4e95e2d53e..828e7428bf9 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.8.7
+PORTVERSION= 1.9.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,14 +9,13 @@ COMMENT= HTTP client package with conduit interface and HTTPS support
LICENSE= BSD
-USE_CABAL= asn1-data>=0.5.1 attoparsec>=0.8.0.2 attoparsec-conduit>=0.5 \
- base64-bytestring>=0.1 blaze-builder>=0.2.1 \
+USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \
blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.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 \
+ publicsuffixlist>=0.0.3 random regex-compat resourcet>=0.3 \
+ socks>=0.4 text tls>=1.0.0 tls-extra>=0.5.0 transformers>=0.2 \
transformers-base>=0.4 utf8-string>=0.3.4 void>=0.5.5 \
zlib-conduit>=0.5
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index 158e5c3c598..f9465648799 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.8.7.tar.gz) = f124d0e883a3a213e362e2ba4719d3d5acb24e3ef73e2fa3a7cff4466ecf658b
-SIZE (cabal/http-conduit-1.8.7.tar.gz) = 42238
+SHA256 (cabal/http-conduit-1.9.0.tar.gz) = f365952e83dacfdb6218ae7a5c462bc904f493dc6bbbc57d99ad39939e16ceac
+SIZE (cabal/http-conduit-1.9.0.tar.gz) = 44423
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 4540169e818..141767655f0 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,6 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index 0e94c8e835a..27c337f1b3e 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.1.1
+PORTVERSION= 0.1.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,11 +11,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 data-default \
- http-conduit>=1.6 http-types>=0.6 lifted-base>=0.1 \
- monad-control>=0.3 network network-conduit>=0.6 text>=0.11 \
- wai>=1.3 warp>=1.3.4 word8>=0.0
+USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \
+ conduit>=0.5 data-default http-conduit>=1.6 http-types>=0.6 \
+ lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \
+ text>=0.11 wai>=1.3 warp>=1.3.4 word8>=0.0
.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 6e124fbc78b..7a5abb694f3 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.1.1.1.tar.gz) = 62529458a4dd6a8d04aa44c1c0906f627f0bac7c4e685f7539ab052301efe675
-SIZE (cabal/http-reverse-proxy-0.1.1.1.tar.gz) = 6323
+SHA256 (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = f65adce5c858710ac2df048aa9183d4596fbc506ecc3019dd56480b75717507c
+SIZE (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = 6357
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index a8c9f3855ba..9437c99680a 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= http-server
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for writing Haskell web servers
+COMMENT= Library for writing Haskell web servers
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index c31b5b77c8d..b73a2bbb895 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-server-1.0.1.tar.gz) = 514541d73dab8269706c574ead7ac14e462ef2c7379decd7fc29f4ca38672749
-SIZE (cabal/http-server-1.0.1.tar.gz) = 28028
+SHA256 (cabal/http-server-1.0.2.tar.gz) = 44456c09b639c2c6259f679a2203ab995c2204f5f1402879323be37e8daaff87
+SIZE (cabal/http-server-1.0.2.tar.gz) = 27993
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 77121eaec11..36de4256ee8 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.7.3.0.1
-PORTREVISION= 1
+PORTVERSION= 0.8.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index 75621a1c7f0..8037ded4259 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-types-0.7.3.0.1.tar.gz) = 38a3a07fe8bf5b1433f5befc1d0e230c5a253ae0120e5038a55eb82bcb814de8
-SIZE (cabal/http-types-0.7.3.0.1.tar.gz) = 11762
+SHA256 (cabal/http-types-0.8.0.tar.gz) = e544fa89d83f4c6fa9e2a23a5389df59ee6824ded0b04a47e7d346c8df7fa191
+SIZE (cabal/http-types-0.8.0.tar.gz) = 11520
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index d693cd267a4..5c8013a5302 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-css
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
index b3a1a09b78e..25694c0ff2f 100644
--- a/www/hs-shakespeare-css/distinfo
+++ b/www/hs-shakespeare-css/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-css-1.0.2.tar.gz) = 63b25d95bf33e95da4181e2eb5a253ed97d80cb0b213556090cb9f32284e530b
-SIZE (cabal/shakespeare-css-1.0.2.tar.gz) = 14735
+SHA256 (cabal/shakespeare-css-1.0.3.tar.gz) = 7f81c6147f8eb2ef0a6a879ae36cc437f187afb30afff5e6dc04f4b4c9b2647e
+SIZE (cabal/shakespeare-css-1.0.3.tar.gz) = 14769
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index e16e2193c53..f5a6b11147d 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= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index 725c3ab1ea2..48bceee1013 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-js
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Stick your Haskell variables into JavaScript at compile time
LICENSE= MIT
-USE_CABAL= aeson>=0.5 shakespeare>=1.0.2 text>=0.7
+USE_CABAL= aeson>=0.5 shakespeare>=1.0.3 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
index a79360648dc..d4c51b33abf 100644
--- a/www/hs-shakespeare-js/distinfo
+++ b/www/hs-shakespeare-js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-js-1.1.1.tar.gz) = 2fab2e8c720d66a0db908cb2a5574a8090986e57b1c2104642447475e358f0f7
-SIZE (cabal/shakespeare-js-1.1.1.tar.gz) = 6750
+SHA256 (cabal/shakespeare-js-1.1.2.1.tar.gz) = 1ff94325635d2a7ba26efe1967732f061e26ec41304ea9aaa88b9b212eb03611
+SIZE (cabal/shakespeare-js-1.1.2.1.tar.gz) = 7857
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index 69f3b1a2efc..e8d24934005 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shakespeare-text
PORTVERSION= 1.0.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 0390f692e32..5ec3ff4b0e8 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A toolkit for making compile-time interpolated templates
+COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index 2c82ce5ff7e..e5d47737d5f 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.2.tar.gz) = f5b718aff05b7759950091d3250ab35867e42e2849c0f6435003396173f5f8d8
-SIZE (cabal/shakespeare-1.0.2.tar.gz) = 8817
+SHA256 (cabal/shakespeare-1.0.3.1.tar.gz) = dae1111a232d02e50b06e291a64060506ec4629b62c8427cdb2ded3453788123
+SIZE (cabal/shakespeare-1.0.3.1.tar.gz) = 9807
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 808dc53048a..45c988de052 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 0.9.2.2
-PORTREVISION= 1
+PORTVERSION= 0.9.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,9 +15,8 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
case-insensitive>=0.3 enumerator>=0.4.15 HUnit>=1.2 \
MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
- regex-posix>=0.95 text>=0.11 transformers>=0.2 \
- unix-compat>=0.2 unordered-containers>=0.1.4.3 vector>=0.6 \
- zlib-enum>=0.2.1
+ regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \
+ unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 958dd7999ec..0cec282680b 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-core-0.9.2.2.tar.gz) = 8ed60802fc131998027a026616d3e7f5850031def269effa4152c52b60846a6b
-SIZE (cabal/snap-core-0.9.2.2.tar.gz) = 91227
+SHA256 (cabal/snap-core-0.9.3.1.tar.gz) = f8aaf66a9796e8be996649eedf1e0211f835dd0a5459a9a7a1644240c19954e0
+SIZE (cabal/snap-core-0.9.3.1.tar.gz) = 91232
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 5c49cd5c8c8..d8deab31130 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 0.9.2.4
-PORTREVISION= 1
+PORTVERSION= 0.9.3.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A fast, iteratee-based, epoll-enabled web server for the Snap Framework
+COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
LICENSE= BSD
@@ -14,9 +13,9 @@ CABAL_SETUP= Setup.hs
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
- case-insensitive>=0.3 directory-tree>=0.10 enumerator>=0.4.15 \
+ case-insensitive>=0.3 enumerator>=0.4.15 \
MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
- snap-core>=0.9.2 text>=0.11 transformers>=0.2 unix-compat>=0.2
+ snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
OPTIONS_DEFINE= OPENSSL
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 78c4e20ef49..67d0642c56c 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-server-0.9.2.4.tar.gz) = f4c356f1b74681ed6bf807e5dc292fdc721352b64e15800d1c03e49626cd95cf
-SIZE (cabal/snap-server-0.9.2.4.tar.gz) = 56202
+SHA256 (cabal/snap-server-0.9.3.3.tar.gz) = 2fd23a4164334592dc2c37b973e341d800734e280281b35d3c6a67f2a0efa0d8
+SIZE (cabal/snap-server-0.9.3.3.tar.gz) = 55532
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 7a24325a456..6d49a52f63e 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.11.0
+PORTVERSION= 0.11.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,13 +13,12 @@ CABAL_SETUP= Setup.hs
USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
comonad>=1.1 configurator>=0.1 directory-tree>=0.10 \
- dlist>=0.5 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 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
+ dlist>=0.5 errors>=1.4 hashable>=1.2 heist>=0.11 \
+ lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \
+ mtl>2.0 mwc-random>=0.8 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 3f3085f09d1..eaa865f23df 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.11.0.tar.gz) = f65c9d56d48c36286675fd0544fc0aac12d5dd2e2cdb1ffe4a7f341965778157
-SIZE (cabal/snap-0.11.0.tar.gz) = 78524
+SHA256 (cabal/snap-0.11.2.tar.gz) = 2a143fe96e59a6e79c24ad9790c0f955f80e1bdc60c6c04e90e0f5055b0936fd
+SIZE (cabal/snap-0.11.2.tar.gz) = 79858
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index dc7e5da5e58..950d4fb3a0e 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.3.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index fa6975ffc69..40092ce2f70 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-1.3.1.tar.gz) = 930a8d0eb8d2cbe56346ee1c90474af2297f0b2407a9ee91aef6406c47874f64
-SIZE (cabal/wai-app-static-1.3.1.tar.gz) = 14806
+SHA256 (cabal/wai-app-static-1.3.1.2.tar.gz) = 9d149e143aa0d6e8e9ffbc41469e8e6992265567635903de20f887cb801d12c4
+SIZE (cabal/wai-app-static-1.3.1.2.tar.gz) = 14916
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index b0e4a73bddf..a4eda6827d2 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index 1e4c846fcda..911e2b24684 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.2.tar.gz) = 03945d7bff2f10fa29ffb28ccc95b720b1f54cf277476b783e217a4996d30981
-SIZE (cabal/wai-extra-1.3.2.tar.gz) = 31367
+SHA256 (cabal/wai-extra-1.3.2.4.tar.gz) = 69b56b36ee5434af030f8bcc481bb8363ddb8461b5545919b404cc4560790d8a
+SIZE (cabal/wai-extra-1.3.2.4.tar.gz) = 31566
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 240ec765730..0f3958b2b71 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wai-logger
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index b6e6359835b..f626c8d4dda 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-test
-PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTVERSION= 1.3.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
index 5ed97df95fe..980bfb259ce 100644
--- a/www/hs-wai-test/distinfo
+++ b/www/hs-wai-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-test-1.3.0.tar.gz) = 80c8d48e37f40fd1d130b95483bd59a1e5ae39a069684db4ad016ac20a57c097
-SIZE (cabal/wai-test-1.3.0.tar.gz) = 3098
+SHA256 (cabal/wai-test-1.3.0.4.tar.gz) = c07b23c9a67ead44da427f6d260572572d9cc32930313c3dc84823abb32325ea
+SIZE (cabal/wai-test-1.3.0.4.tar.gz) = 3165
diff --git a/www/hs-wai-test/pkg-descr b/www/hs-wai-test/pkg-descr
index 8d686227808..3de4eb02894 100644
--- a/www/hs-wai-test/pkg-descr
+++ b/www/hs-wai-test/pkg-descr
@@ -1,3 +1,3 @@
Unit test framework (built on HUnit) for WAI applications.
-WWW: http://www.yesodweb.com/book/wai
+WWW: http://www.yesodweb.com/book/web-application-interface
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index dc4d02f7430..c11b48449e8 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 1.3.0.1
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index a5893a25fcb..0af33c7c58c 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-1.3.0.1.tar.gz) = d42709d9b2bcf804bfcb92e36462d859d3ffbdee317ce6dd591272154ef7cb7c
-SIZE (cabal/wai-1.3.0.1.tar.gz) = 4380
+SHA256 (cabal/wai-1.4.0.tar.gz) = b87131aac9454e47ad4cbd19cf15000fa835df527d569bb3533d5c2c56d42388
+SIZE (cabal/wai-1.4.0.tar.gz) = 4508
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 57230ac48cf..8d82bfdd8ad 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.7.1
+PORTVERSION= 1.3.7.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A fast, light-weight web server for WAI applications
+COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index a185fd758bc..47ed5430820 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.7.1.tar.gz) = 143ec36c8065e7bb3c69c41664001c738fda6d65c2d20ebd8a0619267f674b4d
-SIZE (cabal/warp-1.3.7.1.tar.gz) = 17904
+SHA256 (cabal/warp-1.3.7.4.tar.gz) = 3daf8e0a0ed8c9b3f53bb8e3631c5f1f7315913cf74342ecdc8b2ee9c21e047c
+SIZE (cabal/warp-1.3.7.4.tar.gz) = 17755
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 855a7b7cfbe..f8f52335fe4 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 0847c78d473..4a3052d080b 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.5.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +10,14 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
- blaze-markup>=0.5.1 hamlet>=1.1 http-conduit>=1.5 \
- lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.0 \
- persistent-template>=1.0 pureMD5>=2.0 pwstore-fast>=2.2 \
- random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
- shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
- unordered-containers wai>=1.3 yesod-core>=1.1 yesod-form>=1.1 \
- yesod-json>=1.1 yesod-persistent>=1.1
+ blaze-markup>=0.5.1 file-embed hamlet>=1.1 http-conduit>=1.5 \
+ http-types lifted-base>=0.1 mime-mail>=0.3 network \
+ persistent>=1.0 persistent-template>=1.0 pureMD5>=2.0 \
+ pwstore-fast>=2.2 random>=1.0.0.2 SHA>=1.4.1.3 \
+ shakespeare-css>=1.0 shakespeare-js>=1.0.2 text>=0.7 \
+ transformers>=0.2.2 unordered-containers wai>=1.3 \
+ yesod-core>=1.1 yesod-form>=1.1 yesod-json>=1.1 \
+ yesod-persistent>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index fda7ec22b33..8d428aaf066 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.1.3.tar.gz) = 1f4c213371eb29a2ac8eee54ba51b871c1e263a2670d307ea89c81a5a5299766
-SIZE (cabal/yesod-auth-1.1.3.tar.gz) = 17918
+SHA256 (cabal/yesod-auth-1.1.5.3.tar.gz) = 02fdd42abcb77a18f84f01855281a3f7cd04ab891945de051a1cd9793ff9591f
+SIZE (cabal/yesod-auth-1.1.5.3.tar.gz) = 23041
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index cfecc2fc789..4d49b8c1804 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.1.7.1
+PORTVERSION= 1.1.8.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 0b5fe3c6557..9523f4b96b9 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.1.7.1.tar.gz) = 79b8f52264bf664a040d0b23ad7859cc98506dacfb01f33b04c67c88bc37301f
-SIZE (cabal/yesod-core-1.1.7.1.tar.gz) = 44613
+SHA256 (cabal/yesod-core-1.1.8.2.tar.gz) = 5fa74a4fa1bc66688509631ef7324e87f4e0d48cd6db3df22fabd11d64dc392f
+SIZE (cabal/yesod-core-1.1.8.2.tar.gz) = 44289
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
index 0f7e43a3eee..2f78d67ed1a 100644
--- a/www/hs-yesod-default/Makefile
+++ b/www/hs-yesod-default/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-default
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
index 33cbddd01c9..09ac7191121 100644
--- a/www/hs-yesod-default/distinfo
+++ b/www/hs-yesod-default/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-default-1.1.3.tar.gz) = 3e3a1b934526477cdd3e1a01aac0103470be261c9e097e41c1e22e40a55910bc
-SIZE (cabal/yesod-default-1.1.3.tar.gz) = 7089
+SHA256 (cabal/yesod-default-1.1.3.2.tar.gz) = 0fb35bf68a029a00492998417bb8330a6f8e7470edacea6ae3610846a44ef51d
+SIZE (cabal/yesod-default-1.1.3.2.tar.gz) = 7082
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 01853c833fa..a8b32056e24 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.2
+PORTVERSION= 1.2.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index d6f058042ab..a85a2c4a088 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.2.0.2.tar.gz) = 7e6c3bf1b9a9ae251a26300feda7144ae87902dd6f4294281044d5fdb2386128
-SIZE (cabal/yesod-form-1.2.0.2.tar.gz) = 19597
+SHA256 (cabal/yesod-form-1.2.1.3.tar.gz) = f87aec0ccbbedde53466b2e2a8b286a1211663e7a4419af60673c2ecaec938d7
+SIZE (cabal/yesod-form-1.2.1.3.tar.gz) = 19573
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
index 09ad16c57a5..05c67bcd96b 100644
--- a/www/hs-yesod-json/Makefile
+++ b/www/hs-yesod-json/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-json
-PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-json/distinfo b/www/hs-yesod-json/distinfo
index 453f44cf20d..5f6f131aab3 100644
--- a/www/hs-yesod-json/distinfo
+++ b/www/hs-yesod-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-json-1.1.2.tar.gz) = 2e6f60510f87685b902073c647e6ffd4efd78311251f4e5469bcbd8d0678726d
-SIZE (cabal/yesod-json-1.1.2.tar.gz) = 3185
+SHA256 (cabal/yesod-json-1.1.2.1.tar.gz) = 0db7f3981fd4365af8b1fe7d1cb7ed7e278057f418a6a41bc7ec6023f6b0306f
+SIZE (cabal/yesod-json-1.1.2.1.tar.gz) = 3150
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 02a457f524a..6a4610181c2 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -2,6 +2,7 @@
PORTNAME= yesod-persistent
PORTVERSION= 1.1.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index 4b428d75c4d..cd4bce5d236 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.1.7.2
+PORTVERSION= 1.1.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,106 +9,104 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.1.0 \
- ansi-terminal==0.5.5.1 \
+USE_CABAL= aeson==0.6.1.0_1 \
+ ansi-terminal==0.6 \
asn1-data==0.7.1_1 \
- attoparsec==0.10.3.0 \
- attoparsec-conduit==0.5.0.3_1 \
- authenticate==1.3.2_1 \
+ attoparsec==0.10.4.0 \
+ attoparsec-conduit==1.0.0 \
+ authenticate==1.3.2.6 \
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 \
+ base64-bytestring==1.0.0.1 \
+ base64-conduit==1.0.0 \
+ basic-prelude==0.3.4.0 \
blaze-builder==0.3.1.0_4 \
- blaze-builder-conduit==0.5.0.3_1 \
- blaze-html==0.5.1.3 \
+ blaze-builder-conduit==1.0.0 \
+ blaze-html==0.6.0.0 \
blaze-markup==0.5.1.4 \
byteorder==1.0.3_4 \
- case-insensitive==0.4.0.4 \
+ case-insensitive==1.0 \
cereal==0.3.5.2_2 \
- certificate==1.3.5 \
+ certificate==1.3.5_1 \
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 \
+ classy-prelude==0.5.3 \
+ clientsession==0.8.1_1 \
+ conduit==1.0.2 \
cookie==0.4.0.1_1 \
- cprng-aes==0.3.4 \
- crypto-api==0.10.2_3 \
- crypto-conduit==0.4.3 \
+ cprng-aes==0.3.4_1 \
+ crypto-api==0.11 \
+ crypto-conduit==0.5.0 \
crypto-numbers==0.1.3 \
- crypto-pubkey==0.1.2 \
+ crypto-pubkey==0.1.2_1 \
crypto-pubkey-types==0.2.0_1 \
crypto-random-api==0.2.0 \
- cryptohash==0.8.3 \
- css-text==0.1.1_4 \
+ cryptohash==0.8.3_1 \
+ css-text==0.1.1_5 \
data-default==0.5.0_1 \
date-cache==0.3.0_1 \
dlist==0.5_8 \
- email-validate==0.3.2_1 \
+ email-validate==1.0.0 \
entropy==0.2.1_4 \
failure==0.2.0.1_3 \
- fast-logger==0.3.1_1 \
+ fast-logger==0.3.1_2 \
file-embed==0.0.4.7 \
- filesystem-conduit==0.5.0.2_1 \
+ filesystem-conduit==1.0.0 \
fsnotify==0.0.6 \
ghc-paths==0.1.0.9 \
- hamlet==1.1.3.1 \
+ hamlet==1.1.6.3 \
hashable==1.2.0.5 \
- hjsmin==0.1.4 \
- hspec==1.4.3 \
+ hjsmin==0.1.4.1 \
+ hspec==1.4.4 \
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 \
+ html-conduit==1.1.0 \
+ http-conduit==1.9.0 \
+ http-date==0.0.4_1 \
+ http-reverse-proxy==0.1.1.3 \
+ http-types==0.8.0 \
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 \
+ mime-mail==0.4.1.2_2 \
+ mime-types==0.1.0.3 \
monad-control==0.3.1.4_1 \
- monad-logger==0.2.3.2 \
- network-conduit==0.6.2.2 \
+ monad-logger==0.3.0.1 \
+ network-conduit==1.0.0 \
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 \
+ pem==0.1.2_1 \
+ persistent==1.1.5.1 \
+ persistent-template==1.1.2.4 \
+ pool-conduit==0.1.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 \
+ project-template==0.1.3 \
+ publicsuffixlist==0.0.3 \
+ pureMD5==2.1.2.1_2 \
+ pwstore-fast==2.3_2 \
ReadArgs==1.2.1_1 \
resource-pool==0.2.1.1_1 \
- resourcet==0.4.4_1 \
+ resourcet==0.4.5 \
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 \
+ shakespeare==1.0.3.1 \
+ shakespeare-css==1.0.3 \
+ shakespeare-i18n==1.0.0.2_4 \
+ shakespeare-js==1.1.2.1 \
+ shakespeare-text==1.0.0.5_2 \
silently==1.2.4.1 \
- simple-sendfile==0.2.10 \
- skein==0.1.0.11 \
- socks==0.4.2_1 \
+ simple-sendfile==0.2.11 \
+ skein==0.1.0.12 \
+ socks==0.5.0 \
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 \
+ tagstream-conduit==0.5.4 \
tar==0.4.0.1_1 \
- tls==1.1.1 \
- tls-extra==0.6.1 \
+ tls==1.1.2 \
+ tls-extra==0.6.1_1 \
transformers-base==0.4.1_4 \
unix-compat==0.4.1.0 \
unordered-containers==0.2.3.0 \
@@ -117,29 +115,29 @@ USE_CABAL= aeson==0.6.1.0 \
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 \
+ wai==1.4.0 \
+ wai-app-static==1.3.1.2 \
+ wai-extra==1.3.2.4 \
+ wai-logger==0.3.0_2 \
+ wai-test==1.3.0.4 \
+ warp==1.3.7.4 \
word8==0.0.3 \
- xml-conduit==1.0.3.3_1 \
+ xml-conduit==1.1.0.3 \
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 \
+ xss-sanitize==0.3.3_1 \
+ yaml==0.8.2.3 \
+ yesod==1.1.9.2 \
+ yesod-auth==1.1.5.3 \
+ yesod-core==1.1.8.2 \
+ yesod-default==1.1.3.2 \
+ yesod-form==1.2.1.3 \
+ yesod-json==1.1.2.1 \
+ yesod-persistent==1.1.0.1_1 \
+ yesod-routes==1.1.2 \
+ yesod-static==1.1.2.2 \
+ yesod-test==0.3.5 \
zlib-bindings==0.1.1.3 \
- zlib-conduit==0.5.0.3_1
+ zlib-conduit==1.0.0
IGNORE_DYNAMIC= yes
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index 023cb4bceb1..66486c86b4b 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.1.7.2.tar.gz) = 15afde94e2e641a4be019933f63bfdd291ea16112057c35caaa92e5281c78b81
-SIZE (cabal/yesod-platform-1.1.7.2.tar.gz) = 2669
+SHA256 (cabal/yesod-platform-1.1.8.tar.gz) = 50a863685942745b530c77957ac75d0d5cd4af211a0e183eee58e74ed1941108
+SIZE (cabal/yesod-platform-1.1.8.tar.gz) = 2670
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
new file mode 100644
index 00000000000..2daf8095e1b
--- /dev/null
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -0,0 +1,11 @@
+--- ./yesod-platform.cabal.orig 2013-03-04 09:57:32.000000000 +0100
++++ ./yesod-platform.cabal 2013-03-07 22:27:51.000000000 +0100
+@@ -102,7 +102,7 @@
+ , simple-sendfile == 0.2.11
+ , skein == 0.1.0.12
+ , socks == 0.5.0
+- , split == 0.2.1.2
++ , split == 0.2.1.1
+ , stringsearch == 0.3.6.4
+ , system-fileio == 0.3.11
+ , system-filepath == 0.4.7
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index 02ab46ac7b7..d0c47af2d7a 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-routes
-PORTVERSION= 1.1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index 3f842663270..855e875f15c 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.1.1.1.tar.gz) = 75e03bca8523ec2bb9e05c078ca99ab05efc9f011de0ab3d881c2e681b289e81
-SIZE (cabal/yesod-routes-1.1.1.1.tar.gz) = 17946
+SHA256 (cabal/yesod-routes-1.1.2.tar.gz) = 5b96189ab0e4ae07fd3904a9b8a7d53b5ecec0bc5c94627d4725e930cf17db9f
+SIZE (cabal/yesod-routes-1.1.2.tar.gz) = 17709
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index c4ef676f5b0..7043a8602b9 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.2
+PORTVERSION= 1.1.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index e7231f66591..f3f7af39213 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.1.1.2.tar.gz) = 5c836f2cb9d0db62bb93ae4864a02bcc56694cbcc5d71d577524b686f1cf7b74
-SIZE (cabal/yesod-static-1.1.1.2.tar.gz) = 6735
+SHA256 (cabal/yesod-static-1.1.2.2.tar.gz) = e198f1909fc47d872dc4b04303f2dec11cc48f3bda2fca35bf94ad9ef2752afc
+SIZE (cabal/yesod-static-1.1.2.2.tar.gz) = 6304
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index cd4786a50e0..f739f22c482 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 0.3.3
+PORTVERSION= 0.3.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 465d58ed724..754d62a5d41 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-0.3.3.tar.gz) = a3178abdae5c25b36053c188efd84b6878bf6c2a330bc8b5118d1790320864c9
-SIZE (cabal/yesod-test-0.3.3.tar.gz) = 10952
+SHA256 (cabal/yesod-test-0.3.5.tar.gz) = 721c615066f4119591b580ce018c29800149231d1d19458f21b392da02e5b024
+SIZE (cabal/yesod-test-0.3.5.tar.gz) = 11113
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index d7634fb2724..675e0f18d84 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.1.7.2
+PORTVERSION= 1.1.9.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 154405ebd6b..79dbba1e995 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.1.7.2.tar.gz) = a0ae89e16f4be18e2df3fdbec4a4622c0aa91b20974630deb14d0f732bfbbd57
-SIZE (cabal/yesod-1.1.7.2.tar.gz) = 282720
+SHA256 (cabal/yesod-1.1.9.2.tar.gz) = b2c1432de8e0e9d5c39300189088a159fcf28565c527aa7ee3382d41d0ac69e7
+SIZE (cabal/yesod-1.1.9.2.tar.gz) = 338371
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index ef88a9d5a18..731b87bc42f 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
-PORTVERSION= 0.11
+PORTVERSION= 0.11.1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 29efffcbc11..2dc4812e95c 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.11.tar.gz) = 40cf6f0b895d609165a0ddc9d6e34255ab6b39418248215aaf7c2c13b4cf0ba1
-SIZE (cabal/xmonad-contrib-0.11.tar.gz) = 402567
+SHA256 (cabal/xmonad-contrib-0.11.1.tar.gz) = 347f805fa1b5aed59bc589afce9e19ef13e392b1f7cad8857deef01b916da68c
+SIZE (cabal/xmonad-contrib-0.11.1.tar.gz) = 401391
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 3a47eb57afa..0fa50698191 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index e507ea8a36e..dc156b27a9e 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= 4
+PORTREVISION= 5
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index b872356b9b8..129a426c8a3 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= X11
-PORTVERSION= 1.6.0.2
+PORTVERSION= 1.6.1.1
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,6 +12,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
+USE_CABAL= data-default
USE_XORG= x11 xrandr xext
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11/hs-X11/distinfo b/x11/hs-X11/distinfo
index 5cf7b74e564..a4ea495f953 100644
--- a/x11/hs-X11/distinfo
+++ b/x11/hs-X11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/X11-1.6.0.2.tar.gz) = 1c6a7823155bf251c4676981a1370b61af112e77d7f82f744c6bae2fe6482f7c
-SIZE (cabal/X11-1.6.0.2.tar.gz) = 179112
+SHA256 (cabal/X11-1.6.1.1.tar.gz) = 7ce575c613786c73efb20d5680a9e572aa1f1c91c3963e285011235759b76eae
+SIZE (cabal/X11-1.6.1.1.tar.gz) = 188628
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 4985ab32b45..5edae089d5b 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmobar
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org