aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile9
-rw-r--r--devel/hs-BNFC/Makefile2
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-ConfigFile/Makefile4
-rw-r--r--devel/hs-DeepArrow/Makefile5
-rw-r--r--devel/hs-HUnit/Makefile5
-rw-r--r--devel/hs-HUnit/distinfo4
-rw-r--r--devel/hs-IORefCAS/Makefile5
-rw-r--r--devel/hs-IORefCAS/distinfo4
-rw-r--r--devel/hs-IORefCAS/pkg-descr2
-rw-r--r--devel/hs-IfElse/Makefile4
-rw-r--r--devel/hs-List/Makefile4
-rw-r--r--devel/hs-MaybeT/Makefile3
-rw-r--r--devel/hs-MemoTrie/Makefile3
-rw-r--r--devel/hs-MissingH/Makefile3
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile4
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile6
-rw-r--r--devel/hs-MonadRandom/Makefile5
-rw-r--r--devel/hs-MonadRandom/distinfo4
-rw-r--r--devel/hs-ObjectName/Makefile4
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-QuickCheck/Makefile3
-rw-r--r--devel/hs-QuickCheck/distinfo4
-rw-r--r--devel/hs-ReadArgs/Makefile4
-rw-r--r--devel/hs-SafeSemaphore/Makefile4
-rw-r--r--devel/hs-StateVar/Makefile4
-rw-r--r--devel/hs-Stream/Makefile4
-rw-r--r--devel/hs-Tensor/Makefile4
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-abstract-deque/Makefile18
-rw-r--r--devel/hs-abstract-deque/distinfo4
-rw-r--r--devel/hs-abstract-deque/pkg-descr2
-rw-r--r--devel/hs-abstract-par/Makefile4
-rw-r--r--devel/hs-activehs-base/Makefile4
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal10
-rw-r--r--devel/hs-alex/Makefile5
-rw-r--r--devel/hs-alex/distinfo4
-rw-r--r--devel/hs-alex/pkg-descr5
-rw-r--r--devel/hs-ansi-terminal/Makefile1
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile2
-rw-r--r--devel/hs-arrows/Makefile3
-rw-r--r--devel/hs-asn1-data/Makefile4
-rw-r--r--devel/hs-asn1-types/Makefile13
-rw-r--r--devel/hs-asn1-types/distinfo2
-rw-r--r--devel/hs-asn1-types/pkg-descr3
-rw-r--r--devel/hs-async/Makefile5
-rw-r--r--devel/hs-async/distinfo4
-rw-r--r--devel/hs-attempt/Makefile2
-rw-r--r--devel/hs-base-unicode-symbols/Makefile4
-rw-r--r--devel/hs-base16-bytestring/Makefile4
-rw-r--r--devel/hs-base64-bytestring/Makefile3
-rw-r--r--devel/hs-base64-conduit/Makefile1
-rw-r--r--devel/hs-basic-prelude/Makefile6
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile1
-rw-r--r--devel/hs-bits-atomic/Makefile5
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile1
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile3
-rw-r--r--devel/hs-blaze-builder/Makefile4
-rw-r--r--devel/hs-blaze-builder/distinfo4
-rw-r--r--devel/hs-blaze-textual/Makefile2
-rw-r--r--devel/hs-bloomfilter/Makefile2
-rw-r--r--devel/hs-bsd-sysctl/Makefile4
-rw-r--r--devel/hs-bsd-sysctl/files/patch-Setup.hs16
-rw-r--r--devel/hs-byteorder/Makefile5
-rw-r--r--devel/hs-byteorder/distinfo4
-rw-r--r--devel/hs-bytestring-nums/Makefile4
-rw-r--r--devel/hs-c2hs/Makefile4
-rw-r--r--devel/hs-cabal-install/Makefile7
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/hs-cereal/Makefile4
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile3
-rw-r--r--devel/hs-classy-prelude/Makefile6
-rw-r--r--devel/hs-classy-prelude/distinfo4
-rw-r--r--devel/hs-cmdargs/Makefile4
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-conduit/Makefile4
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-convertible/Makefile2
-rw-r--r--devel/hs-cpphs/Makefile4
-rw-r--r--devel/hs-darcs/Makefile2
-rw-r--r--devel/hs-data-default-class/Makefile13
-rw-r--r--devel/hs-data-default-class/distinfo2
-rw-r--r--devel/hs-data-default-class/pkg-descr3
-rw-r--r--devel/hs-data-default-instances-base/Makefile15
-rw-r--r--devel/hs-data-default-instances-base/distinfo2
-rw-r--r--devel/hs-data-default-instances-base/pkg-descr3
-rw-r--r--devel/hs-data-default-instances-containers/Makefile15
-rw-r--r--devel/hs-data-default-instances-containers/distinfo2
-rw-r--r--devel/hs-data-default-instances-containers/pkg-descr3
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile15
-rw-r--r--devel/hs-data-default-instances-dlist/distinfo2
-rw-r--r--devel/hs-data-default-instances-dlist/pkg-descr3
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile15
-rw-r--r--devel/hs-data-default-instances-old-locale/distinfo2
-rw-r--r--devel/hs-data-default-instances-old-locale/pkg-descr3
-rw-r--r--devel/hs-data-default/Makefile9
-rw-r--r--devel/hs-data-default/distinfo4
-rw-r--r--devel/hs-data-pprint/Makefile4
-rw-r--r--devel/hs-date-cache/Makefile4
-rw-r--r--devel/hs-datetime/Makefile3
-rw-r--r--devel/hs-directory-tree/Makefile6
-rw-r--r--devel/hs-dlist/Makefile4
-rw-r--r--devel/hs-drift/Makefile2
-rw-r--r--devel/hs-drift/files/patch-src__ChaseImports.hs12
-rw-r--r--devel/hs-drift/files/patch-src__GenUtil.hs17
-rw-r--r--devel/hs-edit-distance/Makefile1
-rw-r--r--devel/hs-either/Makefile1
-rw-r--r--devel/hs-enumerator/Makefile4
-rw-r--r--devel/hs-errors/Makefile3
-rw-r--r--devel/hs-extensible-exceptions/Makefile15
-rw-r--r--devel/hs-extensible-exceptions/distinfo2
-rw-r--r--devel/hs-extensible-exceptions/pkg-descr4
-rw-r--r--devel/hs-failure/Makefile4
-rw-r--r--devel/hs-fast-logger/Makefile5
-rw-r--r--devel/hs-fgl/Makefile3
-rw-r--r--devel/hs-file-embed/Makefile1
-rw-r--r--devel/hs-filemanip/Makefile2
-rw-r--r--devel/hs-filestore/Makefile1
-rw-r--r--devel/hs-filesystem-conduit/Makefile1
-rw-r--r--devel/hs-fsnotify/Makefile4
-rw-r--r--devel/hs-fsnotify/distinfo4
-rw-r--r--devel/hs-fsnotify/pkg-descr2
-rw-r--r--devel/hs-gconf/Makefile5
-rw-r--r--devel/hs-generic-deriving/Makefile4
-rw-r--r--devel/hs-generic-deriving/distinfo4
-rw-r--r--devel/hs-geniplate/Makefile3
-rw-r--r--devel/hs-ghc-events/Makefile2
-rw-r--r--devel/hs-ghc-mtl/Makefile5
-rw-r--r--devel/hs-ghc-paths/Makefile3
-rw-r--r--devel/hs-gio/Makefile5
-rw-r--r--devel/hs-git-annex/Makefile30
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-git-annex/files/patch-Build__Configure.hs11
-rw-r--r--devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs20
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal11
-rw-r--r--devel/hs-glade/Makefile4
-rw-r--r--devel/hs-glib/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs22
-rw-r--r--devel/hs-haddock/Makefile5
-rw-r--r--devel/hs-haddock/distinfo4
-rw-r--r--devel/hs-happy/Makefile2
-rw-r--r--devel/hs-hashable/Makefile5
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashed-storage/Makefile5
-rw-r--r--devel/hs-hashtables/Makefile3
-rw-r--r--devel/hs-haskeline/Makefile3
-rw-r--r--devel/hs-haskell-platform/Makefile67
-rw-r--r--devel/hs-haskell-src-exts/Makefile4
-rw-r--r--devel/hs-haskell-src/Makefile3
-rw-r--r--devel/hs-hasktags/Makefile3
-rw-r--r--devel/hs-hastache/Makefile3
-rw-r--r--devel/hs-hdoc/Makefile2
-rw-r--r--devel/hs-hdoc/files/patch-Main.hs14
-rw-r--r--devel/hs-hinotify/Makefile2
-rw-r--r--devel/hs-hint/Makefile1
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile4
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile4
-rw-r--r--devel/hs-hslogger/Makefile3
-rw-r--r--devel/hs-hspec-expectations/Makefile3
-rw-r--r--devel/hs-hspec-expectations/distinfo4
-rw-r--r--devel/hs-hspec/Makefile5
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-idoc/Makefile5
-rw-r--r--devel/hs-kqueue/Makefile6
-rw-r--r--devel/hs-language-c/Makefile4
-rw-r--r--devel/hs-language-javascript/Makefile4
-rw-r--r--devel/hs-largeword/Makefile4
-rw-r--r--devel/hs-largeword/distinfo4
-rw-r--r--devel/hs-lazysmallcheck/Makefile6
-rw-r--r--devel/hs-lens/Makefile14
-rw-r--r--devel/hs-lens/distinfo4
-rw-r--r--devel/hs-lifted-base/Makefile4
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-logict/Makefile1
-rw-r--r--devel/hs-mmap/Makefile4
-rw-r--r--devel/hs-mmorph/Makefile15
-rw-r--r--devel/hs-mmorph/distinfo2
-rw-r--r--devel/hs-mmorph/pkg-descr4
-rw-r--r--devel/hs-monad-control/Makefile5
-rw-r--r--devel/hs-monad-control/distinfo4
-rw-r--r--devel/hs-monad-logger/Makefile6
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-par-extras/Makefile4
-rw-r--r--devel/hs-monad-par/Makefile4
-rw-r--r--devel/hs-monad-par/distinfo4
-rw-r--r--devel/hs-mtl/Makefile3
-rw-r--r--devel/hs-mueval/Makefile5
-rw-r--r--devel/hs-murmur-hash/Makefile4
-rw-r--r--devel/hs-optparse-applicative/Makefile3
-rw-r--r--devel/hs-parallel/Makefile4
-rw-r--r--devel/hs-pcre-light/Makefile4
-rw-r--r--devel/hs-pool-conduit/Makefile6
-rw-r--r--devel/hs-pool-conduit/distinfo4
-rw-r--r--devel/hs-primitive/Makefile4
-rw-r--r--devel/hs-profunctor-extras/Makefile2
-rw-r--r--devel/hs-profunctors/Makefile2
-rw-r--r--devel/hs-profunctors/distinfo4
-rw-r--r--devel/hs-project-template/Makefile3
-rw-r--r--devel/hs-quickcheck-io/Makefile15
-rw-r--r--devel/hs-quickcheck-io/distinfo2
-rw-r--r--devel/hs-quickcheck-io/pkg-descr4
-rw-r--r--devel/hs-random/Makefile4
-rw-r--r--devel/hs-ranges/Makefile4
-rw-r--r--devel/hs-reactive/Makefile6
-rw-r--r--devel/hs-readline/Makefile3
-rw-r--r--devel/hs-reflection/Makefile2
-rw-r--r--devel/hs-reflection/distinfo4
-rw-r--r--devel/hs-resource-pool/Makefile4
-rw-r--r--devel/hs-resourcet/Makefile4
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-safe/Makefile6
-rw-r--r--devel/hs-setenv/Makefile4
-rw-r--r--devel/hs-show/Makefile7
-rw-r--r--devel/hs-show/distinfo4
-rw-r--r--devel/hs-silently/Makefile1
-rw-r--r--devel/hs-simple-reflect/Makefile3
-rw-r--r--devel/hs-smallcheck/Makefile3
-rw-r--r--devel/hs-split/Makefile3
-rw-r--r--devel/hs-split/distinfo4
-rw-r--r--devel/hs-stm/Makefile5
-rw-r--r--devel/hs-stm/distinfo4
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile3
-rw-r--r--devel/hs-syb-with-class/Makefile4
-rw-r--r--devel/hs-syb/Makefile5
-rw-r--r--devel/hs-syb/distinfo4
-rw-r--r--devel/hs-system-fileio/Makefile4
-rw-r--r--devel/hs-system-filepath/Makefile5
-rw-r--r--devel/hs-tagged/Makefile3
-rw-r--r--devel/hs-tagged/distinfo4
-rw-r--r--devel/hs-temporary/Makefile2
-rw-r--r--devel/hs-terminfo/Makefile2
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework/Makefile7
-rw-r--r--devel/hs-testpack/Makefile4
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs56
-rw-r--r--devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs22
-rw-r--r--devel/hs-testpack/files/patch-testpack.cabal4
-rw-r--r--devel/hs-text/Makefile5
-rw-r--r--devel/hs-text/distinfo4
-rw-r--r--devel/hs-text/pkg-descr16
-rw-r--r--devel/hs-threads/Makefile3
-rw-r--r--devel/hs-threadscope/Makefile6
-rw-r--r--devel/hs-time-compat/Makefile3
-rw-r--r--devel/hs-timezone-olson/Makefile5
-rw-r--r--devel/hs-timezone-series/Makefile3
-rw-r--r--devel/hs-transformers-base/Makefile3
-rw-r--r--devel/hs-transformers/Makefile4
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile4
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-compat/distinfo4
-rw-r--r--devel/hs-unix-time/Makefile4
-rw-r--r--devel/hs-unix-time/distinfo4
-rw-r--r--devel/hs-unordered-containers/Makefile4
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utility-ht/Makefile3
-rw-r--r--devel/hs-utility-ht/distinfo4
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile3
-rw-r--r--devel/hs-uuagc-cabal/Makefile4
-rw-r--r--devel/hs-uuagc/Makefile5
-rw-r--r--devel/hs-uuagc/distinfo4
-rw-r--r--devel/hs-uuid/Makefile4
-rw-r--r--devel/hs-uuid/distinfo4
-rw-r--r--devel/hs-uulib/Makefile4
-rw-r--r--devel/hs-vault/Makefile5
-rw-r--r--devel/hs-vector-algorithms/Makefile2
-rw-r--r--devel/hs-vector/Makefile3
-rw-r--r--devel/hs-void/Makefile4
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-word8/Makefile3
281 files changed, 780 insertions, 641 deletions
diff --git a/devel/Makefile b/devel/Makefile
index de7760bc161c..7efc52968cdb 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -676,6 +676,7 @@
SUBDIR += hs-ansi-wl-pprint
SUBDIR += hs-arrows
SUBDIR += hs-asn1-data
+ SUBDIR += hs-asn1-types
SUBDIR += hs-async
SUBDIR += hs-attempt
SUBDIR += hs-base-unicode-symbols
@@ -706,6 +707,11 @@
SUBDIR += hs-cpphs
SUBDIR += hs-darcs
SUBDIR += hs-data-default
+ SUBDIR += hs-data-default-class
+ SUBDIR += hs-data-default-instances-base
+ SUBDIR += hs-data-default-instances-containers
+ SUBDIR += hs-data-default-instances-dlist
+ SUBDIR += hs-data-default-instances-old-locale
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
@@ -716,6 +722,7 @@
SUBDIR += hs-either
SUBDIR += hs-enumerator
SUBDIR += hs-errors
+ SUBDIR += hs-extensible-exceptions
SUBDIR += hs-failure
SUBDIR += hs-fast-logger
SUBDIR += hs-fgl
@@ -766,6 +773,7 @@
SUBDIR += hs-lifted-base
SUBDIR += hs-logict
SUBDIR += hs-mmap
+ SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
SUBDIR += hs-monad-logger
SUBDIR += hs-monad-par
@@ -781,6 +789,7 @@
SUBDIR += hs-profunctor-extras
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
+ SUBDIR += hs-quickcheck-io
SUBDIR += hs-random
SUBDIR += hs-ranges
SUBDIR += hs-reactive
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index a8dfbb5c72e2..de9a17e10b6a 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BNFC
PORTVERSION= 2.6.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index ab76edc71bd3..f9f205a1bc6c 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -2,13 +2,13 @@
PORTNAME= Boolean
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generalized Booleans and numbers
LICENSE= BSD
-FILE_LICENSE= COPYING
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 8f2c6f51b06b..1b7d76a65011 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,16 +2,14 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Configuration file reading and writing
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-CABAL_SETUP= Setup.hs
USE_CABAL= MissingH>=1.0.0 mtl parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile
index 7d0d3f5601ba..c1716f333963 100644
--- a/devel/hs-DeepArrow/Makefile
+++ b/devel/hs-DeepArrow/Makefile
@@ -3,16 +3,17 @@
PORTNAME= DeepArrow
PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Arrows for "deep application"
LICENSE= BSD
-FILE_LICENSE= COPYING
USE_CABAL= haskell-src mtl TypeCompose>=0.9.5
+BROKEN= does not build with GHC 7.6
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 241ae656daeb..c649987bc524 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HUnit
-PORTVERSION= 1.2.5.1
-PORTREVISION= 1
+PORTVERSION= 1.2.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Unit testing framework for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-HUnit/distinfo b/devel/hs-HUnit/distinfo
index 2a17e4ba95c4..647d173b8527 100644
--- a/devel/hs-HUnit/distinfo
+++ b/devel/hs-HUnit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HUnit-1.2.5.1.tar.gz) = bc0c15d20ee7cedf35fadcaf9cc15b5c2b4ce2df9d80e61bfcdd65ef1ef64471
-SIZE (cabal/HUnit-1.2.5.1.tar.gz) = 24221
+SHA256 (cabal/HUnit-1.2.5.2.tar.gz) = 0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41
+SIZE (cabal/HUnit-1.2.5.2.tar.gz) = 24889
diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-IORefCAS/Makefile
index 0a6736da442b..c10304ead6cb 100644
--- a/devel/hs-IORefCAS/Makefile
+++ b/devel/hs-IORefCAS/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= IORefCAS
-PORTVERSION= 0.2
-PORTREVISION= 3
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,6 @@ COMMENT= Atomic compare and swap for IORefs and STRefs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= bits-atomic
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-IORefCAS/distinfo b/devel/hs-IORefCAS/distinfo
index 9727cb91c32d..ad01ade34a76 100644
--- a/devel/hs-IORefCAS/distinfo
+++ b/devel/hs-IORefCAS/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/IORefCAS-0.2.tar.gz) = 69064a97a3786e1183e9df600d925a3c736fb133018d8372f1d3a78ce5f01ea2
-SIZE (cabal/IORefCAS-0.2.tar.gz) = 12062
+SHA256 (cabal/IORefCAS-0.2.0.1.tar.gz) = abb984358deedcbc904899f19756487a86ce44264d520193c2158c9eca646e1b
+SIZE (cabal/IORefCAS-0.2.0.1.tar.gz) = 12617
diff --git a/devel/hs-IORefCAS/pkg-descr b/devel/hs-IORefCAS/pkg-descr
index 75fa5fcff051..91d5f38f45f2 100644
--- a/devel/hs-IORefCAS/pkg-descr
+++ b/devel/hs-IORefCAS/pkg-descr
@@ -8,4 +8,4 @@ These alternatives are useful for debugging. Note that the foreign option
does not operate on IORefs and so is directly interchangeable with `Data.CAS`
and `Data.CAS.Fake` only if the interface in `Data.CAS.Class` is used.
-WWW: http://hackage.haskell.org/package/IORefCAS
+WWW: https://github.com/rrnewton/haskell-lockfree-queue/wiki
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index cad10dad5a84..cbc8943d822a 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Anaphoric and miscellaneous useful control-flow
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 937d555d2968..a22810e39fa8 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -2,7 +2,7 @@
PORTNAME= List
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= List monad transformer and class
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile
index f22b5ea2006a..a8ec82f50624 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-MaybeT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MaybeT
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Support for computations with failures
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index f8bb7bcbef60..5b89f301c5d9 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -3,14 +3,13 @@
PORTNAME= MemoTrie
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Trie-based memo functions
LICENSE= BSD
-FILE_LICENSE= COPYING
USE_CABAL= void
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 538dc0af07c2..d822927b227e 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MissingH
PORTVERSION= 1.2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Large Haskell utility library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= hslogger HUnit mtl network parsec random regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 5224c39baee5..83d07cabf1f5 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MonadCatchIO-mtl
PORTVERSION= 0.3.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Monad-transformer version of the Control.Exception module
LICENSE= BSD
-USE_CABAL= mtl
+USE_CABAL= extensible-exceptions mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index 374a567ec1fa..0573177bc63f 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= MonadCatchIO-transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,7 @@ COMMENT= Monad-transformer-compatible version of Control.Exception
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= transformers>=0.2
+USE_CABAL= extensible-exceptions>=0.1 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index c86747e70402..61f2e1d9801c 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,15 +1,12 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.1.8
+PORTVERSION= 0.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random-number generation monad
-
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl random
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index 7fe689ad0f18..e321a178bd43 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadRandom-0.1.8.tar.gz) = 35baeda6b072bdab64dd2d0e013940b5f326be42d928838151ff19b43d3e36fe
-SIZE (cabal/MonadRandom-0.1.8.tar.gz) = 3838
+SHA256 (cabal/MonadRandom-0.1.9.tar.gz) = 9f9a9767a8aedac8d85425cba732af3a656f6715331a6f643ee4d30e8a3924d9
+SIZE (cabal/MonadRandom-0.1.9.tar.gz) = 4075
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index cf1e5af45a47..7a54259614c1 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Explicitly handled object names for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index e514b57beae8..be1a975451cf 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 7f8d1080203a..10875bcf5999 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.5.1.1
-PORTREVISION= 1
+PORTVERSION= 2.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 196dc8dcbf91..25296515a922 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/QuickCheck-2.5.1.1.tar.gz) = 98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9
-SIZE (cabal/QuickCheck-2.5.1.1.tar.gz) = 26156
+SHA256 (cabal/QuickCheck-2.6.tar.gz) = 8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d
+SIZE (cabal/QuickCheck-2.6.tar.gz) = 26466
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index ae042d905044..64d7641dc11d 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ReadArgs
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Simple command line argument parsing
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13
EXECUTABLE= ReadArgsEx
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 4c7f04bdb99a..d0487e22f210 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Much safer replacement for QSemN, QSem, and SampleVar
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= stm
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index ad745a1b55ce..079565ee9266 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= StateVar
PORTVERSION= 1.0.0.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= State variables for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 54f5e965dbb4..0a7a74494412 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,11 +3,11 @@
PORTNAME= Stream
PORTVERSION= 0.4.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for manipulating infinite lists
+COMMENT= Library for manipulating infinite lists
LICENSE= BSD
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index db21c33be7ed..9d1a627eaa83 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Tensor
PORTVERSION= 1.0.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Tensor data types for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index bf56bc3771cf..c807a0252ed2 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -3,13 +3,13 @@
PORTNAME= TypeCompose
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type composition classes and instances
LICENSE= BSD
-FILE_LICENSE= COPYING
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 5ef5e1e53ef5..6fb707757ad6 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= abstract-deque
-PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,20 @@ COMMENT= Abstract, parameterized interface to mutable Deques
LICENSE= BSD
-CABAL_SETUP= Setup.hs
+USE_CABAL= HUnit random
-USE_CABAL= HUnit IORefCAS>=0.2
+OPTIONS_DEFINE= USECAS
+
+USECAS_DESC= Use hardware compare-and-swap
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+
+.if ${PORT_OPTIONS:MUSECAS}
+CONFIGURE_ARGS+= --flags="useCAS"
+USE_CABAL+= IORefCas>=0.2
+.else
+CONFIGURE_ARGS+= --flags="-useCAS"
+.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 72d5fe6c1a69..809ccc640360 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/abstract-deque-0.1.6.tar.gz) = ea079d582fb93a990cc7eeba235478a5158e9d40b713b8864512eb30f2ea488f
-SIZE (cabal/abstract-deque-0.1.6.tar.gz) = 10104
+SHA256 (cabal/abstract-deque-0.2.tar.gz) = 09e9d73cf5940fa1b2523387afc2fd7e13fbecb50ee203b7a38e14b4c8990133
+SIZE (cabal/abstract-deque-0.2.tar.gz) = 13248
diff --git a/devel/hs-abstract-deque/pkg-descr b/devel/hs-abstract-deque/pkg-descr
index 1dc39d78ec79..f21a5842237d 100644
--- a/devel/hs-abstract-deque/pkg-descr
+++ b/devel/hs-abstract-deque/pkg-descr
@@ -11,4 +11,4 @@ using the type-system to select an efficient implementation given the
requirements (using type families). This package also includes a simple
reference implementation based on 'IORef' and "Data.Sequence".
-WWW: http://hackage.haskell.org/package/abstract-deque
+WWW: https://github.com/rrnewton/haskell-lockfree-queue/wiki
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index f3c4979b2d99..7b539a136477 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Type classes generalizing the functionality of the 'monad-par' library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index bc53b5eb445a..2e0dae112f28 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Basic definitions for activehs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= QuickCheck>=2.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
new file mode 100644
index 000000000000..395caa6400de
--- /dev/null
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -0,0 +1,10 @@
+--- ./activehs-base.cabal.orig 2012-09-11 09:56:08.000000000 +0200
++++ ./activehs-base.cabal 2013-05-03 21:25:00.000000000 +0200
+@@ -22,6 +22,6 @@
+ ActiveHs.Base
+ Build-Depends:
+ base >= 4.0 && < 4.7,
+- QuickCheck >= 2.4 && < 2.6
++ QuickCheck >= 2.4 && < 2.7
+
+
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 5c7de0e8d227..8ba19f5dda17 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTVERSION= 3.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Alex is a tool for generating lexical analysers in Haskell
+COMMENT= Tool for generating lexical analysers in Haskell
LICENSE= BSD
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 9554dee09961..1035f9261d28 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/alex-3.0.2.tar.gz) = 997e33342c3c6e0edfff862f051fc286bd661f442d09d1bc02cd6e9d22083164
-SIZE (cabal/alex-3.0.2.tar.gz) = 100396
+SHA256 (cabal/alex-3.0.5.tar.gz) = c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659
+SIZE (cabal/alex-3.0.5.tar.gz) = 100004
diff --git a/devel/hs-alex/pkg-descr b/devel/hs-alex/pkg-descr
index 4fd601fad81f..5cbbd2b635f9 100644
--- a/devel/hs-alex/pkg-descr
+++ b/devel/hs-alex/pkg-descr
@@ -1,3 +1,6 @@
-Alex is a tool for generating lexical analysers in Haskell.
+Alex is a tool for generating lexical analysers in Haskell. It takes a
+description of tokens based on regular expressions and generates a
+Haskell module containing code for scanning text efficiently. It is
+similar to the tool lex or flex for C/C++.
WWW: http://www.haskell.org/alex/
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index addef7de6cac..d55bf059abb9 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ansi-terminal
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 5111280b08f5..1c01ba36fb5e 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 0d6596e9d48c..4094b7ccc258 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Haskell arrow classes and transformers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= Stream
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 20415fae4827..22b0b84e5f8c 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= ASN1 data reader and writer in RAW, BER, and DER forms
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal mtl text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
new file mode 100644
index 000000000000..9b4ce3c20c44
--- /dev/null
+++ b/devel/hs-asn1-types/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= asn1-types
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= ASN.1 types
+
+LICENSE= BSD
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-asn1-types/distinfo b/devel/hs-asn1-types/distinfo
new file mode 100644
index 000000000000..74a22bf7d26f
--- /dev/null
+++ b/devel/hs-asn1-types/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/asn1-types-0.1.3.tar.gz) = 4f124d162967b38b0b704843b7b7b7925c0cc3bf6808b3044ba285d315dca5b4
+SIZE (cabal/asn1-types-0.1.3.tar.gz) = 3841
diff --git a/devel/hs-asn1-types/pkg-descr b/devel/hs-asn1-types/pkg-descr
new file mode 100644
index 000000000000..794d1880be2e
--- /dev/null
+++ b/devel/hs-asn1-types/pkg-descr
@@ -0,0 +1,3 @@
+ASN.1 standard types.
+
+WWW: http://github.com/vincenthz/hs-asn1-types
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index f4a5fb464b03..1feb8d937cdb 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.1.3
-PORTREVISION= 1
+PORTVERSION= 2.0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,6 @@ COMMENT= Run IO operations asynchronously and wait for their results
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= stm>=2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index 9bb0a7b2a41a..61b04a877586 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/async-2.0.1.3.tar.gz) = 70d681084aca826c84d722320fc5d67ac6294802afbb13f8b5e8eac2bbc972e5
-SIZE (cabal/async-2.0.1.3.tar.gz) = 8345
+SHA256 (cabal/async-2.0.1.4.tar.gz) = 41ddfe012d98f3ef101651fb529753bca5bb4c804f03f9cfafc5d0cbe50224c2
+SIZE (cabal/async-2.0.1.4.tar.gz) = 8349
diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile
index d7135643797b..372c4e59285c 100644
--- a/devel/hs-attempt/Makefile
+++ b/devel/hs-attempt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= attempt
PORTVERSION= 0.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 073257a73333..2788c6157c50 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Unicode alternatives for common functions and operators
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index cc74acd85ab7..dfa4fef7da03 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Fast base16 (hex) encoding and deconding for ByteStrings
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index f6af383c91e2..89f4f2c1dfd0 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,6 +2,7 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Fast base64 encoding and decoding for ByteStrings
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-base64-conduit/Makefile b/devel/hs-base64-conduit/Makefile
index 7106e181ed78..f238d29fc5d6 100644
--- a/devel/hs-base64-conduit/Makefile
+++ b/devel/hs-base64-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= base64-conduit
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index f7faf88e2d8c..800e0b32d651 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.4.0
+PORTVERSION= 0.3.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An enhanced core prelude; a common foundation for alternate preludes
+COMMENT= Enhanced core prelude; a common foundation for alternate preludes
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hashable lifted-base ReadArgs>=1.2 system-filepath>=0.4 text \
transformers unordered-containers vector
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 27a3999bbab8..00747c3a1c0d 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.4.0.tar.gz) = e66b61f4fed3a5a7c89e2d9908579f5bd349d841d2a94f5c25ae1dd70c605e51
-SIZE (cabal/basic-prelude-0.3.4.0.tar.gz) = 4639
+SHA256 (cabal/basic-prelude-0.3.5.0.tar.gz) = 5991c0011058257b42ca5446909aa1f5ac24a4be11962f45fe7f17b8f78a2edb
+SIZE (cabal/basic-prelude-0.3.5.0.tar.gz) = 4648
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 9227c189bc26..6ba871323341 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bifunctors
PORTVERSION= 3.2.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 5a2cf9b02000..4c9a649db210 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,16 +2,13 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Atomic bit operations on memory locations
LICENSE= BSD
-FILE_LICENSE= License.txt
-
-CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
index 269beb620e4d..d32e285573b3 100644
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ b/devel/hs-blaze-builder-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-builder-conduit
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 78d3b879b41d..de4432ae68c3 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Enumeratees for the incremental conversion of builders to bytestrings
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 5d701f4d7db4..10994a53f1ee 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.3.1.0
-PORTREVISION= 4
+PORTVERSION= 0.3.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,6 @@ COMMENT= Efficient buffered output
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 103b2e6d5d4c..ca853c06cda4 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-0.3.1.0.tar.gz) = 26aadd629c2d2f5e77cfdb45b4948b20b6e598b723dd7d317556b26a72c557a4
-SIZE (cabal/blaze-builder-0.3.1.0.tar.gz) = 68214
+SHA256 (cabal/blaze-builder-0.3.1.1.tar.gz) = a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde
+SIZE (cabal/blaze-builder-0.3.1.1.tar.gz) = 69061
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index 73c338b4b077..5a9a797917e1 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index f4fbd0efa10d..ecb58e3fab70 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 1.2.6.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 99d4e6aa87f0..8a0017bb4a32 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Access to the BSD sysctl(3) interface
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bsd-sysctl/files/patch-Setup.hs b/devel/hs-bsd-sysctl/files/patch-Setup.hs
new file mode 100644
index 000000000000..5d8b6009497c
--- /dev/null
+++ b/devel/hs-bsd-sysctl/files/patch-Setup.hs
@@ -0,0 +1,16 @@
+--- ./Setup.hs.orig 2012-02-28 22:01:23.000000000 +0100
++++ ./Setup.hs 2013-05-01 00:55:07.000000000 +0200
+@@ -4,6 +4,7 @@
+
+ import System.Directory
+ import System.FilePath
++import System.IO.Error
+
+ -- Define __HADDOCK__ when building documentation.
+ main = defaultMainWithHooks simpleUserHooks {
+@@ -19,4 +20,4 @@
+ removePreProcessedFiles dir = do
+ putStrLn $ "Trying to remove source in: " ++ dir
+ removeFile (dir </> "System/BSD/Sysctl.hs")
+- `catch` \_ -> putStrLn "Could not find source file!" >> return ()
++ `catchIOError` \_ -> putStrLn "Could not find source file!" >> return ()
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 0d4506500b34..7cfdaad761b3 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= byteorder
-PORTVERSION= 1.0.3
-PORTREVISION= 4
+PORTVERSION= 1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Exposes the native endianness or byte ordering of the system
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-byteorder/distinfo b/devel/hs-byteorder/distinfo
index 1657f35925d4..a1c0b78b4b22 100644
--- a/devel/hs-byteorder/distinfo
+++ b/devel/hs-byteorder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/byteorder-1.0.3.tar.gz) = 5ef1125f2c6506ba6303f59f3265b4d0caaa6dbe897cf14dac715e920f59d214
-SIZE (cabal/byteorder-1.0.3.tar.gz) = 2007
+SHA256 (cabal/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
+SIZE (cabal/byteorder-1.0.4.tar.gz) = 2030
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index e9b914784728..12e5ae1e9cd1 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Parse numeric literals from ByteStrings
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index a8fac7d12314..c1f67b5ef72d 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -3,16 +3,14 @@
PORTNAME= c2hs
PORTVERSION= 0.16.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= C->Haskell tool that gives some cross-language type safety
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= language-c>=0.3.1.1
XMLDOCS= doc/users_guide:html
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index a1615dcb9ba6..f9bc3fbfefd5 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,17 +1,14 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 0.14.0
-PORTREVISION= 4
+PORTVERSION= 1.16.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= The command-line interface for Cabal and Hackage
+COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= network>=1 random>=1 HTTP>=4000.0.2 zlib>=0.4
STANDALONE= yes
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index a0b1dad82273..c5771bcd1a59 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cabal-install-0.14.0.tar.gz) = f4f2b50269ff59d67b5f3d82d50f7706b6bad1117295a7c81f32bbe72add5bd8
-SIZE (cabal/cabal-install-0.14.0.tar.gz) = 193187
+SHA256 (cabal/cabal-install-1.16.0.2.tar.gz) = 66dfacc9f33e668e56904072cadb8a36bd9d6522ba5464c6a36a5de7e65c5698
+SIZE (cabal/cabal-install-1.16.0.2.tar.gz) = 201232
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index b322013176c8..a2ef0a83d95d 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -2,11 +2,11 @@
PORTNAME= cereal
PORTVERSION= 0.3.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A binary serialization library for Haskell
+COMMENT= Binary serialization library for Haskell
LICENSE= BSD
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index f5f34ab73139..cded1fa2534d 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -3,13 +3,13 @@
PORTNAME= checkers
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Check properties on standard classes and data structures
LICENSE= BSD
-FILE_LICENSE= COPYING
USE_CABAL= QuickCheck>=2.3 random
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 2df4b559411a..e7d8f2db59de 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= classy-prelude-conduit
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Conduit instances for classy-prelude
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= classy-prelude>=0.5.3 conduit>=0.5.4.1 monad-control \
resourcet transformers void xml-conduit>=1.0
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index e88a51d27353..cbfbac17f42c 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.5.3
+PORTVERSION= 0.5.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A typeclass-based Prelude
+COMMENT= Typeclass-based Prelude
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= basic-prelude>=0.3.4 hashable lifted-base>=0.2 \
system-filepath>=0.4 text transformers unordered-containers \
vector
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index f05fb5ded496..aff0fd3b4e80 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.5.3.tar.gz) = 4de9dd739cfa64986f5271b99d947be27f92fe0d4ed0c6914ff2e7dd676f9076
-SIZE (cabal/classy-prelude-0.5.3.tar.gz) = 13754
+SHA256 (cabal/classy-prelude-0.5.7.tar.gz) = 1f6bb03827dc40863622aaba5c37c5b7165dfce350328e7d10b00d6c8fa208f3
+SIZE (cabal/classy-prelude-0.5.7.tar.gz) = 15740
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 11e00d069b6a..dd419b222b82 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Command line argument processing
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index e4c299944483..c2ea87159f13 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.10.2.tar.gz) = e4650aeeef712c337079a5efc6db311c816eb7f735c125645cca4f954c61c76e
-SIZE (cabal/cmdargs-0.10.2.tar.gz) = 60343
+SHA256 (cabal/cmdargs-0.10.3.tar.gz) = 06665acc796b91d5ea7a1dd48bbe60e595656627cfb52dc61c5baf57e772f4b1
+SIZE (cabal/cmdargs-0.10.3.tar.gz) = 60581
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index a8521d882efb..cf4bf476dc2f 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Streaming data processing library
LICENSE= BSD
-USE_CABAL= lifted-base>=0.1 monad-control>=0.3.1 resourcet>=0.4.3 \
+USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 resourcet>=0.4.3 \
text>=0.11 transformers>=0.2.2 transformers-base>=0.4.1 \
void>=0.5.5
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index 616acb21e78c..8de981b976c5 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-1.0.2.tar.gz) = 0e8c90c9fd0faa4a96475567400caa38542edc9e190fd3f9f66fcd2da9cf1e0e
-SIZE (cabal/conduit-1.0.2.tar.gz) = 29928
+SHA256 (cabal/conduit-1.0.5.tar.gz) = c57c8226509e4aeea81a9cb790757c94183e011de5c4798cbb5935d0e9551271
+SIZE (cabal/conduit-1.0.5.tar.gz) = 30859
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index bd737e892c00..74318343ff61 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 6766c20c78c4..5eb26ea8b66b 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,7 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.0.11.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index afe87899deea..91f7f15abf6c 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -3,15 +3,13 @@
PORTNAME= cpphs
PORTVERSION= 1.16
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Liberalised re-implementation of cpp, the C pre-processor
LICENSE= LGPL21
-FILE_LICENSE= LICENCE-LGPL
-
-CABAL_SETUP= Setup.hs
EXECUTABLE= cpphs
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index b8716f6abf37..bebb8c61bcc9 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,13 +3,13 @@
PORTNAME= darcs
PORTVERSION= 2.8.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A distributed, interactive, smart revision control system
LICENSE= GPLv2
-FILE_LICENSE= COPYING
USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html \
mtl>=1.0 parsec>=2.2 random regex-compat>=0.95.1 \
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
new file mode 100644
index 000000000000..3461c620927f
--- /dev/null
+++ b/devel/hs-data-default-class/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-default-class
+PORTVERSION= 0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Class for types with a default value
+
+LICENSE= BSD
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-default-class/distinfo b/devel/hs-data-default-class/distinfo
new file mode 100644
index 000000000000..31fd528a0f3d
--- /dev/null
+++ b/devel/hs-data-default-class/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-default-class-0.0.1.tar.gz) = adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31
+SIZE (cabal/data-default-class-0.0.1.tar.gz) = 1461
diff --git a/devel/hs-data-default-class/pkg-descr b/devel/hs-data-default-class/pkg-descr
new file mode 100644
index 000000000000..3f153f1c24b7
--- /dev/null
+++ b/devel/hs-data-default-class/pkg-descr
@@ -0,0 +1,3 @@
+A class for types with a default value.
+
+WWW: http://hackage.haskell.org/package/data-default-class
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
new file mode 100644
index 000000000000..0b8b8314c0e0
--- /dev/null
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= data-default-instances-base
+PORTVERSION= 0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Default instances for types in base
+
+LICENSE= BSD
+
+USE_CABAL= data-default-class
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-default-instances-base/distinfo b/devel/hs-data-default-instances-base/distinfo
new file mode 100644
index 000000000000..ac501b02ff33
--- /dev/null
+++ b/devel/hs-data-default-instances-base/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-default-instances-base-0.0.1.tar.gz) = eb12ff0174ae1fe2613058b87d0752f94e64df9a9bf971780c2e24bf0cb662a0
+SIZE (cabal/data-default-instances-base-0.0.1.tar.gz) = 1930
diff --git a/devel/hs-data-default-instances-base/pkg-descr b/devel/hs-data-default-instances-base/pkg-descr
new file mode 100644
index 000000000000..0601c8d78efc
--- /dev/null
+++ b/devel/hs-data-default-instances-base/pkg-descr
@@ -0,0 +1,3 @@
+Default instances for types in base.
+
+WWW: http://hackage.haskell.org/package/data-default-instances-base
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
new file mode 100644
index 000000000000..2fc7621e03e5
--- /dev/null
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= data-default-instances-containers
+PORTVERSION= 0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Default instances for types in containers
+
+LICENSE= BSD
+
+USE_CABAL= data-default-class
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-default-instances-containers/distinfo b/devel/hs-data-default-instances-containers/distinfo
new file mode 100644
index 000000000000..67aacc61da1d
--- /dev/null
+++ b/devel/hs-data-default-instances-containers/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
+SIZE (cabal/data-default-instances-containers-0.0.1.tar.gz) = 1659
diff --git a/devel/hs-data-default-instances-containers/pkg-descr b/devel/hs-data-default-instances-containers/pkg-descr
new file mode 100644
index 000000000000..2b93d9b2f524
--- /dev/null
+++ b/devel/hs-data-default-instances-containers/pkg-descr
@@ -0,0 +1,3 @@
+Default instances for types in containers.
+
+WWW: http://hackage.haskell.org/package/data-default-instances-containers
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
new file mode 100644
index 000000000000..7fd84a1eec52
--- /dev/null
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= data-default-instances-dlist
+PORTVERSION= 0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Default instances for types in dlist
+
+LICENSE= BSD
+
+USE_CABAL= data-default-class dlist
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-default-instances-dlist/distinfo b/devel/hs-data-default-instances-dlist/distinfo
new file mode 100644
index 000000000000..f62a64d50b1e
--- /dev/null
+++ b/devel/hs-data-default-instances-dlist/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
+SIZE (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 1503
diff --git a/devel/hs-data-default-instances-dlist/pkg-descr b/devel/hs-data-default-instances-dlist/pkg-descr
new file mode 100644
index 000000000000..0c187bf55451
--- /dev/null
+++ b/devel/hs-data-default-instances-dlist/pkg-descr
@@ -0,0 +1,3 @@
+Default instances for types in dlist.
+
+WWW: http://hackage.haskell.org/package/data-default-instances-dlist
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
new file mode 100644
index 000000000000..8f2cbaf8d4ee
--- /dev/null
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= data-default-instances-old-locale
+PORTVERSION= 0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Default instances for types in old-locale
+
+LICENSE= BSD
+
+USE_CABAL= data-default-class
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-default-instances-old-locale/distinfo b/devel/hs-data-default-instances-old-locale/distinfo
new file mode 100644
index 000000000000..475d09844e98
--- /dev/null
+++ b/devel/hs-data-default-instances-old-locale/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
+SIZE (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
diff --git a/devel/hs-data-default-instances-old-locale/pkg-descr b/devel/hs-data-default-instances-old-locale/pkg-descr
new file mode 100644
index 000000000000..875b1ebc403c
--- /dev/null
+++ b/devel/hs-data-default-instances-old-locale/pkg-descr
@@ -0,0 +1,3 @@
+Default instances for types in old-locale.
+
+WWW: http://hackage.haskell.org/package/data-default-instances-old-locale
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 1d213ead9bee..419874fd0fae 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -1,16 +1,17 @@
# $FreeBSD$
PORTNAME= data-default
-PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTVERSION= 0.5.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A class for types with a default value
+COMMENT= Class for types with a default value
LICENSE= BSD
-USE_CABAL= dlist
+USE_CABAL= data-default-class data-default-instances-base \
+ data-default-instances-containers data-default-instances-dlist \
+ data-default-instances-old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-default/distinfo b/devel/hs-data-default/distinfo
index 71aaf0d346b8..46c14a4b1a21 100644
--- a/devel/hs-data-default/distinfo
+++ b/devel/hs-data-default/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-default-0.5.0.tar.gz) = 4ad884231906e064b9c74f511b542d7ee5032fbe055e95023c1a10999ae468f3
-SIZE (cabal/data-default-0.5.0.tar.gz) = 2005
+SHA256 (cabal/data-default-0.5.3.tar.gz) = ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034
+SIZE (cabal/data-default-0.5.3.tar.gz) = 1623
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index e87d0beb3c16..10b49c4a8485 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-pprint
PORTVERSION= 0.2.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Prettyprint and compare Data values
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl>=2.0 parallel>=3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 73d38e61eece..7f68e833b746 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Date cacher
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index f636c1b014c2..909bdbb2f4a2 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,14 +3,13 @@
PORTNAME= datetime
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities to make Data.Time.* easier to use in Haskell
LICENSE= GPLv3
-FILE_LICENSE= COPYING
USE_CABAL= QuickCheck>=2
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index 26115c49771a..0e092d7ec9a7 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -2,15 +2,13 @@
PORTNAME= directory-tree
PORTVERSION= 0.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A simple directory-like tree datatype, with useful IO functions
+COMMENT= Simple directory-like tree datatype, with useful IO functions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 96a4173fafb7..1596040e248f 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -3,11 +3,11 @@
PORTNAME= dlist
PORTVERSION= 0.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A list-like type supporting O(1) append for Haskell
+COMMENT= List-like type supporting O(1) append for Haskell
LICENSE= BSD
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index ffc433700f17..fb103b0b2bb1 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -3,7 +3,7 @@
PORTNAME= drift
PORTVERSION= 2.2.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/
PKGNAMEPREFIX= hs-
diff --git a/devel/hs-drift/files/patch-src__ChaseImports.hs b/devel/hs-drift/files/patch-src__ChaseImports.hs
index 61ae0b6c59fa..0150ecfdbbc5 100644
--- a/devel/hs-drift/files/patch-src__ChaseImports.hs
+++ b/devel/hs-drift/files/patch-src__ChaseImports.hs
@@ -1,11 +1,19 @@
--- ./src/ChaseImports.hs.orig 2008-02-10 15:38:31.000000000 +0100
-+++ ./src/ChaseImports.hs 2012-05-13 11:51:52.000000000 +0200
-@@ -24,7 +24,7 @@
++++ ./src/ChaseImports.hs 2013-05-01 01:35:21.000000000 +0200
+@@ -24,13 +24,14 @@
import DataP
import CommandP
import ParseLib2
-import System
+import System.Environment
++import System.IO.Error
import List
import qualified Unlit
import Monad
+ import GenUtil
+
+-try x = catch (x >>= return . Right) (return . Left)
++try x = catchIOError (x >>= return . Right) (return . Left)
+
+ --- Split up input ---------------------------------------------------------
+ splitString :: String -> String -> (String,String)
diff --git a/devel/hs-drift/files/patch-src__GenUtil.hs b/devel/hs-drift/files/patch-src__GenUtil.hs
index 28989419a789..cd7485acc98e 100644
--- a/devel/hs-drift/files/patch-src__GenUtil.hs
+++ b/devel/hs-drift/files/patch-src__GenUtil.hs
@@ -1,5 +1,5 @@
--- ./src/GenUtil.hs.orig 2008-02-10 15:38:31.000000000 +0100
-+++ ./src/GenUtil.hs 2012-05-13 11:53:22.000000000 +0200
++++ ./src/GenUtil.hs 2013-05-01 00:53:12.000000000 +0200
@@ -39,7 +39,7 @@
-- ** Simple deconstruction
fromLeft,fromRight,fsts,snds,splitEither,rights,lefts,
@@ -49,12 +49,25 @@
{-# INLINE fromRight #-}
+@@ -284,10 +286,10 @@
+ lefts xs = [x | Left x <- xs]
+
+ ioM :: Monad m => IO a -> IO (m a)
+-ioM action = catch (fmap return action) (\e -> return (fail (show e)))
++ioM action = System.IO.Error.catchIOError (fmap return action) (\e -> return (fail (show e)))
+
+ ioMp :: MonadPlus m => IO a -> IO (m a)
+-ioMp action = catch (fmap return action) (\_ -> return mzero)
++ioMp action = System.IO.Error.catchIOError (fmap return action) (\_ -> return mzero)
+
+ -- | reformat a string to not be wider than a given width, breaking it up
+ -- between words.
@@ -381,7 +383,7 @@
-- | looks up an enviornment variable and returns it in a 'MonadPlus' rather
-- than raising an exception if the variable is not set.
lookupEnv :: MonadPlus m => String -> IO (m String)
-lookupEnv s = catch (fmap return $ System.getEnv s) (\e -> if IO.isDoesNotExistError e then return mzero else ioError e)
-+lookupEnv s = catch (fmap return $ System.Environment.getEnv s) (\e -> if System.IO.Error.isDoesNotExistError e then return mzero else ioError e)
++lookupEnv s = System.IO.Error.catchIOError (fmap return $ System.Environment.getEnv s) (\e -> if System.IO.Error.isDoesNotExistError e then return mzero else ioError e)
{-# SPECIALIZE fmapLeft :: (a -> c) -> [(Either a b)] -> [(Either c b)] #-}
fmapLeft :: Functor f => (a -> c) -> f (Either a b) -> f (Either c b)
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 12db5e7de249..38e79e6ed276 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,6 +2,7 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 6cfbfa376935..22e35a65c816 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -2,6 +2,7 @@
PORTNAME= either
PORTVERSION= 3.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index bb8bf61551d3..06e069c917f3 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,16 +2,14 @@
PORTNAME= enumerator
PORTVERSION= 0.4.19
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Reliable, high-performance processing with left-fold enumerators
LICENSE= MIT
-FILE_LICENSE= license.txt
-CABAL_SETUP= Setup.hs
USE_CABAL= text>=0.7 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index 30ea7fe8cdbc..c057a613c4a7 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -2,6 +2,7 @@
PORTNAME= errors
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Simplified error-handling
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= either>=3.1 safe>=0.3.3 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
new file mode 100644
index 000000000000..4334d17d5309
--- /dev/null
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= extensible-exceptions
+PORTVERSION= 0.1.1.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Extensible exceptions
+
+LICENSE= BSD
+
+CABAL_SETUP= Setup.hs
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-extensible-exceptions/distinfo b/devel/hs-extensible-exceptions/distinfo
new file mode 100644
index 000000000000..ff89f15c5a1f
--- /dev/null
+++ b/devel/hs-extensible-exceptions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
+SIZE (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 8531
diff --git a/devel/hs-extensible-exceptions/pkg-descr b/devel/hs-extensible-exceptions/pkg-descr
new file mode 100644
index 000000000000..bfd536bc7d0c
--- /dev/null
+++ b/devel/hs-extensible-exceptions/pkg-descr
@@ -0,0 +1,4 @@
+This package provides extensible exceptions for both new and old versions
+of GHC (i.e., < 6.10).
+
+WWW: http://hackage.haskell.org/package/extensible-exceptions
diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile
index 84aa54f89dee..42220fbc53a3 100644
--- a/devel/hs-failure/Makefile
+++ b/devel/hs-failure/Makefile
@@ -2,11 +2,11 @@
PORTNAME= failure
PORTVERSION= 0.2.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A simple type class for success/failure computations
+COMMENT= Simple type class for success/failure computations
LICENSE= BSD
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 0a3969355e05..b725e275e298 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -2,15 +2,14 @@
PORTNAME= fast-logger
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A fast logging system
+COMMENT= Fast logging system
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= blaze-builder date-cache>=0.3 text unix-time
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 7ba71cbb6147..f950d462c9d0 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fgl
PORTVERSION= 5.4.2.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Martin Erwig Functional Graph Library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 845e5305701a..b30819a35556 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -2,6 +2,7 @@
PORTNAME= file-embed
PORTVERSION= 0.0.4.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index db6446dd011e..f605cd6a5d8d 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,7 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index c97805c9a620..925d11f0a1dc 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -2,6 +2,7 @@
PORTNAME= filestore
PORTVERSION= 0.6.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
index 4eea1a3f5961..ed11847ef516 100644
--- a/devel/hs-filesystem-conduit/Makefile
+++ b/devel/hs-filesystem-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= filesystem-conduit
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index a95037e52ecb..b96cec9f65e8 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.0.6
+PORTVERSION= 0.0.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Cross-platform library for file system notifications
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hinotify>=0.3.5 system-fileio>=0.3.8 system-filepath>=0.4.6 \
text>=0.11.0
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 4d4553ba69ff..48b0b29c2603 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fsnotify-0.0.6.tar.gz) = 85e31556ab86f4c1c6fa5039492e0f66094e029705ebd53b4c58ed21b5556645
-SIZE (cabal/fsnotify-0.0.6.tar.gz) = 14570
+SHA256 (cabal/fsnotify-0.0.11.tar.gz) = 987be41d188782fd8fe081263d6a7345c8bad6576848457a73ef7b666f08a90e
+SIZE (cabal/fsnotify-0.0.11.tar.gz) = 14530
diff --git a/devel/hs-fsnotify/pkg-descr b/devel/hs-fsnotify/pkg-descr
index ba3bb03ac7ec..3a14903bcb56 100644
--- a/devel/hs-fsnotify/pkg-descr
+++ b/devel/hs-fsnotify/pkg-descr
@@ -1,4 +1,4 @@
-Cross platform library for file creation, modification, and deletion
+Cross-platform library for file creation, modification, and deletion
notification. This library builds upon existing libraries for platform-specific
Window, Mac, and Linux filesystem event notification.
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 560b18ed0d1f..e92f3f3631ae 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -2,16 +2,13 @@
PORTNAME= gconf
PORTVERSION= 0.12.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the GNOME configuration database system
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 gtk2hs-buildtools
USE_GNOME= gconf2
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 3a6aecafd5d3..8d561d30ed0f 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= Generic programming library for generalised deriving
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 7a82879f602f..4182bdb600eb 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/generic-deriving-1.4.0.tar.gz) = 47e5bae4348401217de5e6f8dd638a6e5c3fc3ddedce1c885fc56252091d5b95
-SIZE (cabal/generic-deriving-1.4.0.tar.gz) = 17868
+SHA256 (cabal/generic-deriving-1.5.0.tar.gz) = 1988bfac75714acb50b3e7cd84aef14d193486fa42e02eeaa659d57ff96470d4
+SIZE (cabal/generic-deriving-1.5.0.tar.gz) = 19220
diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate/Makefile
index 8877e4d27241..35cf2ec80fed 100644
--- a/devel/hs-geniplate/Makefile
+++ b/devel/hs-geniplate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= geniplate
PORTVERSION= 0.6.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ 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"
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 2cf2c114c0b5..6653b69fce58 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ghc-events
PORTVERSION= 0.4.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 2ad9d05e65ad..56f254f79def 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,12 +3,11 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An mtl compatible version of the Ghc-Api monads and\
- monad-transformers
+COMMENT= Mtl-compatible version of the Ghc-Api monads and monad-transformers
LICENSE= BSD
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 5262fdb97358..afb4666c97d4 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +11,5 @@ COMMENT= Knowledge of GHC's installation directories
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 4e837cb4530e..e57ad5d667dd 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -2,16 +2,13 @@
PORTNAME= gio
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the GIO
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USES= pkgconfig
USE_CABAL= glib>=0.12.0 mtl
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 942cfa6572f6..678804215f3e 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,22 +2,18 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 4.20130323
-PORTREVISION= 1
+PORTVERSION= 4.20130601
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-FILE_LICENSE= COPYRIGHT
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse json \
- lifted-base MissingH monad-control mtl network pcre-light \
- QuickCheck>=2.1 regex-tdfa SafeSemaphore SHA text \
- transformers-base utf8-string uuid
+USE_CABAL= bloomfilter dataenc dlist edit-distance extensible-exceptions \
+ hslogger HTTP IfElse json MissingH MonadCatchIO-transformers \
+ monad-control mtl>=2 network>=2.0 QuickCheck>=2.1 random \
+ SafeSemaphore SHA text unix-compat utf8-string uuid
USE_GMAKE= yes
USE_PERL5_BUILD= yes
@@ -33,15 +29,16 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
-OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION
+OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION TDFA
OPTIONS_DEFAULT= S3 ASSISTANT
S3_DESC= S3 support
ASSISTANT_DESC= 'assistant' and 'watch' commands
INOTIFY_DESC= File system notifications support
-WEBAPP_DESC= Web application (req. assistant)
-PAIRING_DESC= Enable pairing (req. web application)
+WEBAPP_DESC= Web application (requires assistant)
+PAIRING_DESC= Enable pairing (requires web application)
PRODUCTION_DESC= Production build
+TDFA_DESC= Use regex-tdfa for wildcards
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
@@ -84,7 +81,7 @@ CONFIGURE_ARGS+= --flags="-Pairing"
.endif
# Disable all the other options
-CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus"
+CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus -WebDAV"
.if ${PORT_OPTIONS:MPRODUCTION}
CONFIGURE_ARGS+= --flags="Production"
@@ -92,5 +89,12 @@ CONFIGURE_ARGS+= --flags="Production"
CONFIGURE_ARGS+= --flags="-Production"
.endif
+.if ${PORT_OPTIONS:MTDFA}
+CONFIGURE_ARGS+= --flags="TDFA"
+USE_CABAL+= regex-tdfa
+.else
+CONFIGURE_ARGS+= --flags="-TDFA"
+.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 ca821cf3cac6..7e93e176970a 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-4.20130323.tar.gz) = 1f940d88b8ef91e18155a778b3665c7151f61567945259d41921e389beab779f
-SIZE (cabal/git-annex-4.20130323.tar.gz) = 2578033
+SHA256 (cabal/git-annex-4.20130601.tar.gz) = 96228918c356bc3e23693fd0c48e2557c68d97c769a7e76082851b91535cd250
+SIZE (cabal/git-annex-4.20130601.tar.gz) = 3332000
diff --git a/devel/hs-git-annex/files/patch-Build__Configure.hs b/devel/hs-git-annex/files/patch-Build__Configure.hs
deleted file mode 100644
index 159d7da5eb3e..000000000000
--- a/devel/hs-git-annex/files/patch-Build__Configure.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Build/Configure.hs.orig 2013-03-23 20:06:19.000000000 +0200
-+++ ./Build/Configure.hs 2013-05-09 22:49:33.000000000 +0200
-@@ -55,7 +55,7 @@
- key = "sha" ++ show n
- check = "</dev/null 2>/dev/null | grep -q '" ++ knowngood ++ "'"
- shacmds n = concatMap (\x -> [x, 'g':x, osxpath </> x]) $
-- map (\x -> "sha" ++ show n ++ x) ["sum", ""]
-+ map (\x -> "gsha" ++ show n ++ x) ["sum", ""]
- {- Max OSX sometimes puts GNU tools outside PATH, so look in
- - the location it uses, and remember where to run them
- - from. -}
diff --git a/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs b/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs
deleted file mode 100644
index de4e212d205a..000000000000
--- a/devel/hs-git-annex/files/patch-Build__InstallDesktopFile.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Build/InstallDesktopFile.hs.orig 2012-10-17 03:24:57.000000000 +0200
-+++ ./Build/InstallDesktopFile.hs 2012-11-06 11:26:23.567300019 +0100
-@@ -59,11 +59,15 @@
-
- writeFDODesktop :: FilePath -> IO ()
- writeFDODesktop command = do
-- datadir <- ifM systemwideInstall ( return systemDataDir, userDataDir )
-+ prefix <- catchMaybeIO (getEnv "PREFIX")
-+ let (sddir,scdir) = case prefix of
-+ Just p -> (p </> "share", p </> "etc/xdg")
-+ Nothing -> (systemDataDir, systemConfigDir)
-+ datadir <- ifM systemwideInstall ( return sddir, userDataDir )
- writeDesktopMenuFile (desktop command)
- =<< inDestDir (desktopMenuFilePath "git-annex" datadir)
-
-- configdir <- ifM systemwideInstall ( return systemConfigDir, userConfigDir )
-+ configdir <- ifM systemwideInstall ( return scdir, userConfigDir )
- installAutoStart command
- =<< inDestDir (autoStartPath "git-annex" configdir)
-
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
deleted file mode 100644
index f19e74277f85..000000000000
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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-glade/Makefile b/devel/hs-glade/Makefile
index f591c156bfb5..e528b62d99f2 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -2,16 +2,14 @@
PORTNAME= glade
PORTVERSION= 0.12.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the glade library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 gtk>=0.12
USE_GNOME= libglade2
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index 83af4b0354df..6819e23ab9c6 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -2,16 +2,13 @@
PORTNAME= glib
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the GLIB library for Gtk2Hs
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USES= pkgconfig
USE_CABAL= gtk2hs-buildtools
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 765b9092ec7b..ebdd2539b32e 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -2,16 +2,13 @@
PORTNAME= gtk2hs-buildtools
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Tools to build the Gtk2Hs suite of User Interface Libraries
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= random
USE_ALEX= yes
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
new file mode 100644
index 000000000000..0fd4c3e3910b
--- /dev/null
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
@@ -0,0 +1,22 @@
+--- ./c2hs/c/CAST.hs.orig 2012-11-12 00:26:43.000000000 +0100
++++ ./c2hs/c/CAST.hs 2013-05-28 11:02:33.000000000 +0200
+@@ -1125,6 +1125,9 @@
+ put_ bh (CTypedef ae) = do
+ putByte bh 4
+ put_ bh ae
++ put_ bh (CThread af) = do
++ putByte bh 5
++ put_ bh af
+ get bh = do
+ h <- getByte bh
+ case h of
+@@ -1143,6 +1146,9 @@
+ 4 -> do
+ ae <- get bh
+ return (CTypedef ae)
++ 5 -> do
++ af <- get bh
++ return (CThread af)
+
+ instance Binary CTypeQual where
+ put_ bh (CConstQual aa) = do
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 15a8a32565c9..6b77583cb681 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.11.0
-PORTREVISION= 1
+PORTVERSION= 2.13.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A documentation-generation tool for Haskell libraries
+COMMENT= Documentation-generation tool for Haskell libraries
LICENSE= BSD
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 08fc20d8c264..f74d8b063751 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.11.0.tar.gz) = 8dcd7c5cc9f3db7526a42297be4ee563820ade3d1a49e3d0e165569abcb14928
-SIZE (cabal/haddock-2.11.0.tar.gz) = 146824
+SHA256 (cabal/haddock-2.13.2.tar.gz) = 25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3
+SIZE (cabal/haddock-2.13.2.tar.gz) = 174973
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index fc6d431f2daf..f78d73416e96 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.18.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 45f72ef770d0..8af294189b7e 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.0.5
+PORTVERSION= 1.1.2.5
+PORTEPOCH= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= text>=0.11.0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index a28b27d99922..5a166ac6bda9 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.2.0.5.tar.gz) = 107b7b58aa9a2eee81c58bc00638b7c0a9db53e1b7b4de8388a4eb4592c8383b
-SIZE (cabal/hashable-1.2.0.5.tar.gz) = 21090
+SHA256 (cabal/hashable-1.1.2.5.tar.gz) = 3fb5d430c9289ebada4991a76fd78f028aaaf17957dc666ddc7b89c98a54713d
+SIZE (cabal/hashable-1.1.2.5.tar.gz) = 9129
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index ae861ed1c425..1601a9e43b78 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,7 @@ COMMENT= Hashed file storage support code
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_CABAL= dataenc mmap>=0.5 mtl zlib
+USE_CABAL= dataenc extensible-exceptions mmap>=0.5 mtl zlib
CONFIGURE_ARGS+= --flags="-test"
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index db96d0b49f76..b0d9bb3ae63d 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hashtables
PORTVERSION= 1.1.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Mutable hash tables in the ST monad
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hashable>=1.1 primitive vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index ba84c2507d6b..603f54385e14 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -3,6 +3,7 @@
PORTNAME= haskeline
PORTVERSION= 0.7.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= Command-line interface for user input, written in Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= transformers>=0.2
USES+= iconv
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index 4e87e0935b2e..51ba929e33eb 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haskell-platform
-PORTVERSION= 2012.4.0.0
-PORTREVISION= 2
+PORTVERSION= 2013.2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,36 +11,40 @@ LICENSE= BSD
METAPORT= yes
-USE_CABAL= async==2.0.1.3_1 \
- cgi==3001.1.7.4_6,1 \
- fgl==5.4.2.4_4 \
- GLUT==2.1.2.1_7,1 \
- haskell-src==1.0.1.5_3 \
- html==1.0.1.2_6 \
- HTTP==4000.2.5_1 \
- HUnit==1.2.5.1_1 \
- mtl==2.1.2_1 \
- network==2.3.1.0_1 \
- OpenGL==2.2.3.1_4,1 \
- parallel==3.2.0.3_1 \
- parsec==3.1.3_1 \
- primitive==0.5.0.1_1 \
- QuickCheck==2.5.1.1_1 \
- random==1.0.1.1_3 \
- regex-base==0.93.2_6 \
- regex-compat==0.95.1_4 \
- regex-posix==0.95.2_1 \
- split==0.2.1.1_1 \
- stm==2.4_1 \
- syb==0.3.7_1 \
- text==0.11.2.3_1 \
- transformers==0.3.0.0_3 \
- vector==0.10.0.1_1 \
- xhtml==3000.2.1_3 \
- zlib==0.5.4.0_1 \
- cabal-install==0.14.0_4 \
- alex==3.0.2_1 \
- happy==1.18.10_1
+USE_CABAL= async==2.0.1.4 \
+ attoparsec==0.10.4.0_1 \
+ cgi==3001.1.7.5,1 \
+ fgl==5.4.2.4_5 \
+ GLUT==2.4.0.0,1 \
+ GLURaw==1.3.0.0 \
+ haskell-src==1.0.1.5_4 \
+ hashable==1.1.2.5,1 \
+ html==1.0.1.2_7 \
+ HTTP==4000.2.8 \
+ HUnit==1.2.5.2 \
+ mtl==2.1.2_2 \
+ network==2.4.1.2 \
+ OpenGL==2.8.0.0,1 \
+ OpenGLRaw==1.3.0.0 \
+ parallel==3.2.0.3_2 \
+ parsec==3.1.3_2 \
+ primitive==0.5.0.1_2 \
+ QuickCheck==2.6 \
+ random==1.0.1.1_4 \
+ regex-base==0.93.2_7 \
+ regex-compat==0.95.1_5 \
+ regex-posix==0.95.2_2 \
+ split==0.2.2 \
+ stm==2.4.2 \
+ syb==0.4.0 \
+ text==0.11.3.1 \
+ transformers==0.3.0.0_4 \
+ vector==0.10.0.1_2 \
+ xhtml==3000.2.1_4 \
+ zlib==0.5.4.1 \
+ cabal-install==1.16.0.2 \
+ alex==3.0.5 \
+ happy==1.18.10_2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index baa2fc80f4e1..0d5d75b4f39e 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= haskell-src-exts
PORTVERSION= 1.13.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ COMMENT= Manipulating Haskell source
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cpphs>=1.3
USE_HAPPY= yes
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 9a18ee6fd903..f18b9ab7a0b3 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,7 +2,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Support for manipulating Haskell source code
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_HAPPY= yes
USE_CABAL= syb
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 6be6eded648f..9dc8174c0c53 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hasktags
PORTVERSION= 0.68.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Produces ctags "tags" and etags "TAGS" files for Haskell programs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
EXECUTABLE= hasktags
STANDALONE= yes
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index f97a0694b150..e6e22d67164c 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hastache
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell implementation of Mustache templates
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder ieee754 mtl syb text transformers utf8-string
INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${DATADIR}
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index e4f4869dad47..80ba31da5e55 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hdoc
PORTVERSION= 0.8.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MASTER_SITES= http://staff.fmi.uni-passau.de/~groessli/hdoc/
PKGNAMEPREFIX= hs-
diff --git a/devel/hs-hdoc/files/patch-Main.hs b/devel/hs-hdoc/files/patch-Main.hs
index bbddbb29a822..e241cb0e9044 100644
--- a/devel/hs-hdoc/files/patch-Main.hs
+++ b/devel/hs-hdoc/files/patch-Main.hs
@@ -1,11 +1,21 @@
--- ./Main.hs.orig 2004-05-18 00:27:27.000000000 +0200
-+++ ./Main.hs 2012-05-13 11:20:13.000000000 +0200
-@@ -5,7 +5,7 @@
++++ ./Main.hs 2013-04-30 23:59:28.000000000 +0200
+@@ -5,7 +5,8 @@
import List
import Maybe
import Monad
-import System
+import System.Environment
++import System.IO.Error
import GetOpt
import Parser
+@@ -338,7 +339,7 @@
+ case preProc of
+ Nothing -> return $ Left (NoPreprocessor file)
+ Just (msg, action) ->
+- do res <- try (readFile file)
++ do res <- tryIOError (readFile file)
+ case res of
+ Left _ -> return $ Left NotFound
+ Right cont -> return $ Right (action cont,msg)
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index be355d3f9d1c..4690b4ded378 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hinotify
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 849367da862d..2bcf0cfdb774 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hint
PORTVERSION= 0.3.3.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 45ade769e4ec..7ce5a2875c42 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index 0d2eb1385fe7..700bfabf776b 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.8.43
+PORTVERSION= 1.8.45
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Source code suggestions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cpphs>=1.11 haskell-src-exts>=1.11 hscolour>=1.17 \
transformers>=0.0 uniplate>=1.5
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 42c7c04d38df..a03691a115e8 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.8.43.tar.gz) = 664799ed88bc7fc07308288b87df689b9388ae5625cea163781103d33dd7ce71
-SIZE (cabal/hlint-1.8.43.tar.gz) = 68396
+SHA256 (cabal/hlint-1.8.45.tar.gz) = e9e7062347c6a8173fc26dcd3454c977262145b6b01a35c12fbfeb56e53a4792
+SIZE (cabal/hlint-1.8.45.tar.gz) = 68579
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 9b7b7808396f..a3d49da2338b 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -3,15 +3,13 @@
PORTNAME= hoogle
PORTVERSION= 4.2.16
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell API Search
LICENSE= BSD
-FILE_LICENSE= docs/LICENSE
-
-CABAL_SETUP= Setup.hs
USE_CABAL= blaze-builder>=0.2 case-insensitive>=0.2 cmdargs>=0.7 \
conduit>=0.2 haskell-src-exts>=1.12 http-types>=0.7 \
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 02cc924707de..15d6d29a67bf 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hslogger
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Versatile logging framework
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 354469465c29..415f262cf7b3 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.3.0.3
-PORTREVISION= 1
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index 9f5decfcbd9f..ed4cb198468b 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-expectations-0.3.0.3.tar.gz) = e4601065616f67ae345bee79bac883701a6f79772309c535a7a1e5c7aa5becde
-SIZE (cabal/hspec-expectations-0.3.0.3.tar.gz) = 3659
+SHA256 (cabal/hspec-expectations-0.3.2.tar.gz) = b11b2618749197a56c4ea3ea1d924a0de910d95fc92f560fe36032fc2ce5c224
+SIZE (cabal/hspec-expectations-0.3.2.tar.gz) = 3707
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index cf9d7697106e..2a34755fcd0c 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.4.4
+PORTVERSION= 1.5.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,8 @@ COMMENT= Behavior-Driven Development for Haskell
LICENSE= BSD
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
+ QuickCheck>=2.5.1 quickcheck-io random setenv \
+ transformers>=0.2.2.0
EXECUTABLE= hspec-discover
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 174b72a38d5f..db1676476ab8 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.4.4.tar.gz) = b948d7115d4f892a2b56ddd2b87ab1166f6d91bcdfe66899dc43dd8f69db9927
-SIZE (cabal/hspec-1.4.4.tar.gz) = 26269
+SHA256 (cabal/hspec-1.5.4.tar.gz) = 8dce8de068eb84eec2bf72de37f6727a2dfddd85f2289d969e07038885ac87a1
+SIZE (cabal/hspec-1.5.4.tar.gz) = 30050
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index bea92f8910ba..6b0156a02da5 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -3,16 +3,15 @@
PORTNAME= idoc
PORTVERSION= 0.2.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/idoc/
PKGNAMEPREFIX= hs-
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A No Frills Haskell Interface Documentation System
+COMMENT= No Frills Haskell Interface Documentation System
LICENSE= GPLv2
-FILE_LICENSE= COPYING
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp \
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index 0fa79c1acdeb..7a1caf822d91 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -2,16 +2,14 @@
PORTNAME= kqueue
PORTVERSION= 0.1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A binding to the kqueue event library
+COMMENT= Binding to the kqueue event library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl>=1.1
USE_C2HS= yes
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 40b93dac775d..f0067a689cb2 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -2,7 +2,7 @@
PORTNAME= language-c
PORTVERSION= 0.3.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Analysis and generation of C code in Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_ALEX= yes
USE_HAPPY= yes
USE_CABAL= syb
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 0c3db887b337..426ebb13f63f 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -2,7 +2,7 @@
PORTNAME= language-javascript
PORTVERSION= 0.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Parser for JavaScript
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 mtl>=1.1 utf8-light>=0.4 utf8-string>=0.3.7
USE_HAPPY= yes
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index eb85ab0358d9..c5e3ad18b2a7 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= largeword
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= Provides a way of producing other large words
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index 0d0b7edf2a09..702a4106843c 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/largeword-1.0.4.tar.gz) = 858a257890c698eaad065c6eced696be83b9e8288c1b081d6c7debbad6fad9a6
-SIZE (cabal/largeword-1.0.4.tar.gz) = 3023
+SHA256 (cabal/largeword-1.0.5.tar.gz) = b42164506e521be1d296055086f109a62bc5c3e71b46751d06ada7622fc79c45
+SIZE (cabal/largeword-1.0.5.tar.gz) = 3069
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index df81fb488e9d..9b7b44c605a6 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,16 +2,14 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for demand-driven testing of Haskell programs
+COMMENT= Library for demand-driven testing of Haskell programs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index 967b84ff4756..971e41156f21 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 3.8.7.3
+PORTVERSION= 3.9.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,12 +11,12 @@ LICENSE= BSD
USE_CABAL= bifunctors>=3 comonad>=3 comonad-transformers>=3 \
comonads-fd>=3 contravariant>=0.2.0.2 distributive>=0.3 \
- generic-deriving hashable>=1.1.2.3 MonadCatchIO-transformers>=0.3 \
- mtl>=2.0.1 parallel>=3.1.0.1 profunctor-extras>=3.3 \
- profunctors>=3.2 reflection>=1.1.6 semigroupoids>=3 \
- semigroups>=0.8.4 split tagged>=0.4.4 text>=0.11 \
- transformers>=0.3 unordered-containers>=0.2 vector>=0.9 \
- void>=0.5
+ generic-deriving hashable>=1.1.2.3 \
+ MonadCatchIO-transformers>=0.3 mtl>=2.0.1 parallel>=3.1.0.1 \
+ profunctor-extras>=3.3 profunctors>=3.2 reflection>=1.1.6 \
+ semigroupoids>=3 semigroups>=0.8.4 split tagged>=0.4.4 \
+ text>=0.11 transformers>=0.3 unordered-containers>=0.2 \
+ vector>=0.9 void>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 663d5d2c07c9..1955fae9f9f2 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lens-3.8.7.3.tar.gz) = 0948c0b8a4dec7cdce6935b84f20951fe07236a43bac3b9afee27d33c7de487c
-SIZE (cabal/lens-3.8.7.3.tar.gz) = 196610
+SHA256 (cabal/lens-3.9.0.2.tar.gz) = 825e75c46d986d47dafd7cc17f596c312283f9521ccbc3aafcbebd3fc6470332
+SIZE (cabal/lens-3.9.0.2.tar.gz) = 454635
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index f7c37623092e..1fc86e61a6a1 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.0.2
+PORTVERSION= 0.2.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Lifted IO operations from the base library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= base-unicode-symbols>=0.1.1 monad-control>=0.3 \
transformers-base>=0.4
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index 6f6ff813ed05..5fe6d35689c6 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.2.0.2.tar.gz) = bddda22f43595566b51942fd536e98ca8d62e8696bbf703a27b04c20b3babfa7
-SIZE (cabal/lifted-base-0.2.0.2.tar.gz) = 11702
+SHA256 (cabal/lifted-base-0.2.0.5.tar.gz) = 799c126a04588cf6a3fa20ba250fac20087f474c05e675fd62eceb303ee5c7aa
+SIZE (cabal/lifted-base-0.2.0.5.tar.gz) = 11697
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 3765baad6b1b..d95f75dd8198 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,6 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index 7907273763d7..1e2ef20fb09c 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Memory-mapped files for POSIX and Windows
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
new file mode 100644
index 000000000000..46605f9ca5f1
--- /dev/null
+++ b/devel/hs-mmorph/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= mmorph
+PORTVERSION= 1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Monad morphisms
+
+LICENSE= BSD
+
+USE_CABAL= transformers>=0.2.0.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
new file mode 100644
index 000000000000..dd4fe0a9734d
--- /dev/null
+++ b/devel/hs-mmorph/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/mmorph-1.0.0.tar.gz) = 13c369262821a86915ee18598567474e1489b49f19f9be8335252b6359762883
+SIZE (cabal/mmorph-1.0.0.tar.gz) = 4989
diff --git a/devel/hs-mmorph/pkg-descr b/devel/hs-mmorph/pkg-descr
new file mode 100644
index 000000000000..84e194b925e9
--- /dev/null
+++ b/devel/hs-mmorph/pkg-descr
@@ -0,0 +1,4 @@
+This library provides monad morphism utilities, most commonly used for
+manipulating monad transformer stacks.
+
+WWW: http://hackage.haskell.org/package/mmorph
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 337b1a6b9f14..e9caa4a39cf6 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 0.3.1.4
-PORTREVISION= 1
+PORTVERSION= 0.3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,6 @@ COMMENT= Lift control operations through monad transformers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= base-unicode-symbols>=0.1.1 transformers>=0.2 \
transformers-base>=0.4.1
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index f167072351b7..74f82f27e983 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-control-0.3.1.4.tar.gz) = c17fd5fa094044816ab79158a00fa7a9fd8b35dfea27e1eecc4d4049b3916c57
-SIZE (cabal/monad-control-0.3.1.4.tar.gz) = 10338
+SHA256 (cabal/monad-control-0.3.2.1.tar.gz) = 4395df5ea2b9278a96d7c8e93c81202b9441ba5fcfbd03b90c7d4ea1c66b8e9f
+SIZE (cabal/monad-control-0.3.2.1.tar.gz) = 10685
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index f44f7223fb84..c0b1a601bb78 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.0.1
+PORTVERSION= 0.3.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A class of monads which can log messages
+COMMENT= Class of monads which can log messages
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= conduit>=1.0 fast-logger>=0.2 monad-control mtl \
resourcet>=0.4 text transformers transformers-base
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 92bbe5f763ea..fb42586c205e 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.3.0.1.tar.gz) = 59975cca315c3399cf383e219ab71ab47bea96e151fdcd99101617273463fc16
-SIZE (cabal/monad-logger-0.3.0.1.tar.gz) = 4619
+SHA256 (cabal/monad-logger-0.3.1.1.tar.gz) = a66f3b938aaa4ae07849cef5df27e17056d0708a6be6e36fa94e36cfa8ab1887
+SIZE (cabal/monad-logger-0.3.1.1.tar.gz) = 4648
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index f340c073cfbe..2fb1914caa64 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Combinators and extra features for Par monads
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= abstract-par>=0.3 cereal>=0.3 mtl>=2.0 random>=1.0 \
transformers>=0.2
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index c0b1ff422400..48016fc30f79 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.1
+PORTVERSION= 0.3.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Library for parallel programming based on a monad
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= abstract-deque>=0.1.4 abstract-par monad-par-extras \
mtl>=2.0.1.0 mwc-random>=0.11 parallel>=3.1
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index 43aec1f70f12..d48429672577 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-0.3.4.1.tar.gz) = a8727ee5523699fbc90b86657e2123b69e8a166d402c26eaabfb27b27fb70f6c
-SIZE (cabal/monad-par-0.3.4.1.tar.gz) = 27821
+SHA256 (cabal/monad-par-0.3.4.2.tar.gz) = 7a1dd6fb1359c41bf5a2865c19ad2a8f87c1344ad1b3ada1d257a42738a920cc
+SIZE (cabal/monad-par-0.3.4.2.tar.gz) = 28843
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index 77304fc10cd5..377a6f404138 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Monad classes, using functional dependencies
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= transformers>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 54f9e212070a..766a8540d75c 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mueval
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +11,11 @@ COMMENT= Safely evaluate pure Haskell expressions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hint>=0.3.1 mtl>2 show>=0.3 simple-reflect utf8-string
EXECUTABLE= mueval mueval-core
+CONFIGURE_ARGS+= --ghc-options="-dynamic"
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 466778dcb5e5..4e5d15f665f7 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= murmur-hash
PORTVERSION= 0.1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= MurmurHash2 implementation for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index c7390385352d..ae2dda1eae66 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -2,6 +2,7 @@
PORTNAME= optparse-applicative
PORTVERSION= 0.5.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Utilities and combinators for parsing command line options
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 41b84b333053..38ea74e2396a 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= parallel
PORTVERSION= 3.2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Parallel programming library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index fc31326357b2..a47c209ee969 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -2,11 +2,11 @@
PORTNAME= pcre-light
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A lightweight Haskell regex library compatible with Perl 5
+COMMENT= Lightweight Haskell regex library compatible with Perl 5
LICENSE= BSD
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
index 9a76486a43ea..04533b7b52f1 100644
--- a/devel/hs-pool-conduit/Makefile
+++ b/devel/hs-pool-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pool-conduit
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Resource pool allocations via ResourceT
LICENSE= MIT
-USE_CABAL= resource-pool>=0.2.1 resourcet>=0.3 transformers>=0.2.1
+USE_CABAL= monad-control resource-pool>=0.2.1 resourcet>=0.3 \
+ transformers>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-pool-conduit/distinfo b/devel/hs-pool-conduit/distinfo
index 4bcdb0571500..cd4a75aba276 100644
--- a/devel/hs-pool-conduit/distinfo
+++ b/devel/hs-pool-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pool-conduit-0.1.1.tar.gz) = e1b1f19266386979c6f9fd940277151295e3af11835ed8a70425e5c5f90352bd
-SIZE (cabal/pool-conduit-0.1.1.tar.gz) = 2151
+SHA256 (cabal/pool-conduit-0.1.2.tar.gz) = 68e7c1c510e58116fe3afafd4a1fe50b139f58d838e41c8ba2a4a57951c09b82
+SIZE (cabal/pool-conduit-0.1.2.tar.gz) = 2586
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 7f4e846191b0..d1f219eabcfb 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -2,7 +2,7 @@
PORTNAME= primitive
PORTVERSION= 0.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Primitive memory-related operations
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-profunctor-extras/Makefile b/devel/hs-profunctor-extras/Makefile
index c07e8326f31b..5ec4d6994f78 100644
--- a/devel/hs-profunctor-extras/Makefile
+++ b/devel/hs-profunctor-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= profunctor-extras
PORTVERSION= 3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 5db8119120e9..9edd767949f1 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 3.3
+PORTVERSION= 3.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index e42747366ed2..8b4c11adacf8 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/profunctors-3.3.tar.gz) = 523e9e0b2eb0f7560b4596cf283cae2ce128d58ac247c871a5c0799131c86a33
-SIZE (cabal/profunctors-3.3.tar.gz) = 6472
+SHA256 (cabal/profunctors-3.3.0.1.tar.gz) = 0216dec6bd529b3108fdbb653df535ba4b9dcf5fa4c4c76aad9ae424d2eba799
+SIZE (cabal/profunctors-3.3.0.1.tar.gz) = 6480
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index 4a17fd11f201..ce859568b425 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -2,6 +2,7 @@
PORTNAME= project-template
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Specify Haskell project templates and generate files
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
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-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
new file mode 100644
index 000000000000..8d8eaa1d79a4
--- /dev/null
+++ b/devel/hs-quickcheck-io/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= quickcheck-io
+PORTVERSION= 0.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Use HUnit assertions as QuickCheck properties
+
+LICENSE= MIT
+
+USE_CABAL= HUnit>=1.2.5 QuickCheck>=2.5.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-quickcheck-io/distinfo b/devel/hs-quickcheck-io/distinfo
new file mode 100644
index 000000000000..d49d9ea6124b
--- /dev/null
+++ b/devel/hs-quickcheck-io/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/quickcheck-io-0.1.0.tar.gz) = 5a32c4bf8266010db2874d101b6af471af2e41d602c34ebd768c867bd8d1ed98
+SIZE (cabal/quickcheck-io-0.1.0.tar.gz) = 1604
diff --git a/devel/hs-quickcheck-io/pkg-descr b/devel/hs-quickcheck-io/pkg-descr
new file mode 100644
index 000000000000..28bff87162de
--- /dev/null
+++ b/devel/hs-quickcheck-io/pkg-descr
@@ -0,0 +1,4 @@
+This package provides an orphan instance that allows you to use HUnit
+assertions as QuickCheck properties.
+
+WWW: http://hackage.haskell.org/package/quickcheck-io
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index c91efd55d331..5b8d9baad5b2 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= random
PORTVERSION= 1.0.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Random number library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile
index 8037de79ab11..a9b5179426e1 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-ranges/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ranges
PORTVERSION= 0.2.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Ranges and various functions on them
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 72b921b9a9b7..b909ae1357ec 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -3,17 +3,17 @@
PORTNAME= reactive
PORTVERSION= 0.11.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Push-pull functional reactive programming
-FILE_LICENSE= COPYING
-
USE_CABAL= categories checkers>=0.2.3 comonad QuickCheck>=2.1.0.2 pointed \
semigroups Stream>=0.3.1 TypeCompose>=0.8.0 unamb>=0.1.5 \
vector-space>=0.5
+BROKEN= does not build with GHC 7.6
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index a5546c0b1ec6..20fab78f2618 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,6 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +11,5 @@ COMMENT= Interface to the GNU readline library
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index 712c5ba2b25f..31ce8d484399 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 1.1.7
+PORTVERSION= 1.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 2dd563537fca..68032108a4ec 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/reflection-1.1.7.tar.gz) = 9fd0eee6635e6cf8923974c6edca66b3039c991557868b9db6076e97804f7b1c
-SIZE (cabal/reflection-1.1.7.tar.gz) = 6672
+SHA256 (cabal/reflection-1.3.2.tar.gz) = a69fa05f8a8faff42dbfbfe0b7847beebd91a092609e29b10282c35df7f3ad4a
+SIZE (cabal/reflection-1.3.2.tar.gz) = 8530
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index de21c8974643..e50ce1bfff2b 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -2,11 +2,11 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A high-performance striped resource pooling implementation
+COMMENT= High-performance striped resource pooling implementation
LICENSE= BSD
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index 33afb905f3b9..e7c7119d6717 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 0.4.5
+PORTVERSION= 0.4.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Deterministic allocation and freeing of scarce resources
LICENSE= BSD
-USE_CABAL= lifted-base>=0.1 monad-control>=0.3.1 mtl>=2.0 \
+USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 mtl>=2.0 \
transformers>=0.2.2 transformers-base>=0.4.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index acc9f0d541e8..21ee65207b16 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-0.4.5.tar.gz) = d1beb54a909d57d133f86bfb27d50361411e9e442e85619d889fb698890756c4
-SIZE (cabal/resourcet-0.4.5.tar.gz) = 8686
+SHA256 (cabal/resourcet-0.4.7.1.tar.gz) = f02bb18c79d99152a241a65bbb0cd509d0bf9fba4fbb63b72360f7aa8a9336f5
+SIZE (cabal/resourcet-0.4.7.1.tar.gz) = 9251
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index f2f68082c518..2d258bd9f806 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -3,15 +3,13 @@
PORTNAME= safe
PORTVERSION= 0.3.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for safe (pattern match free) functions
+COMMENT= Library for safe (pattern match free) functions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index 14258b6dfc84..ed0fcb5b8c09 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,11 +2,11 @@
PORTNAME= setenv
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A cross-platform library for setting environment variables
+COMMENT= Cross-platform library for setting environment variables
LICENSE= MIT
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 4418514db597..6d0096f48be6 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= show
-PORTVERSION= 0.5
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +10,7 @@ COMMENT= 'Show' instances for Lambdabot
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= QuickCheck>=2.4 random simple-reflect smallcheck>=1.0 \
- syb
+USE_CABAL= 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 b44569a04fd3..56a76cb12b4f 100644
--- a/devel/hs-show/distinfo
+++ b/devel/hs-show/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/show-0.5.tar.gz) = 8e50d61f702f339bff5f606f67d1d381a1825e8ef49993531965a4c016e436e9
-SIZE (cabal/show-0.5.tar.gz) = 8818
+SHA256 (cabal/show-0.6.tar.gz) = 4f57a947a538d021406f649049dde27d4d8d0b44aac3ba38fa64806c9d737b95
+SIZE (cabal/show-0.6.tar.gz) = 7635
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index d7a0b34d9bb0..3eac573009eb 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,6 +2,7 @@
PORTNAME= silently
PORTVERSION= 1.2.4.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index ff163bc48df0..32884de4e50c 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,6 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Simple reflection of expressions containing variables
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 329dad07657a..dedd2dfb763a 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,6 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= Property-based testing library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= logict mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index 3feefff2edc0..9ef6fdef8742 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= split
-PORTVERSION= 0.2.1.1
-PORTREVISION= 1
+PORTVERSION= 0.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index ef10b9e027ac..c58d4bbf48ef 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/split-0.2.1.1.tar.gz) = bf36c149a6613fc6be78ec170ae98a696aae887b82434a1439da10e47823f7ff
-SIZE (cabal/split-0.2.1.1.tar.gz) = 14046
+SHA256 (cabal/split-0.2.2.tar.gz) = f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375
+SIZE (cabal/split-0.2.2.tar.gz) = 14666
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index e95ebce3a7e2..2dc33f87fb96 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= stm
-PORTVERSION= 2.4
-PORTREVISION= 1
+PORTVERSION= 2.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Software Transactional Memory
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 5d40dd0143a3..6216a1482c46 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-2.4.tar.gz) = d495f0c70a958e749cb6fe51db57ba358312066c5c498cce5516db2de0f7d48d
-SIZE (cabal/stm-2.4.tar.gz) = 9043
+SHA256 (cabal/stm-2.4.2.tar.gz) = c8ee3cd64c266133902619cfff2d04e5f66206f91dbce8dd1182037fbe4858db
+SIZE (cabal/stm-2.4.2.tar.gz) = 9635
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index d9bbdd688048..db89de575414 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index 99424927dfbb..91fbc3c16636 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Scrap Your Boilerplate With Class Text instance
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= syb-with-class text>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index dc9dab90f14a..13b76407cc44 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb-with-class
PORTVERSION= 0.6.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Scrap Your Boilerplate With Class
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 3169f2c038ec..f18b2fe7596e 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Scrap Your Boilerplate
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index 4913058e8d68..2d7a62264f43 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-0.3.7.tar.gz) = 59f4058a8182a472c0e0e35f8aca836470a5785d3dcd01e3d44bb188c850da73
-SIZE (cabal/syb-0.3.7.tar.gz) = 39091
+SHA256 (cabal/syb-0.4.0.tar.gz) = f201089aa7e74b6cbca7fc73a259596b2a9628e31a9b54e801844ad68447bff3
+SIZE (cabal/syb-0.4.0.tar.gz) = 71729
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index f3ab25d1155a..4f7e70221e5a 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -2,15 +2,13 @@
PORTNAME= system-fileio
PORTVERSION= 0.3.11
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Consistent filesystem interaction across GHC versions
LICENSE= MIT
-FILE_LICENSE= license.txt
-
-CABAL_SETUP= Setup.hs
USE_CABAL= system-filepath>=0.3.1 text>=0.7.1
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index b2da79163fe4..cbdfda6ac5c3 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -2,16 +2,13 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= High-level, byte-based file and directory path manipulations
LICENSE= MIT
-FILE_LICENSE= license.txt
-
-CABAL_SETUP= Setup.hs
USE_CABAL= text>=0.7.1
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 9663f8bb7bee..20e39f1998d2 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index cec3d0890bef..49a95d2536f3 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagged-0.4.4.tar.gz) = 1d0178cbaf9922e70f17116bcef779baee2f6ded90ab2448d7e4fb3b0646882d
-SIZE (cabal/tagged-0.4.4.tar.gz) = 4970
+SHA256 (cabal/tagged-0.6.tar.gz) = 55a2c61efc446616eba3d4c0359975378da96a1b85523159f1e400eda9e95a70
+SIZE (cabal/tagged-0.6.tar.gz) = 5177
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index 851fb831281c..2a1712f7e542 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,7 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
index 1c7744778961..f41e3d4189df 100644
--- a/devel/hs-terminfo/Makefile
+++ b/devel/hs-terminfo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= terminfo
PORTVERSION= 0.3.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 012d1070f38d..559ac761ead5 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 76e2af41004c..466d40d75b55 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
new file mode 100644
index 000000000000..94ba9ad07098
--- /dev/null
+++ b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
@@ -0,0 +1,11 @@
+--- ./test-framework-quickcheck2.cabal.orig 2012-12-06 17:59:40.000000000 +0100
++++ ./test-framework-quickcheck2.cabal 2013-05-03 21:35:58.000000000 +0200
+@@ -22,7 +22,7 @@
+ Library
+ Exposed-Modules: Test.Framework.Providers.QuickCheck2
+
+- Build-Depends: test-framework >= 0.7.1, QuickCheck >= 2.4 && < 2.6, extensible-exceptions >= 0.1.1 && < 0.2.0
++ Build-Depends: test-framework >= 0.7.1, QuickCheck >= 2.4 && < 2.7, extensible-exceptions >= 0.1.1 && < 0.2.0
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4, random >= 1
+ else
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 4043c672f39e..050b16944752 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,9 @@ COMMENT= Framework for running and organising tests, with HUnit and QuickCheck s
LICENSE= BSD
-USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 hostname>=1.0 \
- random>=1.0 regex-posix>=0.72 xml>=1.3.5
+USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 \
+ extensible-exceptions>=0.1.1 hostname>=1.0 random>=1.0 \
+ regex-posix>=0.72 xml>=1.3.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index 8457e7319b3c..e83fa58c96cf 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -3,15 +3,13 @@
PORTNAME= testpack
PORTVERSION= 2.1.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Test Utility Pack for HUnit and QuickCheck
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
index 3bb1c4fa0204..c0bab41941e2 100644
--- a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
+++ b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
@@ -1,6 +1,18 @@
---- ./src/Test/HUnit/Tools.hs.orig 2012-02-28 23:20:32.000000000 +0100
-+++ ./src/Test/HUnit/Tools.hs 2012-10-04 00:04:08.000000000 +0200
-@@ -128,7 +128,11 @@
+--- ./src/Test/HUnit/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
++++ ./src/Test/HUnit/Tools.hs 2013-05-04 00:47:19.298796917 +0200
+@@ -22,7 +22,11 @@
+ import Test.QuickCheck.Gen
+ import Test.QuickCheck.State
+ import qualified Test.QuickCheck.Property as P
++#if MIN_VERSION_QuickCheck(2,6,0)
++import Test.QuickCheck.Property hiding (Result(reason), interrupted)
++#else
+ import Test.QuickCheck.Property hiding (Result(reason))
++#endif
+ import qualified Control.Exception
+ import qualified Test.HUnit as HU
+ import System.Random
+@@ -128,7 +132,11 @@
> q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
-}
qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
@@ -12,7 +24,23 @@
{- | Run verbose tests. Example:
-@@ -174,7 +178,11 @@
+@@ -163,18 +171,26 @@
+ -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
+ localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
+ localquickCheckWithResult args p =
+- do
++#if MIN_VERSION_QuickCheck(2,6,0)
++ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
++#else
++ do
+ #if MIN_VERSION_QuickCheck(2,3,0)
+ tm <- if chatty args then newStdioTerminal else newNullTerminal
+ #else
+ tm <- newTerminal
+ #endif
++#endif
+ rnd <- case replay args of
+ Nothing -> newStdGen
Just (rnd,_) -> return rnd
test MkState{ terminal = tm
, maxSuccessTests = maxSuccess args
@@ -24,3 +52,23 @@
, computeSize = case replay args of
Nothing -> \n d -> (n * maxSize args)
`div` maxSuccess args
+@@ -190,6 +206,10 @@
+ #endif
+ , numSuccessShrinks = 0
+ , numTryShrinks = 0
++#if MIN_VERSION_QuickCheck(2,6,0)
++ , numRecentlyDiscardedTests = 0
++ , numTotTryShrinks = 0
++#endif
+ } (unGen (property p))
+ where
+ --------------------------------------------------------------------------
+@@ -288,5 +308,8 @@
+ , numShrinks = numShrinks
+ , output = theOutput
+ #endif
++#if MIN_VERSION_QuickCheck(2,6,0)
++ , interrupted = False
++#endif
+ }
+ where (rnd1,rnd2) = split (randomSeed st)
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
new file mode 100644
index 000000000000..446d7dfc5e98
--- /dev/null
+++ b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
@@ -0,0 +1,22 @@
+--- ./src/Test/QuickCheck/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
++++ ./src/Test/QuickCheck/Tools.hs 2013-05-04 00:42:02.274698941 +0200
+@@ -23,14 +23,18 @@
+
+ )
+ where
++#if MIN_VERSION_QuickCheck(2,6,0)
++import Test.QuickCheck hiding (Result, reason, interrupted)
++#else
+ import Test.QuickCheck hiding (Result, reason)
++#endif
+ import Test.QuickCheck.Property
+
+ {- | Compare two values. If same, the test passes. If different, the result indicates
+ what was expected and what was received as part of the error. -}
+ (@=?) :: (Eq a, Show a) => a -> a -> Result
+ expected @=? actual =
+- MkResult {ok = Just (expected == actual),
++ result { ok = Just (expected == actual),
+ expect = True, interrupted = False,
+ reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
+ stamp = [], callbacks = []}
diff --git a/devel/hs-testpack/files/patch-testpack.cabal b/devel/hs-testpack/files/patch-testpack.cabal
index f349491c00c9..ad3736aabe80 100644
--- a/devel/hs-testpack/files/patch-testpack.cabal
+++ b/devel/hs-testpack/files/patch-testpack.cabal
@@ -1,11 +1,11 @@
--- ./testpack.cabal.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./testpack.cabal 2013-03-09 17:54:39.000000000 +0100
++++ ./testpack.cabal 2013-05-04 00:08:00.417315359 +0200
@@ -39,7 +39,7 @@
Build-Depends: base >= 3 && < 5,
mtl, HUnit,
- QuickCheck >= 2.1.0.3 && < 2.5
-+ QuickCheck >= 2.1.0.3 && < 2.6
++ QuickCheck >= 2.1.0.3 && < 2.7
If flag(splitBase)
Build-Depends: base >= 3 && < 5, containers, random
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 2822db17d83d..15022ef3fc82 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 0.11.2.3
-PORTREVISION= 1
+PORTVERSION= 0.11.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An efficient packed Unicode text type
+COMMENT= Efficient packed Unicode text type
LICENSE= BSD
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 08fbe3e28417..f04ba0558d2b 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-0.11.2.3.tar.gz) = 352737b045a42635f1017473179297ab562d53513ab3a4b965f38514171e344b
-SIZE (cabal/text-0.11.2.3.tar.gz) = 122938
+SHA256 (cabal/text-0.11.3.1.tar.gz) = 76aad4a647cad7099b5a693eb9a4bc5263f7751392d8d1f87b14c78e2069559f
+SIZE (cabal/text-0.11.3.1.tar.gz) = 126477
diff --git a/devel/hs-text/pkg-descr b/devel/hs-text/pkg-descr
index af75c8704634..a910cc70fda6 100644
--- a/devel/hs-text/pkg-descr
+++ b/devel/hs-text/pkg-descr
@@ -1,4 +1,16 @@
-An efficient packed, immutable Unicode text type (both strict and lazy), with a
-powerful loop fusion optimization framework.
+An efficient packed, immutable Unicode text type (both strict and lazy),
+with a powerful loop fusion optimization framework.
+
+The Text type represents Unicode character strings, in a time and
+space-efficient manner. This package provides text processing
+capabilities that are optimized for performance critical use, both in
+terms of large data quantities and high speed.
+
+The Text type provides character-encoding, type-safe case conversion via
+whole-string case conversion functions. It also provides a range of
+functions for converting Text values to and from ByteStrings, using
+several standard encodings.
+
+Efficient locale-sensitive support for text IO is also supported.
WWW: https://github.com/bos/text
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index 3f7039ff9e79..bb46eb383cef 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -2,6 +2,7 @@
PORTNAME= threads
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Fork threads and wait for their result
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= base-unicode-symbols>=0.1.1 stm>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 8cd19bc0851c..02a3b31183a9 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -2,16 +2,14 @@
PORTNAME= threadscope
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A graphical tool for profiling parallel Haskell programs
+COMMENT= Graphical tool for profiling parallel Haskell programs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
pango
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index c2daea5b41bf..f1eed5c2f4e3 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Compatibility with old-time for the time package
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 93b4df6ad0ed..364747584d04 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -2,6 +2,7 @@
PORTNAME= timezone-olson
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +10,7 @@ COMMENT= Pure Haskell parser and renderer for binary Olson timezone files
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= timezone-series>=0.1.0
+USE_CABAL= extensible-exceptions>=0.1.0 timezone-series>=0.1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index 7ddd44600e81..0576f6981ed1 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -2,6 +2,7 @@
PORTNAME= timezone-series
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Enhanced timezone handling for Data.Time
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index b6806522836e..bc7b2c4a56b5 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Lift computations from the bottom of a transformer stack
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index 2d295f282c9c..ffcfb4ca0094 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -3,7 +3,7 @@
PORTNAME= transformers
PORTVERSION= 0.3.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Concrete functor monad transformers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index b8501ed23805..a85728f7c654 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index e44ea73adea1..fbbf088a6043 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ COMMENT= Help writing simple, concise, and fast generic operations
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hashable>=1.1.2.3 syb unordered-containers>=0.2.1
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${DATADIR}
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index 8aeb74fd09e9..215c46adafe7 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.0
+PORTVERSION= 0.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index af0fc77fca94..bc749da70368 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.4.1.0.tar.gz) = f1cbbf9234baa1d385c3f4fb3f1bd06f97b5ff0e5d5a329977eb8b64de1fb594
-SIZE (cabal/unix-compat-0.4.1.0.tar.gz) = 13013
+SHA256 (cabal/unix-compat-0.4.1.1.tar.gz) = ee45e5bf7e961b2f7fcc3ade90ac9db3a0a66857534e53da918d17c5bef156b2
+SIZE (cabal/unix-compat-0.4.1.1.tar.gz) = 13013
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index ddf677790668..e67fc4cea278 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.1.5
+PORTVERSION= 0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= Unix time parser/formatter and utilities
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index 907aa0a2a275..5bb9d3a8c67e 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-time-0.1.5.tar.gz) = 8f430221439647f1093d5c7e83dd880bfe1ce1de488a10f4aaa164a867d1b38f
-SIZE (cabal/unix-time-0.1.5.tar.gz) = 34977
+SHA256 (cabal/unix-time-0.1.8.tar.gz) = 5b17e5e88590e97478f8f12b168a5f917a2514c00328ff890bd51e0a491439e9
+SIZE (cabal/unix-time-0.1.8.tar.gz) = 35023
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index d48b6c62ac5f..80f46c0c2220 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.3.0
+PORTVERSION= 0.2.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Efficient hashing-based container types
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hashable>=1.0.1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index d950e9daf7dc..eff58f04bf50 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.3.0.tar.gz) = edb6a442ef9fcf4ce59f66871d51df5c012345fce95970127e75b62e5396efef
-SIZE (cabal/unordered-containers-0.2.3.0.tar.gz) = 25362
+SHA256 (cabal/unordered-containers-0.2.3.1.tar.gz) = a8d3bc3fad487fb6ef9f0082333cac3d4acf15cb5817ba4ff562a52c882f9f83
+SIZE (cabal/unordered-containers-0.2.3.1.tar.gz) = 25537
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index 1538f34fb6fb..61081bbef4cb 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 28b021f9c77c..a23ef72c36fe 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-string
PORTVERSION= 0.3.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index c208f7f56978..a522ffd25f85 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= utility-ht
-PORTVERSION= 0.0.8
-PORTREVISION= 3
+PORTVERSION= 0.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/distinfo b/devel/hs-utility-ht/distinfo
index 3a0310719e36..8fccd32fb81d 100644
--- a/devel/hs-utility-ht/distinfo
+++ b/devel/hs-utility-ht/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utility-ht-0.0.8.tar.gz) = a8f9bf74d50a04f9138e9b61749560e3d1965a42d30bbae785c5a85e640f550b
-SIZE (cabal/utility-ht-0.0.8.tar.gz) = 18881
+SHA256 (cabal/utility-ht-0.0.9.tar.gz) = 19696de8e1130783578b3af82390a12a2bac6a64c485cb35004d86e27897b5d4
+SIZE (cabal/utility-ht-0.0.9.tar.gz) = 19399
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index c3edb5f0749f..511ac9071b9c 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= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Attribute Grammar System of Universiteit Utrecht
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uulib>=0.9.14
EXECUTABLE= uuagc-bootstrap
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 8cca701ffa8f..7d0752849b88 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Cabal plugin for the Universiteit Utrecht Attribute Grammar System
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl>=2.0.1.0 uulib>=0.9.14
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index e28d4f5dd5d8..91ad0fc91243 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uuagc
-PORTVERSION= 0.9.42.2
-PORTREVISION= 3
+PORTVERSION= 0.9.42.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,6 @@ COMMENT= Attribute Grammar System of Universiteit Utrecht
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
uulib>=0.9.14
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 0e7f4d5378dd..b5399e75f4f5 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-0.9.42.2.tar.gz) = d645e99c510823bd21ca49ec91a4e321ba1eb2c324e6c2e34b077456e31bfcd0
-SIZE (cabal/uuagc-0.9.42.2.tar.gz) = 599995
+SHA256 (cabal/uuagc-0.9.42.3.tar.gz) = 76143fc616d86dc1d6aefae67da56b4c3b607cd126483ee054648bc718e6c066
+SIZE (cabal/uuagc-0.9.42.3.tar.gz) = 614198
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 462bcb96bcba..b1a8b7c6badb 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.2.9
+PORTVERSION= 1.2.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
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"
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index d7c0b8dba9e2..35d25c3feb59 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuid-1.2.9.tar.gz) = 515377e2fa68b70b9a6a1fbd87259f51a28bd4a8ab3516c93921f1201c5c1c21
-SIZE (cabal/uuid-1.2.9.tar.gz) = 13527
+SHA256 (cabal/uuid-1.2.13.tar.gz) = 1af05fce9c2e3b2c6074f38e3dedf43abea9cf788270fab2df75a98d63383979
+SIZE (cabal/uuid-1.2.13.tar.gz) = 13570
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 0ef1b55b2651..b939d697073b 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -3,15 +3,13 @@
PORTNAME= uulib
PORTVERSION= 0.9.15
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell Utrecht Tools Library
LICENSE= BSD
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 0b677e4b7baa..b03dd8c979da 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -2,15 +2,14 @@
PORTNAME= vault
PORTVERSION= 0.2.0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A persistent store for values of arbitrary types
+COMMENT= Persistent store for values of arbitrary types
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hashable>=1.1 unordered-containers>=0.2.1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 373542c04f6f..230395930784 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.5.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 973a064cc343..f8e43d678881 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector
PORTVERSION= 0.10.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Efficient Arrays
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= primitive>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 9e71069fc06a..a6a3b96c7ba8 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.5.11
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Haskell 98 logically uninhabited data type
LICENSE= BSD
-USE_CABAL= semigroups>=0.8.2
+USE_CABAL= hashable>=1.1 semigroups>=0.8.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index 1871b547c8e5..12e929b98af5 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.5.11.tar.gz) = 660f593e5fae6f32e309c946ae7c7a63837b4c6bb03f3676f99381072d63283a
-SIZE (cabal/void-0.5.11.tar.gz) = 2521
+SHA256 (cabal/void-0.6.tar.gz) = 3668a66ec838465c78b1fe4c6fff0080aeed5b232e4854894a4d5c868f922d3c
+SIZE (cabal/void-0.6.tar.gz) = 3795
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index ef8251e07a49..7a3f9ae8603d 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -2,6 +2,7 @@
PORTNAME= word8
PORTVERSION= 0.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Word8 library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>