aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED2
-rw-r--r--UPDATING19
-rw-r--r--archivers/hs-tar/Makefile2
-rw-r--r--archivers/hs-zip-archive/Makefile1
-rw-r--r--archivers/hs-zlib-bindings/Makefile1
-rw-r--r--archivers/hs-zlib-conduit/Makefile1
-rw-r--r--archivers/hs-zlib-enum/Makefile4
-rw-r--r--archivers/hs-zlib/Makefile5
-rw-r--r--archivers/hs-zlib/distinfo4
-rw-r--r--audio/hs-ALUT/Makefile5
-rw-r--r--audio/hs-OpenAL/Makefile3
-rw-r--r--audio/hs-libmpd/Makefile1
-rw-r--r--benchmarks/hs-criterion/Makefile2
-rw-r--r--converters/hs-aeson/Makefile2
-rw-r--r--converters/hs-dataenc/Makefile3
-rw-r--r--converters/hs-json/Makefile4
-rw-r--r--databases/hs-mysql/Makefile4
-rw-r--r--databases/hs-persistent-sqlite/Makefile4
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-template/Makefile6
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent/Makefile8
-rw-r--r--databases/hs-persistent/distinfo4
-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
-rw-r--r--ftp/hs-curl/Makefile4
-rw-r--r--graphics/hs-HGL/Makefile5
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs20
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs20
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs26
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs20
-rw-r--r--graphics/hs-cairo/Makefile5
-rw-r--r--graphics/hs-dia-base/Makefile6
-rw-r--r--graphics/hs-dia-functions/Makefile6
-rw-r--r--graphics/hs-soegtk/Makefile5
-rw-r--r--graphics/hs-svgcairo/Makefile4
-rw-r--r--lang/ghc/Makefile14
-rw-r--r--lang/ghc/bsd.cabal.mk50
-rw-r--r--lang/ghc/bsd.cabal.options.mk7
-rw-r--r--lang/ghc/bsd.hackage.mk13
-rw-r--r--lang/ghc/distinfo8
-rw-r--r--lang/ghc/files/patch-aclocal.m419
-rw-r--r--lang/ghc/files/patch-compiler-main-Dynflags.hs11
-rw-r--r--lang/ghc/files/patch-configure.ac16
-rw-r--r--lang/ghc/files/patch-ghc.mk14
-rw-r--r--lang/ghc/files/patch-libraries-gen_contents_index10
-rw-r--r--lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc18
-rw-r--r--lang/ghc/pkg-descr30
-rw-r--r--lang/ghc/pkg-plist31
-rw-r--r--lang/hs-brainfuck/Makefile3
-rw-r--r--lang/hs-epic/Makefile4
-rw-r--r--lang/hs-epic/files/patch-Epic__Language.lhs23
-rw-r--r--lang/hs-unlambda/Makefile3
-rw-r--r--mail/hs-email-validate/Makefile1
-rw-r--r--mail/hs-mime-mail/Makefile2
-rw-r--r--mail/hs-mime-types/Makefile1
-rw-r--r--mail/hs-mime/Makefile4
-rw-r--r--math/hs-Agda/Makefile6
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal17
-rw-r--r--math/hs-NumInstances/Makefile4
-rw-r--r--math/hs-NumInstances/distinfo4
-rw-r--r--math/hs-categories/Makefile1
-rw-r--r--math/hs-comonad-transformers/Makefile3
-rw-r--r--math/hs-comonad-transformers/distinfo4
-rw-r--r--math/hs-comonad/Makefile1
-rw-r--r--math/hs-comonads-fd/Makefile2
-rw-r--r--math/hs-contravariant/Makefile1
-rw-r--r--math/hs-data-lens-template/Makefile2
-rw-r--r--math/hs-data-lens/Makefile2
-rw-r--r--math/hs-distributive/Makefile1
-rw-r--r--math/hs-erf/Makefile4
-rw-r--r--math/hs-groupoids/Makefile2
-rw-r--r--math/hs-ieee754/Makefile2
-rw-r--r--math/hs-math-functions/Makefile3
-rw-r--r--math/hs-mwc-random/Makefile2
-rw-r--r--math/hs-nats/Makefile1
-rw-r--r--math/hs-pointed/Makefile2
-rw-r--r--math/hs-probability/Makefile3
-rw-r--r--math/hs-semigroupoid-extras/Makefile2
-rw-r--r--math/hs-semigroupoids/Makefile2
-rw-r--r--math/hs-semigroups/Makefile2
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-semigroups/pkg-descr2
-rw-r--r--math/hs-statistics/Makefile10
-rw-r--r--math/hs-statistics/distinfo4
-rw-r--r--math/hs-vector-space/Makefile3
-rw-r--r--multimedia/hs-gstreamer/Makefile5
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-maccatcher/Makefile3
-rw-r--r--net/hs-network-conduit/Makefile1
-rw-r--r--net/hs-network-info/Makefile4
-rw-r--r--net/hs-network-multicast/Makefile2
-rw-r--r--net/hs-network/Makefile6
-rw-r--r--net/hs-network/distinfo4
-rw-r--r--net/hs-pcap/Makefile4
-rw-r--r--net/hs-publicsuffixlist/Makefile2
-rw-r--r--net/hs-publicsuffixlist/distinfo4
-rw-r--r--net/hs-sendfile/Makefile5
-rw-r--r--net/hs-simple-sendfile/Makefile3
-rw-r--r--net/hs-socks/Makefile4
-rw-r--r--net/hs-socks/distinfo4
-rw-r--r--ports-mgmt/hs-porte/Makefile5
-rw-r--r--print/hs-hscolour/Makefile5
-rw-r--r--science/hs-bio/Makefile6
-rw-r--r--science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs19
-rw-r--r--security/hs-Crypto/Makefile5
-rw-r--r--security/hs-HsOpenSSL/Makefile6
-rw-r--r--security/hs-RSA/Makefile3
-rw-r--r--security/hs-SHA/Makefile4
-rw-r--r--security/hs-certificate/Makefile10
-rw-r--r--security/hs-certificate/distinfo4
-rw-r--r--security/hs-cipher-aes/Makefile4
-rw-r--r--security/hs-cipher-aes/distinfo4
-rw-r--r--security/hs-cipher-rc4/Makefile3
-rw-r--r--security/hs-clientsession/Makefile5
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-cprng-aes/Makefile4
-rw-r--r--security/hs-crypto-api/Makefile4
-rw-r--r--security/hs-crypto-api/distinfo4
-rw-r--r--security/hs-crypto-api/pkg-descr2
-rw-r--r--security/hs-crypto-conduit/Makefile4
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-numbers/Makefile3
-rw-r--r--security/hs-crypto-pubkey-types/Makefile5
-rw-r--r--security/hs-crypto-pubkey-types/distinfo4
-rw-r--r--security/hs-crypto-pubkey/Makefile7
-rw-r--r--security/hs-crypto-pubkey/distinfo4
-rw-r--r--security/hs-crypto-random-api/Makefile3
-rw-r--r--security/hs-cryptocipher/Makefile7
-rw-r--r--security/hs-cryptocipher/distinfo4
-rw-r--r--security/hs-cryptohash/Makefile5
-rw-r--r--security/hs-cryptohash/distinfo4
-rw-r--r--security/hs-digest/Makefile4
-rw-r--r--security/hs-entropy/Makefile4
-rw-r--r--security/hs-monadcryptorandom/Makefile1
-rw-r--r--security/hs-pem/Makefile4
-rw-r--r--security/hs-pureMD5/Makefile4
-rw-r--r--security/hs-pwstore-fast/Makefile4
-rw-r--r--security/hs-skein/Makefile4
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-tls-extra/Makefile4
-rw-r--r--security/hs-tls/Makefile3
-rw-r--r--sysutils/hs-angel/Makefile4
-rw-r--r--sysutils/hs-cpu/Makefile4
-rw-r--r--textproc/bibutils/Makefile22
-rw-r--r--textproc/bibutils/distinfo4
-rw-r--r--textproc/bibutils/files/patch-Makefile_start36
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile11
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile.dynamic11
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile.static11
-rw-r--r--textproc/bibutils/files/patch-configure24
-rw-r--r--textproc/bibutils/files/patch-lib__Makefile.static24
-rw-r--r--textproc/bibutils/pkg-descr2
-rw-r--r--textproc/bibutils/pkg-plist19
-rw-r--r--textproc/hs-Diff/Makefile1
-rw-r--r--textproc/hs-HStringTemplate/Makefile1
-rw-r--r--textproc/hs-HaXml/Makefile9
-rw-r--r--textproc/hs-HaXml/distinfo4
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile2
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile4
-rw-r--r--textproc/hs-attoparsec/Makefile1
-rw-r--r--textproc/hs-blaze-html/Makefile6
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile4
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/Makefile3
-rw-r--r--textproc/hs-csv/Makefile6
-rw-r--r--textproc/hs-double-conversion/Makefile1
-rw-r--r--textproc/hs-feed/Makefile3
-rw-r--r--textproc/hs-hexpat/Makefile5
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile6
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-html-conduit/Makefile3
-rw-r--r--textproc/hs-html/Makefile4
-rw-r--r--textproc/hs-hxt-charproperties/Makefile4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile3
-rw-r--r--textproc/hs-hxt-unicode/Makefile4
-rw-r--r--textproc/hs-hxt/Makefile4
-rw-r--r--textproc/hs-hxt/files/patch-hxt.cabal11
-rw-r--r--textproc/hs-lhs2tex/Makefile3
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-types/Makefile4
-rw-r--r--textproc/hs-pandoc/Makefile9
-rw-r--r--textproc/hs-parsec/Makefile3
-rw-r--r--textproc/hs-polyparse/Makefile8
-rw-r--r--textproc/hs-polyparse/distinfo4
-rw-r--r--textproc/hs-regex-base/Makefile3
-rw-r--r--textproc/hs-regex-compat/Makefile3
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile3
-rw-r--r--textproc/hs-regex-posix/Makefile3
-rw-r--r--textproc/hs-regex-tdfa/Makefile3
-rw-r--r--textproc/hs-stringsearch/Makefile5
-rw-r--r--textproc/hs-tagsoup/Makefile4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile3
-rw-r--r--textproc/hs-texmath/Makefile4
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-xhtml/Makefile6
-rw-r--r--textproc/hs-xml-conduit/Makefile1
-rw-r--r--textproc/hs-xml-types/Makefile5
-rw-r--r--textproc/hs-xml/Makefile7
-rw-r--r--textproc/hs-xml/distinfo4
-rw-r--r--textproc/hs-xml/pkg-descr5
-rw-r--r--textproc/hs-xmlhtml/Makefile3
-rw-r--r--textproc/hs-yaml/Makefile2
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--www/Makefile2
-rw-r--r--www/hs-HTTP/Makefile5
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-activehs/Makefile3
-rw-r--r--www/hs-activehs/files/patch-Converter.hs13
-rw-r--r--www/hs-activehs/files/patch-Main.hs10
-rw-r--r--www/hs-activehs/files/patch-Simple.hs19
-rw-r--r--www/hs-activehs/files/patch-Smart.hs10
-rw-r--r--www/hs-activehs/files/patch-Special.hs20
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal19
-rw-r--r--www/hs-authenticate/Makefile1
-rw-r--r--www/hs-cgi/Makefile8
-rw-r--r--www/hs-cgi/distinfo4
-rw-r--r--www/hs-cgi/pkg-descr2
-rw-r--r--www/hs-cookie/Makefile2
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile1
-rw-r--r--www/hs-gitit/Makefile1
-rw-r--r--www/hs-hS3/Makefile3
-rw-r--r--www/hs-hamlet/Makefile2
-rw-r--r--www/hs-hamlet/distinfo4
-rw-r--r--www/hs-happstack-server/Makefile11
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile5
-rw-r--r--www/hs-heist/Makefile4
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile3
-rw-r--r--www/hs-http-conduit/Makefile4
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-date/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-server/Makefile3
-rw-r--r--www/hs-http-types/Makefile3
-rw-r--r--www/hs-oeis/Makefile5
-rw-r--r--www/hs-path-pieces/Makefile2
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-scgi/Makefile4
-rw-r--r--www/hs-shakespeare-css/Makefile2
-rw-r--r--www/hs-shakespeare-css/distinfo4
-rw-r--r--www/hs-shakespeare-i18n/Makefile4
-rw-r--r--www/hs-shakespeare-js/Makefile4
-rw-r--r--www/hs-shakespeare-js/distinfo4
-rw-r--r--www/hs-shakespeare-text/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile3
-rw-r--r--www/hs-snap-server/Makefile3
-rw-r--r--www/hs-snap/Makefile12
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-url/Makefile4
-rw-r--r--www/hs-wai-app-static/Makefile1
-rw-r--r--www/hs-wai-extra/Makefile8
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-logger/Makefile6
-rw-r--r--www/hs-wai-test/Makefile6
-rw-r--r--www/hs-wai-test/distinfo4
-rw-r--r--www/hs-wai/Makefile1
-rw-r--r--www/hs-warp/Makefile2
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-webkit/Makefile4
-rw-r--r--www/hs-xss-sanitize/Makefile2
-rw-r--r--www/hs-yesod-auth/Makefile18
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-auth/pkg-descr6
-rw-r--r--www/hs-yesod-core/Makefile23
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-default/Makefile18
-rw-r--r--www/hs-yesod-default/distinfo2
-rw-r--r--www/hs-yesod-default/pkg-descr4
-rw-r--r--www/hs-yesod-form/Makefile10
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-json/Makefile18
-rw-r--r--www/hs-yesod-json/distinfo2
-rw-r--r--www/hs-yesod-json/pkg-descr3
-rw-r--r--www/hs-yesod-persistent/Makefile8
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile257
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal22
-rw-r--r--www/hs-yesod-routes/Makefile2
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-static/Makefile9
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-test/Makefile4
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod/Makefile25
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile15
-rw-r--r--x11-toolkits/hs-GLURaw/distinfo2
-rw-r--r--x11-toolkits/hs-GLURaw/pkg-descr8
-rw-r--r--x11-toolkits/hs-GLUT/Makefile9
-rw-r--r--x11-toolkits/hs-GLUT/distinfo4
-rw-r--r--x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs16
-rw-r--r--x11-toolkits/hs-GLUT/pkg-descr6
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile8
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo4
-rw-r--r--x11-toolkits/hs-OpenGL/pkg-descr13
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile15
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo2
-rw-r--r--x11-toolkits/hs-OpenGLRaw/pkg-descr17
-rw-r--r--x11-toolkits/hs-gtk/Makefile5
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile4
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile4
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/hs-pango/Makefile5
-rw-r--r--x11-toolkits/hs-vte/Makefile4
-rw-r--r--x11-toolkits/hs-wx/Makefile2
-rw-r--r--x11-toolkits/hs-wxc/Makefile4
-rw-r--r--x11-toolkits/hs-wxcore/Makefile4
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs10
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-wxcore.cabal11
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile4
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs10
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs10
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal11
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile2
-rw-r--r--x11-wm/hs-xmonad/Makefile4
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile4
-rw-r--r--x11/hs-xmobar/Makefile5
-rw-r--r--x11/hs-xmobar/distinfo4
613 files changed, 1837 insertions, 1819 deletions
diff --git a/MOVED b/MOVED
index 0d349361aab7..485d2b621696 100644
--- a/MOVED
+++ b/MOVED
@@ -4372,3 +4372,5 @@ databases/postgresql83-plpython||2013-06-04|Has expired: Update to supported ver
databases/postgresql83-pltcl||2013-06-04|Has expired: Update to supported version
databases/postgresql83-server||2013-06-04|Has expired: Update to supported version
deskutils/msynctool-devel|deskutils/osynctool|2013-06-04|Development of msynctool ceased and project was renamed
+www/hs-yesod-default||2013-06-04|Removed: This package is obsoleted since Yesod 1.2
+www/hs-yesod-json||2013-06-04|Removed: This package is obsoleted since Yesod 1.2
diff --git a/UPDATING b/UPDATING
index afac9d7f3d46..6895c843779f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,25 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20130604:
+ AFFECTS: users of lang/ghc and */hs-*
+ AUTHOR: haskell@FreeBSD.org
+
+ The Glorious Glasgow Haskell Compiler has been updated to version
+ 7.6.3 and Haskell Platform to 2013.2.0.0. Hence it is recommended to
+ rebuild or reinstall all the dependent ports by one of the following
+ commands:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+ or
+ # pkg install -fR lang/ghc
+
+ Note that prefixes used for hs- ports (Cabal packages) have been
+ changed to PREFIX/{lib,share,share/doc}/cabal/ghc-GHC_VERSION to
+ enable more seamless upgrades in the future.
+
20130603:
AFFECTS: users of dns/opendnssec
AUTHOR: wg@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index ba044bfe4ae6..da7a98595d06 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tar
PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index d31bedf760c7..e1c5547363fa 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zip-archive
PORTVERSION= 0.1.3.4
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index efed82964170..31a3dc4974d7 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.1.3
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
index dfed27ff87f2..838143007258 100644
--- a/archivers/hs-zlib-conduit/Makefile
+++ b/archivers/hs-zlib-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zlib-conduit
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 686be54cb805..be02aa30d107 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Enumerator interface for zlib compression
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= enumerator transformers>=0.2 zlib-bindings
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 963748d3fd22..2b79b5208ca8 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= zlib
-PORTVERSION= 0.5.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.4.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,5 @@ COMMENT= Compression and decompression in the gzip and zlib formats
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index 0fa3502bec04..0dbf92693e94 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-0.5.4.0.tar.gz) = 61771a451a23a26954d8f9f0d5c5b63f633fd3f272c9ab70a2ebe78532270ca2
-SIZE (cabal/zlib-0.5.4.0.tar.gz) = 127571
+SHA256 (cabal/zlib-0.5.4.1.tar.gz) = cca365e4c52c90be41a5754943134da5ce6c60bb52fa00c128fd118e0505a550
+SIZE (cabal/zlib-0.5.4.1.tar.gz) = 127760
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index e79d496305be..10847eae4eb7 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -3,15 +3,14 @@
PORTNAME= ALUT
PORTVERSION= 2.2.0.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell binding for the OpenAL Utility Toolkit
+COMMENT= Binding for the OpenAL Utility Toolkit
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= OpenAL StateVar
USE_OPENAL= al alut
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 3646171858fb..1162c613513e 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -3,6 +3,7 @@
PORTNAME= OpenAL
PORTVERSION= 1.4.0.2
+PORTREVISION= 1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= A binding to the OpenAL cross-platform 3D audio API
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= ObjectName StateVar Tensor
USE_OPENAL= al
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index 5807cbde9ccf..af6b421c6aaf 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libmpd
PORTVERSION= 0.8.0.2
+PORTREVISION= 1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 7bf27e76abda..b378392de385 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -3,7 +3,7 @@
PORTNAME= criterion
PORTVERSION= 0.6.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 2205af56d3f9..db11418df644 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -2,7 +2,7 @@
PORTNAME= aeson
PORTVERSION= 0.6.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index a14d624b3be8..accabd48fff1 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.5
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Data encoding library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 5d697d2ba180..ad65d02fbb50 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,7 +3,7 @@
PORTNAME= json
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ COMMENT= Support for serialising Haskell to and from JSON
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl syb>=0.3.3 text
CONFIGURE_ARGS+= --flags="split-base generic -parsec -pretty -mapdict"
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index fb4f3370911a..d9c5186fe939 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -3,11 +3,11 @@
PORTNAME= mysql
PORTVERSION= 0.1.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A low-level MySQL client library
+COMMENT= Low-level MySQL client library
LICENSE= BSD
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index e3064910d015..8698ca88c840 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 1.1.5
+PORTVERSION= 1.2.0
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 \
- monad-logger>=0.2.4 persistent>=1.1.5 text>=0.7 \
+ monad-logger>=0.2.4 persistent>=1.2 text>=0.7 \
transformers>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 78bcd58a3a07..cb6f3724a36f 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-1.1.5.tar.gz) = 94993b3b4f09d27846c149b68e3e9ba73a2bd6e361a6e74519dff5ad31b81dcf
-SIZE (cabal/persistent-sqlite-1.1.5.tar.gz) = 1285378
+SHA256 (cabal/persistent-sqlite-1.2.0.tar.gz) = 9060f3363d981bde0b5e5bab99562930523072fb506b5f7af509b36cc24fad27
+SIZE (cabal/persistent-sqlite-1.2.0.tar.gz) = 1285410
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index f0e0f4f7f18d..1c1fa0198a2c 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 1.1.2.4
+PORTVERSION= 1.2.0
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson monad-control>=0.2 persistent>=1.1.2 text>=0.5 \
- transformers>=0.2
+USE_CABAL= aeson monad-control>=0.2 monad-logger persistent>=1.2 \
+ text>=0.5 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index db4aa39e53d6..4b1ae153f72a 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-1.1.2.4.tar.gz) = 09962d07000c7eee8bdc76fde8ab7640b7efcad1cb4055a136654093cbf6583b
-SIZE (cabal/persistent-template-1.1.2.4.tar.gz) = 11436
+SHA256 (cabal/persistent-template-1.2.0.tar.gz) = 446b666717be9ce6d01283817ecb52733c50ea2fa740aa08dde80b9532cbd95d
+SIZE (cabal/persistent-template-1.2.0.tar.gz) = 12007
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index b7845ebc8aaf..3c380856a20b 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 1.1.5.1
+PORTVERSION= 1.2.0.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,9 @@ COMMENT= Type-safe, multi-backend data serialization
LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
- blaze-markup>=0.5.1 conduit>=0.5.5 lifted-base>=0.1 \
- monad-control>=0.3 monad-logger>=0.2.3 path-pieces>=0.1 \
- pool-conduit>=0.1.1 resourcet>=0.4 silently text>=0.8 \
+ blaze-markup>=0.5.1 conduit>=1.0 lifted-base>=0.1 \
+ monad-control>=0.3 monad-logger>=0.3 path-pieces>=0.1 \
+ pool-conduit>=0.1.2 resourcet>=0.4 silently text>=0.8 \
transformers>=0.2.1 transformers-base unordered-containers \
vector
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index ab4fa11dbdef..2b78dac3e19a 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-1.1.5.1.tar.gz) = df3a2eaf2765797382672f26a4b48ea3fdbb75f7b7c6d3a7aac0bcf7ebc040b7
-SIZE (cabal/persistent-1.1.5.1.tar.gz) = 31484
+SHA256 (cabal/persistent-1.2.0.1.tar.gz) = 8b6e4726e2cfa819926d3883fda8be1b956fa88ae05214fee604f3e9c22347af
+SIZE (cabal/persistent-1.2.0.1.tar.gz) = 30244
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>
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 5912be1e3981..87dde24141e4 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Haskell binding to libcurl
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_GHC_NATIVE= yes
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index ef3b5a33ffb0..69d7e67083ac 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -3,15 +3,14 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A simple Haskell graphics library based on X11 or Win32
+COMMENT= Simple Haskell graphics library based on X11 or Win32
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= X11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
index 0b03fe9d5ceb..d09a4cb11689 100644
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
+++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
@@ -1,11 +1,27 @@
--- ./Graphics/HGL/Internals/Utilities.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/Internals/Utilities.hs 2011-03-13 18:31:25.754332789 +0100
++++ ./Graphics/HGL/Internals/Utilities.hs 2013-05-01 01:30:47.000000000 +0200
@@ -20,7 +20,7 @@
modMVar, modMVar_
) where
-import qualified Control.Exception as E (bracket, try, IOException, tryJust, ioErrors)
-+import qualified Control.OldException as E (bracket, try, IOException, tryJust, ioErrors)
++import qualified Control.Exception as E (bracket, try, IOException, tryJust)
import Control.Concurrent( MVar, takeMVar, putMVar )
bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c
+@@ -32,15 +32,7 @@
+
+ type Exception = E.IOException
+ safeTry :: IO a -> IO (Either Exception a)
+-
+-#if __GLASGOW_HASKELL >= 610
+--- ghc-6.10
+ safeTry = E.try
+-#else
+--- ghc 6.8 (and below?)
+-safeTry = E.tryJust E.ioErrors
+-#endif
+-
+
+ ----------------------------------------------------------------
+ -- Utilities
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs
new file mode 100644
index 000000000000..5e29c6df339a
--- /dev/null
+++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs
@@ -0,0 +1,20 @@
+--- ./Graphics/HGL/Run.hs.orig 2009-11-03 15:50:11.000000000 +0100
++++ ./Graphics/HGL/Run.hs 2013-05-01 01:51:50.000000000 +0200
+@@ -24,7 +24,7 @@
+ import Graphics.HGL.Internals.Utilities (safeTry)
+ import Control.Concurrent (forkIO, yield)
+ import Data.IORef( newIORef, readIORef, writeIORef )
+-import System.IO.Error (try)
++import System.IO.Error (tryIOError)
+ #endif
+
+ ----------------------------------------------------------------
+@@ -60,7 +60,7 @@
+ beginGraphics
+ quit <- newIORef False
+ safeTry $ do
+- forkIO (try m >> writeIORef quit True)
++ forkIO (tryIOError m >> writeIORef quit True)
+ yield
+ handleEvents (readIORef quit)
+ endGraphics
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs
new file mode 100644
index 000000000000..0951e6ec3eee
--- /dev/null
+++ b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs
@@ -0,0 +1,26 @@
+--- ./Graphics/HGL/X11/Display.hs.orig 2009-11-03 15:50:11.000000000 +0100
++++ ./Graphics/HGL/X11/Display.hs 2013-05-01 02:01:44.000000000 +0200
+@@ -14,12 +14,12 @@
+ import Control.Monad (when)
+ import Data.Maybe (isJust)
+ import System.Environment (getEnv)
+-import System.IO.Error (try)
++import System.IO.Error (tryIOError, catchIOError)
+ import System.IO.Unsafe (unsafePerformIO)
+
+ getDisplayName :: IO String
+ getDisplayName = do
+- disp <- try (getEnv "DISPLAY")
++ disp <- tryIOError (getEnv "DISPLAY")
+ return (either (const ":0.0") id disp)
+
+ displayRef :: MVar (Maybe X.Display)
+@@ -32,7 +32,7 @@
+ openDisplay'
+ where
+ openDisplay' = do
+- display <- X.openDisplay host `catch` \ err ->
++ display <- X.openDisplay host `catchIOError` \ err ->
+ ioError (userError ("Unable to open X display " ++ host))
+ modMVar displayRef (const $ Just display)
+ return display
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs
new file mode 100644
index 000000000000..892c5fe75355
--- /dev/null
+++ b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs
@@ -0,0 +1,20 @@
+--- ./Graphics/HGL/X11/Types.hs.orig 2009-11-03 15:50:11.000000000 +0100
++++ ./Graphics/HGL/X11/Types.hs 2013-05-01 01:53:35.000000000 +0200
+@@ -30,6 +30,7 @@
+ import Control.Concurrent.MVar (MVar)
+ import Data.Bits
+ import Data.Word (Word8)
++import System.IO.Error
+
+ ----------------------------------------------------------------
+ -- Units
+@@ -84,8 +85,7 @@
+ (X.Color p _ _ _ _) <-
+ X.allocColor display color_map (X.Color 0 r g b xcolor_flags)
+ return p)
+- `catch` \ err ->
+- print err >> return 0
++ `catchIOError` \err -> print err >> return 0
+ -- ioError (userError ("Error: " ++ show err
+ -- ++ "\nUnable to allocate colo[u]r " ++ show (r,g,b)
+ -- ++ " - I'll bet you're running Netscape."))
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index d819e4a6f364..e45f8316d29b 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -2,16 +2,13 @@
PORTNAME= cairo
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Cairo library
LICENSE= BSD
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
USE_CABAL= gtk2hs-buildtools mtl
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 833b51589b63..42f321c5baa5 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -2,15 +2,13 @@
PORTNAME= dia-base
PORTVERSION= 0.1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An EDSL for teaching Haskell with diagrams - data types
+COMMENT= EDSL for teaching Haskell with diagrams - data types
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index 1194ada00b42..68722f434939 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -2,16 +2,14 @@
PORTNAME= dia-functions
PORTVERSION= 0.2.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An EDSL for teaching Haskell with diagrams - functions
+COMMENT= EDSL for teaching Haskell with diagrams - functions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0 xhtml>=3000.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index 6d5f7197977c..fef33d6e08c3 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -2,16 +2,13 @@
PORTNAME= soegtk
PORTVERSION= 0.12.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= GUI functions as used in the book "The Haskell School of Expression"
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12 gtk>=0.11 mtl stm>=2
USE_GNOME= gtk20
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index d4cfeec500d6..2b08c149d46f 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -2,16 +2,14 @@
PORTNAME= svgcairo
PORTVERSION= 0.12.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the libsvg-cairo library
LICENSE= BSD
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12 glib>=0.12 mtl
USE_GNOME= librsvg2
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 69dde180d91b..75aef1cfa7d0 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ghc
-PORTVERSION= 7.4.2
-PORTREVISION= 1
+PORTVERSION= 7.6.3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -22,7 +21,7 @@ HSCOLOUR_VERSION= 1.20.2
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.*
+CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.* ghc-7.4.*
USE_BZIP2= yes
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
@@ -309,10 +308,10 @@ pre-configure:
post-install:
# cabalised hs-foo-ghc ports
- @${MKDIR} ${GHC_LIBDIR}/cabal
- @${MKDIR} ${DOCSDIR}/cabal
- @${MKDIR} ${EXAMPLESDIR}/cabal
- @${MKDIR} ${DATADIR}/cabal
+ @${MKDIR} ${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
+ @${MKDIR} ${PREFIX}/share/cabal/ghc-${GHC_VERSION}
+ @${MKDIR} ${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
+ @${MKDIR} ${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}
.if ${PORT_OPTIONS:MDOCS}
cd ${DOCSDIR}/html/libraries && ./gen_contents_index
.endif
@@ -320,6 +319,5 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
@${LN} -sf ${PREFIX}/bin/haddock-ghc-${GHC_VERSION} ${PREFIX}/bin/haddock
.endif
- @${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
.include <bsd.port.mk>
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 88f9e56d460b..1d95d0e665c1 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -21,7 +21,6 @@ NO_BUILD= yes
DIST_SUBDIR?= cabal
-CABAL_SETUP?= Setup.lhs
SETUP_CMD?= ./setup
ALEX_CMD?= ${LOCALBASE}/bin/alex
@@ -33,16 +32,16 @@ CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
-CABAL_DOCSDIR= ${PREFIX}/share/doc/ghc-${GHC_VERSION}/cabal
+CABAL_DOCSDIR= ${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
CABAL_DOCSDIR_REL= ${CABAL_DOCSDIR:S,^${PREFIX}/,,}
-DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}/cabal/${DISTNAME}
+DATADIR= ${PREFIX}/share/cabal/ghc-${GHC_VERSION}/${DISTNAME}
DOCSDIR= ${CABAL_DOCSDIR}/${DISTNAME}
-EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}/cabal/${DISTNAME}
+EXAMPLESDIR= ${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}/${DISTNAME}
GHC_LIB_DOCSDIR_REL= share/doc/ghc-${GHC_VERSION}/html/libraries
-CABAL_LIBDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
+CABAL_LIBDIR= ${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
CABAL_LIBSUBDIR= ${DISTNAME}
CABAL_LIBDIR_REL= ${CABAL_LIBDIR:S,^${PREFIX}/,,}
@@ -82,6 +81,11 @@ USE_GCC= 4.6+
CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
--with-ranlib=${RANLIB}
+.if ${PORT_OPTIONS:MLLVM}
+BUILD_DEPENDS+= llvm>=3.0:${PORTSDIR}/devel/llvm
+CONFIGURE_ARGS+= --ghc-option=-fllvm
+.endif
+
.if defined(USE_ALEX)
BUILD_DEPENDS+= ${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
CONFIGURE_ARGS+= --with-alex=${ALEX_CMD}
@@ -99,7 +103,7 @@ CONFIGURE_ARGS+= --with-c2hs=${C2HS_CMD}
.if defined(EXECUTABLE)
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
-USES+= iconv
+USES+= iconv
.endif
.if defined(USE_CABAL)
@@ -146,7 +150,7 @@ HADDOCK_OPTS= # empty
BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
HSCOLOUR_VERSION= 1.20.3
-HSCOLOUR_DATADIR= ${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
+HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif # HSCOLOUR
.endif # HADDOCK_AVAILABLE
@@ -190,28 +194,24 @@ post-patch::
${WRKSRC}/doc/configure.ac
.endif
-# Purge Haskell 98 (required for GHC 7.2 or later)
-.if defined(HASKELL98)
- @${REINPLACE_CMD} -E 's|haskell98[,]?||' \
- ${WRKSRC}/${PORTNAME}.cabal
-
- @${REINPLACE_CMD} 's|import List|import Data.List| ; \
- s|import Char|import Data.Char| ; \
- s|import Ratio|import Data.Ratio| ; \
- s|import Monad|import Control.Monad| ; \
- s|import IO|import System.IO.Error| ; \
- s|import Directory|import System.Directory| ; \
- s|import Maybe|import Data.Maybe| ; \
- s|import Array|import Data.Array|' \
- `${FIND} ${WRKSRC} -name '*.hs'`
-.endif
+_BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make
.if !target(do-configure)
do-configure:
.if !defined(METAPORT)
- cd ${WRKSRC} && ${GHC_CMD} --make ${CABAL_SETUP} -o setup -package Cabal
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${SETUP_CMD} configure --ghc --prefix=${PREFIX} --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" ${__handle_datadir__} ${CONFIGURE_ARGS}
+ @if [ -f ${WRKSRC}/Setup.hs ]; then \
+ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.hs; fi
+ @if [ -f ${WRKSRC}/Setup.lhs ]; then \
+ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.lhs; fi
+ @if [ -f ${WRKSRC}/${SETUP_CMD} ]; then \
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${SETUP_CMD} configure --ghc --prefix=${PREFIX} \
+ --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" \
+ ${__handle_datadir__} ${CONFIGURE_ARGS}; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} configure fails: no setup program could be created."; \
+ exit 1; \
+ fi
.if ${PORT_OPTIONS:MDOCS}
.if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index b222ac88fb94..0e339f0f612e 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -17,11 +17,12 @@ LOCALBASE?= /usr/local
GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION= 7.4.2
+GHC_VERSION= 7.6.3
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
DYNAMIC_DESC?= Add support for dynamic linking
PROFILE_DESC?= Add support for profiling
+LLVM_DESC?= Use the LLVM backend for code generation
.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi) && !defined(IGNORE_DYNAMIC))
OPTIONS_DEFINE+= DYNAMIC
@@ -32,6 +33,10 @@ OPTIONS_DEFAULT+= DYNAMIC
OPTIONS_DEFINE+= PROFILE
.endif
+.if !defined(IGNORE_LLVM)
+OPTIONS_DEFINE+= LLVM
+.endif
+
.if !exists(${GHC_CMD}) || ((exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) && !defined(NOPORTDOCS))
OPTIONS_DEFINE+= DOCS
OPTIONS_DEFAULT+= DOCS
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 895c12edfb4f..0de54c23509d 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -24,6 +24,7 @@ ansi-terminal_port= devel/hs-ansi-terminal
ansi-wl-pprint_port= devel/hs-ansi-wl-pprint
arrows_port= devel/hs-arrows
asn1-data_port= devel/hs-asn1-data
+asn1-types_port= devel/hs-asn1-types
async_port= devel/hs-async
attempt_port= devel/hs-attempt
attoparsec_port= textproc/hs-attoparsec
@@ -95,6 +96,11 @@ csv_port= textproc/hs-csv
curl_port= ftp/hs-curl
darcs_port= devel/hs-darcs # executable
data-default_port= devel/hs-data-default
+data-default-class_port= devel/hs-data-default-class
+data-default-instances-base_port= devel/hs-data-default-instances-base
+data-default-instances-containers_port= devel/hs-data-default-instances-containers
+data-default-instances-dlist_port= devel/hs-data-default-instances-dlist
+data-default-instances-old-locale_port= devel/hs-data-default-instances-old-locale
data-lens_port= math/hs-data-lens
data-lens-template_port= math/hs-data-lens-template
data-pprint_port= devel/hs-data-pprint
@@ -118,6 +124,7 @@ enumerator_port= devel/hs-enumerator
epic_port= lang/hs-epic # executable
erf_port= math/hs-erf
errors_port= devel/hs-errors
+extensible-exceptions_port= devel/hs-extensible-exceptions
failure_port= devel/hs-failure
fast-logger_port= devel/hs-fast-logger
fastcgi_port= www/hs-fastcgi # lib_depends
@@ -139,6 +146,7 @@ git-annex_port= devel/hs-git-annex # executable
gitit_port= www/hs-gitit # executable
glade_port= devel/hs-glade
glib_port= devel/hs-glib
+GLURaw_port= x11-toolkits/hs-GLURaw
GLUT_port= x11-toolkits/hs-GLUT
groupoids_port= math/hs-groupoids
gstreamer_port= multimedia/hs-gstreamer
@@ -217,6 +225,7 @@ mime-mail_port= mail/hs-mime-mail
mime-types_port= mail/hs-mime-types
MissingH_port= devel/hs-MissingH
mmap_port= devel/hs-mmap
+mmorph_port= devel/hs-mmorph
monad-control_port= devel/hs-monad-control
monad-logger_port= devel/hs-monad-logger
monad-par_port= devel/hs-monad-par
@@ -240,6 +249,7 @@ ObjectName_port= devel/hs-ObjectName
oeis_port= www/hs-oeis
OpenAL_port= audio/hs-OpenAL
OpenGL_port= x11-toolkits/hs-OpenGL
+OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw
optparse-applicative_port= devel/hs-optparse-applicative
pandoc_port= textproc/hs-pandoc # executable
pandoc-types_port= textproc/hs-pandoc-types
@@ -267,6 +277,7 @@ publicsuffixlist_port= net/hs-publicsuffixlist
pureMD5_port= security/hs-pureMD5
pwstore-fast_port= security/hs-pwstore-fast
QuickCheck_port= devel/hs-QuickCheck
+quickcheck-io_port= devel/hs-quickcheck-io
random_port= devel/hs-random
ranges_port= devel/hs-ranges
reactive_port= devel/hs-reactive
@@ -391,9 +402,7 @@ yaml_port= textproc/hs-yaml
yesod_port= www/hs-yesod
yesod-auth_port= www/hs-yesod-auth
yesod-core_port= www/hs-yesod-core
-yesod-default_port= www/hs-yesod-default
yesod-form_port= www/hs-yesod-form
-yesod-json_port= www/hs-yesod-json
yesod-persistent_port= www/hs-yesod-persistent
yesod-platform_port= www/hs-yesod-platform
yesod-routes_port= www/hs-yesod-routes
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index aaeaf1a5e791..79280774a9af 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,11 +1,7 @@
-SHA256 (ghc-7.4.2-src.tar.bz2) = f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d
-SIZE (ghc-7.4.2-src.tar.bz2) = 25836446
+SHA256 (ghc-7.6.3-src.tar.bz2) = bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998
+SIZE (ghc-7.6.3-src.tar.bz2) = 110763823
SHA256 (hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
SIZE (hscolour-1.20.2.tar.gz) = 25722
-SHA256 (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = e5cfc6c098179f8657d5cbf1a0fe70e8e9bfdde5a280c095e1dfc51d6e43731f
-SIZE (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = 45438870
-SHA256 (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 836e48e2a250a43b1230eac7f04821de86d915a51d0a36d6040b48cdd25ecedb
-SIZE (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 45310351
SHA256 (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = b58f5b346c2b261f6357f5f72a0bf2c3c766e914cffbe6f2aefb1abf67b9a797
SIZE (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = 45447162
SHA256 (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 536da87dc9e32e98f9258e29b3a44846db6ac786f26b426da4808c33fcc92914
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
index f288e6b77221..48c040f74504 100644
--- a/lang/ghc/files/patch-aclocal.m4
+++ b/lang/ghc/files/patch-aclocal.m4
@@ -1,5 +1,5 @@
---- aclocal.m4.orig 2012-06-06 19:10:25.000000000 +0200
-+++ aclocal.m4 2013-02-03 01:28:58.024638318 +0100
+--- aclocal.m4.orig 2013-04-18 23:22:46.000000000 +0200
++++ aclocal.m4 2013-04-29 20:32:30.000000000 +0200
@@ -19,6 +19,8 @@
# In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
# so this justs uses $bootstrap_target.
@@ -15,10 +15,10 @@
;;
- x86_64)
+ x86_64|amd64)
- GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=ArchX86_64"
;;
-@@ -186,7 +188,7 @@
+ powerpc)
+@@ -185,7 +187,7 @@
checkVendor() {
case [$]1 in
@@ -27,7 +27,7 @@
;;
*)
echo "Unknown vendor [$]1"
-@@ -1835,7 +1837,7 @@
+@@ -1889,7 +1891,7 @@
vax)
$2="vax"
;;
@@ -36,12 +36,3 @@
$2="x86_64"
;;
*)
-@@ -1875,7 +1877,7 @@
- freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
- $2="$1"
- ;;
-- freebsd8) # like i686-gentoo-freebsd8
-+ freebsd*) # like i686-gentoo-freebsd8
- $2="freebsd"
- ;;
- *)
diff --git a/lang/ghc/files/patch-compiler-main-Dynflags.hs b/lang/ghc/files/patch-compiler-main-Dynflags.hs
new file mode 100644
index 000000000000..ee76c6da2988
--- /dev/null
+++ b/lang/ghc/files/patch-compiler-main-Dynflags.hs
@@ -0,0 +1,11 @@
+--- compiler/main/DynFlags.hs.orig 2012-06-06 19:10:25.000000000 +0200
++++ compiler/main/DynFlags.hs 2013-02-08 15:23:36.000000000 +0100
+@@ -2390,7 +2390,7 @@
+ flag)
+ return dflags
+ HscLlvm
+- | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) &&
++ | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin || os == OSFreeBSD)) &&
+ (not opt_Static || opt_PIC)
+ ->
+ do addWarn ("Ignoring " ++ flag ++ " as it is incompatible with -fPIC and -dynamic on this platform")
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index 11139a3aa71d..e7504949abce 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig 2012-06-06 19:10:25.000000000 +0200
-+++ configure.ac 2013-02-02 17:31:55.193634655 +0100
+--- ./configure.ac.orig 2013-04-19 00:31:00.000000000 +0200
++++ ./configure.ac 2013-04-30 19:30:40.381161098 +0200
@@ -89,6 +89,59 @@
fi
WithGhc="$GHC"])
@@ -60,7 +60,17 @@
dnl ** Tell the make system which OS we are using
dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something
-@@ -717,7 +770,6 @@
+@@ -379,6 +432,9 @@
+ BuildingCrossCompiler=NO
+ PortingCompiler=NO
+ CrossCompiling=NO
++
++build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`
++
+ # If 'host' and 'target' differ, then this means we are building a cross-compiler.
+ if test "$host" != "$target" ; then
+ BuildingCrossCompiler=YES
+@@ -839,7 +895,6 @@
FP_VISIBILITY_HIDDEN
dnl ** check for librt
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 81f97ee717ea..a8e806b6e47c 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,6 +1,6 @@
---- ghc.mk.orig 2012-06-06 19:10:25.000000000 +0200
-+++ ghc.mk 2013-01-30 16:24:02.000000000 +0100
-@@ -81,6 +81,7 @@
+--- ghc.mk.orig 2013-04-18 23:22:46.000000000 +0200
++++ ghc.mk 2013-04-29 20:42:16.000000000 +0200
+@@ -80,6 +80,7 @@
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
else ifeq "$(MAKE_RESTARTS)" "1"
@@ -8,8 +8,8 @@
else
$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
endif
-@@ -574,12 +575,18 @@
- $(GHC_GENPRIMOP_DIR)
+@@ -595,12 +596,18 @@
+ MAYBE_GHCI=driver/ghci
endif
+ifeq "$(UseSystemLibFFI)" "YES"
@@ -20,7 +20,7 @@
+
BUILD_DIRS += \
driver \
- driver/ghci \
+ $(MAYBE_GHCI) \
driver/ghc \
driver/haddock \
- libffi \
@@ -28,7 +28,7 @@
includes \
rts
-@@ -971,6 +978,7 @@
+@@ -1005,6 +1012,7 @@
echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK)
echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK)
diff --git a/lang/ghc/files/patch-libraries-gen_contents_index b/lang/ghc/files/patch-libraries-gen_contents_index
deleted file mode 100644
index a2785da02ed9..000000000000
--- a/lang/ghc/files/patch-libraries-gen_contents_index
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libraries/gen_contents_index.orig 2012-02-01 19:10:32.000000000 +0100
-+++ ./libraries/gen_contents_index 2012-05-17 02:20:09.000000000 +0200
-@@ -47,7 +47,6 @@
- esac
-
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
- -t "Haskell Hierarchical Libraries" \
- -p "prologue.txt" \
diff --git a/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc b/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
new file mode 100644
index 000000000000..ffc1d3df082a
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
@@ -0,0 +1,18 @@
+--- ./libraries/base/GHC/Event/KQueue.hsc.orig 2013-04-18 23:30:14.000000000 +0200
++++ ./libraries/base/GHC/Event/KQueue.hsc 2013-04-30 13:34:11.549185351 +0200
+@@ -235,10 +235,11 @@
+ #endif
+ deriving (Bits, Eq, Num, Show, Storable)
+
+-#{enum Filter, Filter
+- , filterRead = EVFILT_READ
+- , filterWrite = EVFILT_WRITE
+- }
++filterRead :: Filter
++filterRead = Filter (#const EVFILT_READ)
++
++filterWrite :: Filter
++filterWrite = Filter (#const EVFILT_WRITE)
+
+ data TimeSpec = TimeSpec {
+ tv_sec :: {-# UNPACK #-} !CTime
diff --git a/lang/ghc/pkg-descr b/lang/ghc/pkg-descr
index f6962bd4d3aa..520a29318997 100644
--- a/lang/ghc/pkg-descr
+++ b/lang/ghc/pkg-descr
@@ -1,16 +1,20 @@
-Haskell is the standard lazy purely functional programming language.
-The current language version is Haskell 98, agreed in December 1998,
-with a revised version published in January 2003.
+The Glasgow Haskell Compiler is a state-of-the-art, open source, compiler and
+interactive environment for the functional language Haskell. Highlights:
-The Glasgow Haskell Compiler is a robust, fully-featured, optimising
-compiler for the functional programming language Haskell 98 generating
-good code for a variety of platforms. GHC is a state-of-the-art
-programming suite for Haskell and compiles Haskell to either native code
-or C. It implements numerous experimental language extensions to
-Haskell, including concurrency, a foreign language interface, several
-type-system extensions, exceptions, and so on. GHC comes with a
-generational garbage collector, a space and time profiler, comprehensive
-set of libraries and an interactive system for convenient, quick
-development.
+ * Supports the entire Haskell 2010 language plus a wide variety of
+ extensions.
+ * Has particularly good support for concurrency and parallelism, including
+ support for Software Transactional Memory (STM).
+ * Generates fast code, particularly for concurrent programs.
+ * Works on several platforms including FreeBSD, Windows, Mac, Linux, most
+ varieties of Unix, and several different processor architectures.
+ * Has extensive optimisation capabilities, including inter-module optimisation.
+ * Compiles Haskell code either directly to native code or using LLVM as a
+ back-end. It can also generate C code as an intermediate target for porting
+ to new platforms. The interactive environment compiles Haskell to bytecode,
+ and supports execution of mixed bytecode/compiled programs.
+ * Profiling is supported, both by time/allocation and various kinds of heap
+ profiling.
+ * Comes with several libraries, and thousands more are available on Hackage.
WWW: http://www.haskell.org/ghc/
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index 7ab250d17dbe..8a1ccd4ce889 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -3,21 +3,26 @@ bin/ghc
bin/ghci
bin/ghc-pkg
bin/runhaskell
-bin/haddock-ghc-%%GHC_VERSION%%
-bin/ghci-%%GHC_VERSION%%
-bin/hsc2hs
-bin/ghc-pkg-%%GHC_VERSION%%
bin/runghc
-bin/ghc-%%GHC_VERSION%%
bin/hp2ps
bin/hpc
+bin/hsc2hs
+bin/ghc-%%GHC_VERSION%%
+bin/ghci-%%GHC_VERSION%%
+bin/ghc-pkg-%%GHC_VERSION%%
+bin/haddock-ghc-%%GHC_VERSION%%
+bin/runghc-%%GHC_VERSION%%
@exec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true
@unexec /bin/rm -f %D/bin/haddock || return true
-@exec /bin/mkdir -p %D/%%GHC_LIBDIR%%/cabal || return true
-@exec /bin/mkdir -p %D/%%DOCSDIR%%/cabal || return true
-@exec /bin/mkdir -p %D/%%DATADIR%%/cabal || return true
-@exec /bin/mkdir -p %D/%%EXAMPLESDIR%%/cabal || return true
-@dirrm %%DATADIR%%/cabal
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/cabal
-@dirrm %%EXAMPLESDIR%%
+@exec /bin/mkdir -p %D/lib/cabal/ghc-%%GHC_VERSION%% || return true
+@exec /bin/mkdir -p %D/share/cabal/ghc-%%GHC_VERSION%% || return true
+@exec /bin/mkdir -p %D/share/doc/cabal/ghc-%%GHC_VERSION%% || return true
+@exec /bin/mkdir -p %D/share/examples/cabal/ghc-%%GHC_VERSION%% || return true
+@dirrmtry lib/cabal/ghc-%%GHC_VERSION%%
+@dirrmtry lib/cabal
+@dirrmtry share/cabal/ghc-%%GHC_VERSION%%
+@dirrmtry share/cabal
+@dirrmtry share/doc/cabal/ghc-%%GHC_VERSION%%
+@dirrmtry share/doc/cabal
+@dirrmtry share/examples/cabal/ghc-%%GHC_VERSION%%
+@dirrmtry share/examples/cabal
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index f86e53030995..6acf241e2bb1 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Brainfuck interpreter written in Haskell
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
EXECUTABLE= bf
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
index 4183c2962d0f..4587d6c6fa5a 100644
--- a/lang/hs-epic/Makefile
+++ b/lang/hs-epic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= epic
PORTVERSION= 0.9.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Compiler for a simple functional language
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl
USE_HAPPY= yes
diff --git a/lang/hs-epic/files/patch-Epic__Language.lhs b/lang/hs-epic/files/patch-Epic__Language.lhs
new file mode 100644
index 000000000000..cb047e5e75f5
--- /dev/null
+++ b/lang/hs-epic/files/patch-Epic__Language.lhs
@@ -0,0 +1,23 @@
+--- ./Epic/Language.lhs.orig 2012-02-28 00:44:29.000000000 +0100
++++ ./Epic/Language.lhs 2013-05-01 00:03:23.000000000 +0200
+@@ -5,6 +5,7 @@
+
+ > import Control.Monad
+ > import System.IO
++> import System.IO.Error
+ > import System.Directory
+ > import System.Environment
+
+@@ -377,9 +378,9 @@
+ > openTempFile dir "esc"
+
+ > environment :: String -> IO (Maybe String)
+-> environment x = catch (do e <- getEnv x
+-> return (Just e))
+-> (\_ -> return Nothing)
++> environment x = catchIOError (do e <- getEnv x
++> return (Just e))
++> (\_ -> return Nothing)
+
+ Some tests
+
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 6c32487fc216..c046754d80f6 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Unlambda interpreter
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
EXECUTABLE= unlambda
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 64628002f195..cb389495b46f 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= email-validate
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 149370ce0fe6..1b2b778afd30 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mime-mail
PORTVERSION= 0.4.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 705e4e479521..ad927fe4d304 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mime-types
PORTVERSION= 0.1.0.3
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index 9518bf81ac34..5fe2b1579eb7 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mime
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= Working with MIME types
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 9de5448ab600..31b426771dd0 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -3,15 +3,13 @@
PORTNAME= Agda
PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= geniplate>=0.6.0.3 hashable>=1.2 hashtables \
+USE_CABAL= geniplate>=0.6.0.3 hashable>=1.1 hashtables \
haskeline>=0.6.3.2 haskell-src-exts>=1.9.6 mtl \
QuickCheck>=2.3 parallel syb>=0.1 unordered-containers>=0.2 \
xhtml zlib>=0.4.0.1
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index 208d469dd4d5..42b95170d46e 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,12 +1,19 @@
--- ./Agda.cabal.orig 2012-11-12 01:25:25.000000000 +0100
-+++ ./Agda.cabal 2013-03-09 17:44:08.000000000 +0100
-@@ -82,8 +82,8 @@
- process >= 1.0.1.0 && < 1.2,
++++ ./Agda.cabal 2013-05-03 23:08:18.000000000 +0200
+@@ -69,7 +69,7 @@
+
+ build-depends: base >= 4.2 && < 4.7,
+ mtl >= 2.0 && < 2.2,
+- QuickCheck >= 2.3 && < 2.6,
++ QuickCheck >= 2.3 && < 2.7,
+ haskell-src-exts >= 1.9.6 && < 1.14,
+ containers >= 0.1 && < 0.6,
+ unordered-containers == 0.2.*,
+@@ -83,7 +83,7 @@
haskeline >= 0.6.3.2 && < 0.8,
xhtml == 3000.2.*,
-- hashable >= 1.1.2.3 && < 1.2,
+ hashable >= 1.1.2.3 && < 1.2,
- hashtables == 1.0.*,
-+ hashable >= 1.1.2.3 && < 1.3,
+ hashtables == 1.1.*,
geniplate >= 0.6.0.3 && < 0.7,
parallel < 3.3,
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 6ab70bcd169f..2a6df329d2a9 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= NumInstances
-PORTVERSION= 1.2
+PORTVERSION= 1.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= Instances of numeric classes for functions and tuples
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-NumInstances/distinfo b/math/hs-NumInstances/distinfo
index 769849faf738..60e673d0b731 100644
--- a/math/hs-NumInstances/distinfo
+++ b/math/hs-NumInstances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/NumInstances-1.2.tar.gz) = a95c45280f794ef54ac1968a2938c2a87feb7c0c42e3923ea326bc0ee0904668
-SIZE (cabal/NumInstances-1.2.tar.gz) = 3701
+SHA256 (cabal/NumInstances-1.3.tar.gz) = 50a3f3492304a3272f3c4cfe9e852f296888f2c31d84b2012be9e9af8aa63070
+SIZE (cabal/NumInstances-1.3.tar.gz) = 4051
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 864f62e836a4..eea1b03ce3a3 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -2,6 +2,7 @@
PORTNAME= categories
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
index f63e2d261804..a2755e77c2d4 100644
--- a/math/hs-comonad-transformers/Makefile
+++ b/math/hs-comonad-transformers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= comonad-transformers
-PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTVERSION= 3.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonad-transformers/distinfo b/math/hs-comonad-transformers/distinfo
index b173e983d25a..4b70cdbaefc2 100644
--- a/math/hs-comonad-transformers/distinfo
+++ b/math/hs-comonad-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-transformers-3.0.1.tar.gz) = b2246025fc1f62b4950d241efd418066d23d106e0bdbafbfa3c03ffd03f8acd2
-SIZE (cabal/comonad-transformers-3.0.1.tar.gz) = 7391
+SHA256 (cabal/comonad-transformers-3.0.2.tar.gz) = 2d9d31329b02e005b32fa85608cc026e464e22aa8dd44e15217700772e8620a4
+SIZE (cabal/comonad-transformers-3.0.2.tar.gz) = 8381
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 5719cc6db638..5646991b391d 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -2,6 +2,7 @@
PORTNAME= comonad
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile
index ea1c212a898d..347a398978c3 100644
--- a/math/hs-comonads-fd/Makefile
+++ b/math/hs-comonads-fd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= comonads-fd
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 2c8d500e5d84..3b0d1da1ff1f 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -2,6 +2,7 @@
PORTNAME= contravariant
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index b2cfe132cbdd..a8e5df3c9ec4 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens-template
PORTVERSION= 2.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index c15785b9570b..8a578aca869d 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-lens
PORTVERSION= 2.10.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 833163d382e5..bb5d253f50f3 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -2,6 +2,7 @@
PORTNAME= distributive
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index f6e4be182050..99c6bb992366 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,5 @@ COMMENT= The error function, erf, and friends for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile
index 2ded1df0b287..f5ced05b8966 100644
--- a/math/hs-groupoids/Makefile
+++ b/math/hs-groupoids/Makefile
@@ -2,7 +2,7 @@
PORTNAME= groupoids
PORTVERSION= 3.0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index c91cc6288786..f18a889b06b1 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ieee754
PORTVERSION= 0.7.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index c6d2b9d3872b..069b40480cb9 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -3,6 +3,7 @@
PORTNAME= math-functions
PORTVERSION= 0.1.3.0
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= Special mathematical functions and Chebyshev polynomials
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= erf>=2 vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index 7865c5c0dcbd..a2daba98958a 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mwc-random
PORTVERSION= 0.12.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-nats/Makefile b/math/hs-nats/Makefile
index 81b7f08d7e63..b7db273d275f 100644
--- a/math/hs-nats/Makefile
+++ b/math/hs-nats/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nats
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index e9c3856d54c0..e512e527d234 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pointed
PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 9a245b43106b..a8cb256167cf 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -3,14 +3,13 @@
PORTNAME= probability
PORTVERSION= 0.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Probabilistic Functional Programming
LICENSE= BSD
-FILE_LICENSE= COPYRIGHT
USE_CABAL= random>=1.0 transformers>=0.0.1 utility-ht>=0.0.6
diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile
index ba64da80dd58..ec193c5b44e1 100644
--- a/math/hs-semigroupoid-extras/Makefile
+++ b/math/hs-semigroupoid-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= semigroupoid-extras
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index 8e47f38a201b..86769c30fad8 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -2,7 +2,7 @@
PORTNAME= semigroupoids
PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 2256a2dbd383..77369c9718d4 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.9
+PORTVERSION= 0.9.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index e596f3bf24f4..f79856f2898a 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.9.tar.gz) = 2041f8e2abbf4098551e8980862e034dd586caba46b8f67deef7fd94a9949e33
-SIZE (cabal/semigroups-0.9.tar.gz) = 9450
+SHA256 (cabal/semigroups-0.9.1.tar.gz) = b8fbf8c6279dea64a0e332f82b845213ca790ea2b2305cbfb67d25ee000a89c4
+SIZE (cabal/semigroups-0.9.1.tar.gz) = 9556
diff --git a/math/hs-semigroups/pkg-descr b/math/hs-semigroups/pkg-descr
index a39777336d68..9d25811291c6 100644
--- a/math/hs-semigroups/pkg-descr
+++ b/math/hs-semigroups/pkg-descr
@@ -1,4 +1,4 @@
-Haskell 98 semigroups In mathematics, a semigroup is an algebraic structure
+Haskell 98 semigroups. In mathematics, a semigroup is an algebraic structure
consisting of a set together with an associative binary operation. A
semigroup generalizes a monoid in that there might not exist an identity
element. It also (originally) generalized a group (a monoid with all
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 985dc499bb6d..70a67c4dee13 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,18 +2,16 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.10.2.0
-PORTREVISION= 2
+PORTVERSION= 0.10.3.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library of statistical types, data, and functions
+COMMENT= Library of statistical types, data, and functions
LICENSE= BSD
-USE_CABAL= erf math-functions>=0.1.1 monad-par>=0.1.0.1 \
- mwc-random>=0.11.0.0 primitive>=0.3 vector>=0.7.1 \
- vector-algorithms>=0.4
+USE_CABAL= erf math-functions>=0.1.2 monad-par>=0.3.4 mwc-random>=0.11.0.0 \
+ primitive>=0.3 vector>=0.7.1 vector-algorithms>=0.4
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR}
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 40dda681ee09..25c293f98ad0 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/statistics-0.10.2.0.tar.gz) = 3ddd3c99ffb8cf9ac44e9fd9119bb5418502404d20444b58c2aa8a12177460eb
-SIZE (cabal/statistics-0.10.2.0.tar.gz) = 58362
+SHA256 (cabal/statistics-0.10.3.1.tar.gz) = 1a98a923c37850b16d85e1a6bb0dc315068241d58c736032b314c7ac3b764b89
+SIZE (cabal/statistics-0.10.3.1.tar.gz) = 63082
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 14f81263fc53..2d642362bcde 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -3,14 +3,13 @@
PORTNAME= vector-space
PORTVERSION= 0.8.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Vector & affine spaces, linear maps, and derivatives
LICENSE= BSD
-FILE_LICENSE= COPYING
USE_CABAL= Boolean>=0.1.0 MemoTrie>=0.5 NumInstances>=1.0
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
index 8d6a723a5db2..e6432e2d6e0c 100644
--- a/multimedia/hs-gstreamer/Makefile
+++ b/multimedia/hs-gstreamer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.12.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +11,6 @@ COMMENT= Binding to the GStreamer open source multimedia framework
LIB_DEPENDS= gstreamer:${PORTSDIR}/multimedia/gstreamer
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 mtl
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index a70d2bac2add..87c0ad2bdf22 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index 17f98d401856..68421c55ad60 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,6 +2,7 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Obtain the host MAC address on *NIX and Windows
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
index 571fb593743c..98c7df650dd0 100644
--- a/net/hs-network-conduit/Makefile
+++ b/net/hs-network-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= network-conduit
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index a43bd54b3ecf..6ae736b790d4 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-info
PORTVERSION= 0.2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Access the local computer's basic network configuration
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index d66f79a625d5..a000b007cfa9 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= network-multicast
PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 1c8374b3dbe3..690385e0ca71 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network
-PORTVERSION= 2.3.1.0
-PORTREVISION= 1
+PORTVERSION= 2.4.1.2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Low-level networking interface
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_CABAL= parsec>=2.0
+USE_CABAL= parsec>=3.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index bc8e4d138dcc..7649f3a2ef8a 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-2.3.1.0.tar.gz) = d47c7fd9d08575acf9ff76661f9e6c0abf7fcf1280972d419f84b142272fe2ba
-SIZE (cabal/network-2.3.1.0.tar.gz) = 137476
+SHA256 (cabal/network-2.4.1.2.tar.gz) = b04dc56542428bc92f11263f500b3ad82e6a0787805601472d59af7e769bfe38
+SIZE (cabal/network-2.4.1.2.tar.gz) = 140424
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index 05beedcb2581..f8c6dd94a9bd 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,11 +3,11 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A system-independent interface for user-level packet capture
+COMMENT= System-independent interface for user-level packet capture
LICENSE= BSD
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index 3c623f0f87ad..5e6c0c636bbf 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= publicsuffixlist
-PORTVERSION= 0.0.3
+PORTVERSION= 0.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-publicsuffixlist/distinfo b/net/hs-publicsuffixlist/distinfo
index d043640385e9..17b7e8d0cb88 100644
--- a/net/hs-publicsuffixlist/distinfo
+++ b/net/hs-publicsuffixlist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/publicsuffixlist-0.0.3.tar.gz) = 9161ef67b0d52a590f70d5a9ff9b3fcb90cefe7b2319e07f4ec280717fa83ab7
-SIZE (cabal/publicsuffixlist-0.0.3.tar.gz) = 36122
+SHA256 (cabal/publicsuffixlist-0.1.tar.gz) = b37fbe099748e2a3a5a3b6661911d72749c2ec24d88ee686ae125de91fac7955
+SIZE (cabal/publicsuffixlist-0.1.tar.gz) = 72704
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 0f00f79b652e..5779ff54cb8b 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,15 +2,14 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A portable sendfile library
+COMMENT= Portable sendfile library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= network>=2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index adf21643a16d..a5bbe500668b 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -2,6 +2,7 @@
PORTNAME= simple-sendfile
PORTVERSION= 0.2.11
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Cross-platform library for the sendfile() system call
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index a60bb8c9f370..a5a39adbbc8c 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= socks
-PORTVERSION= 0.5.0
+PORTVERSION= 0.5.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Socks proxy (version 5) implementation
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.3.1 network>=2.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-socks/distinfo b/net/hs-socks/distinfo
index 37bd784a1490..04a0707d1664 100644
--- a/net/hs-socks/distinfo
+++ b/net/hs-socks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/socks-0.5.0.tar.gz) = 47e3dd9c8d0cf6bbde2c01db428c345b70cc3e7e1ac484fef9b61855faf666d2
-SIZE (cabal/socks-0.5.0.tar.gz) = 7306
+SHA256 (cabal/socks-0.5.1.tar.gz) = 5e012550f7aa732a2b9a68bd69606a8c92ebcb04f45461715312aa49df5cfc23
+SIZE (cabal/socks-0.5.1.tar.gz) = 7917
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 6adc55459629..ecbd3912b62f 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
@@ -11,8 +11,7 @@ COMMENT= FreeBSD ports index search and statistical analysis tool
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_CABAL= stringsearch
+USE_CABAL= extensible-exceptions stringsearch
EXECUTABLE= porte
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index bea0e5cc260a..1ecffa665643 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hscolour
PORTVERSION= 1.20.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= print haskell
@@ -11,9 +11,6 @@ MAINTAINER= haskell@FreeBSD.org
COMMENT= Colourise Haskell code
LICENSE= GPLv2
-FILE_LICENSE= LICENCE-GPL
-
-CABAL_SETUP= Setup.hs
EXECUTABLE= HsColour
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index 09b6caf80e80..2d685b87f086 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -3,16 +3,14 @@
PORTNAME= bio
PORTVERSION= 0.5.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A bioinformatics library
+COMMENT= Bioinformatics library
LICENSE= LGPL21
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl parallel parsec QuickCheck>=2 tagsoup>=0.8
EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe
diff --git a/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs b/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs
new file mode 100644
index 000000000000..6f83130df055
--- /dev/null
+++ b/science/hs-bio/files/patch-Bio__GFF3__FeatureHierSequences.hs
@@ -0,0 +1,19 @@
+--- ./Bio/GFF3/FeatureHierSequences.hs.orig 2012-02-23 14:45:38.000000000 +0100
++++ ./Bio/GFF3/FeatureHierSequences.hs 2013-05-01 00:28:58.000000000 +0200
+@@ -15,6 +15,7 @@
+ import qualified Data.Map as M
+ import Data.Maybe
+ import qualified Data.Set as S
++import System.IO.Error (catchIOError)
+
+ import Bio.Sequence.SeqData
+ import Bio.Sequence.Fasta
+@@ -72,7 +73,7 @@
+ return $ Seq seqname sequ Nothing
+
+ catchIOErrors :: IO a -> ErrorT String IO a
+-catchIOErrors m = ErrorT { runErrorT = liftM Right m `catch` (return . Left . show) }
++catchIOErrors m = ErrorT { runErrorT = liftM Right m `catchIOError` (return . Left . show) }
+
+ runGFF :: FilePath -> (ErrorT String (Reader FeatureHierSequences) a) -> ErrorT String IO a
+ runGFF gffname m = do gff <- catchIOErrors $ LBS.readFile gffname
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index e76aa7381c08..0de525097f0c 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,15 +2,12 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Collects together existing Haskell cryptographic functions
-FILE_LICENSE= ReadMe.tex
-
-CABAL_SETUP= Setup.hs
USE_CABAL= HUnit QuickCheck>=2.4.0.1 random
EXECUTABLE= HMACTest QuickTest RSATest SHA1Test SymmetricTest WordListTest
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 1ddeb27c34ce..7cb8edee4950 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -2,16 +2,12 @@
PORTNAME= HsOpenSSL
PORTVERSION= 0.10.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= (Incomplete) OpenSSL binding for Haskell
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
-
USE_CABAL= network>=2.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 177943f0601f..ccf5695fc11a 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= RSA
PORTVERSION= 1.2.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Implementation of RSA, using the padding schemes of PKCS#1 v2.1
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 monadcryptorandom SHA
OPTIONS_DEFINE= MD5 BINARY
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index f1a57712da6c..7d8072766ccd 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SHA
PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Implementations of the SHA suite of message digest functions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
OPTIONS_DEFINE= EXE
EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index cc33a5fbbad9..2b89576e8888 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= certificate
-PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTVERSION= 1.3.7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,10 @@ COMMENT= Certificates and Key Reader/Writer
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.1 cryptohash mtl \
- pem>=0.1
+USE_CABAL= asn1-data>=0.7.1 crypto-pubkey-types>=0.3 cryptohash \
+ mtl pem>=0.1
OPTIONS_DEFINE= EXECUTABLE
-OPTIONS_DEFAULT=
EXECUTABLE_DESC= Build the executable
diff --git a/security/hs-certificate/distinfo b/security/hs-certificate/distinfo
index d910b20d8ff2..1f3f5e59b819 100644
--- a/security/hs-certificate/distinfo
+++ b/security/hs-certificate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/certificate-1.3.5.tar.gz) = 92c45aa27bfef07d54fe10452f52becd823fb5348b3c29d1143ea1153d55e29d
-SIZE (cabal/certificate-1.3.5.tar.gz) = 14931
+SHA256 (cabal/certificate-1.3.7.tar.gz) = cae38c57ebd2a10fe6d03e37ec24690823da4ef67b1f2cba572fa0718b9a4e1b
+SIZE (cabal/certificate-1.3.7.tar.gz) = 15009
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index ee301518616f..71ae248a28a7 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cipher-aes
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= Fast AES cipher implementation with advanced mode of operations
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
index 63642e31e1d0..19f343704feb 100644
--- a/security/hs-cipher-aes/distinfo
+++ b/security/hs-cipher-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-aes-0.1.7.tar.gz) = cf7ab769b4d1773246e482b046a4ce409b6945e71db04d7d55d9f59d094b51c5
-SIZE (cabal/cipher-aes-0.1.7.tar.gz) = 27614
+SHA256 (cabal/cipher-aes-0.1.8.tar.gz) = ae87a9f7cd198745a931a8285a3681fdc42216ac450857cd5ba983ba5492359c
+SIZE (cabal/cipher-aes-0.1.8.tar.gz) = 27629
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index 967f3f50ec56..6b234d126470 100644
--- a/security/hs-cipher-rc4/Makefile
+++ b/security/hs-cipher-rc4/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cipher-rc4
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= Fast RC4 cipher implementation
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index aa4c7b968975..0cb772bfe445 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= clientsession
-PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTVERSION= 0.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Securely store session data in a client-side cookie
LICENSE= BSD
USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cipher-aes>=0.1.7 \
- cprng-aes>=0.2 crypto-api>=0.8 entropy>=0.2.1 skein>=0.1 \
+ cprng-aes>=0.2 crypto-api>=0.8 entropy>=0.2.1 skein \
tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index 24134ff36c1d..2917c8b58e31 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.8.1.tar.gz) = ed5d1eeff0526f1e66fcdd183d213ee9019064e86c5b786ceda3ee09497598f4
-SIZE (cabal/clientsession-0.8.1.tar.gz) = 7089
+SHA256 (cabal/clientsession-0.9.tar.gz) = 080ccd716ac69be49466480bd4133d712ef44e724c3292003f32ecfd3719dc33
+SIZE (cabal/clientsession-0.9.tar.gz) = 7082
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index d805d5a86556..f8b13d4b99c7 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Crypto Pseudo Random Number Generator using AES
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cipher-aes>=0.1 crypto-api>=0.8 crypto-random-api>=0.2 \
entropy>=0.2 random
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index 6be8bb425b44..357619f65a90 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-api
-PORTVERSION= 0.11
+PORTVERSION= 0.12.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Generic interface for cryptographic operations
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.2 entropy tagged>=0.1 transformers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-crypto-api/distinfo b/security/hs-crypto-api/distinfo
index 63391f73a59b..30dc35701977 100644
--- a/security/hs-crypto-api/distinfo
+++ b/security/hs-crypto-api/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-api-0.11.tar.gz) = 3e563725a0fa6f4dcaa238e2b3413e420f0684e264fc5bcbca0b75466a6d82ec
-SIZE (cabal/crypto-api-0.11.tar.gz) = 15684
+SHA256 (cabal/crypto-api-0.12.1.tar.gz) = 03a0b5160bbd8b227d21dacbcb5338dab558799d08b6294a30ad298378f63974
+SIZE (cabal/crypto-api-0.12.1.tar.gz) = 45241
diff --git a/security/hs-crypto-api/pkg-descr b/security/hs-crypto-api/pkg-descr
index c8b4a72f7dd2..be08ae5868df 100644
--- a/security/hs-crypto-api/pkg-descr
+++ b/security/hs-crypto-api/pkg-descr
@@ -6,4 +6,4 @@ the Classes module. Any concepts or functions of general use to more
than one cryptographic algorithm (ex: padding) is within scope of this
package.
-WWW: http://trac.haskell.org/crypto-api/wiki
+WWW: https://github.com/TomMD/crypto-api
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 832fc819d6ad..09ae2e807780 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-conduit
-PORTVERSION= 0.5.0
+PORTVERSION= 0.5.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Conduit interface for cryptographic operations (from crypto-api)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.3 conduit>=1.0 crypto-api>=0.9 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index 6c4646801884..667d42340d9f 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.5.0.tar.gz) = 22a9e41f52e4878e386c13ad6a74f860f1602b6fee778da5f31c70820e158e56
-SIZE (cabal/crypto-conduit-0.5.0.tar.gz) = 6853
+SHA256 (cabal/crypto-conduit-0.5.2.tar.gz) = 7f4d22462f0444eb2eec61b5f284309d0ab35a592f698f0f36b4dba444e69859
+SIZE (cabal/crypto-conduit-0.5.2.tar.gz) = 6809
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index fdf937307fef..5235b8ab9519 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-numbers
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Cryptographic numbers: functions and algorithms
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= crypto-random-api>=0.2 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index b35982e6df7a..667727318c30 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-pubkey-types
-PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTVERSION= 0.3.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Generic cryptography Public keys algorithm types
LICENSE= BSD
-CABAL_SETUP= Setup.hs
+USE_CABAL= asn1-types>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index 6f1057c42934..30a0b45c22f2 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-types-0.2.0.tar.gz) = b82746801c1bba43173bf26f609245b70111fde6b3d77826b7ce85caba9f3fab
-SIZE (cabal/crypto-pubkey-types-0.2.0.tar.gz) = 2364
+SHA256 (cabal/crypto-pubkey-types-0.3.2.tar.gz) = 50f4b808577a175f4787ea396fd01ffd38216dcffb4fb9f7208265242be9ff89
+SIZE (cabal/crypto-pubkey-types-0.3.2.tar.gz) = 9620
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index b03b57016429..90227e96e712 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-pubkey
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,7 @@ COMMENT= Public Key cryptography
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= crypto-numbers crypto-pubkey-types>=0.2 crypto-random-api>=0.2 \
+USE_CABAL= crypto-numbers crypto-pubkey-types>=0.3 crypto-random-api>=0.2 \
cryptohash>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-crypto-pubkey/distinfo b/security/hs-crypto-pubkey/distinfo
index 544f2ec266a3..444e4efb0d7b 100644
--- a/security/hs-crypto-pubkey/distinfo
+++ b/security/hs-crypto-pubkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-0.1.2.tar.gz) = 455b4893d8870829dece447710b073507b70e58daaae685b421b64200f2d5cd1
-SIZE (cabal/crypto-pubkey-0.1.2.tar.gz) = 38610
+SHA256 (cabal/crypto-pubkey-0.1.3.tar.gz) = 0ff0a9134bb42869dc370eb1aaed1105890538f5c01b2f0e3e5bbc7a3e658b94
+SIZE (cabal/crypto-pubkey-0.1.3.tar.gz) = 38692
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index 2ce742435ce2..66a2a72e3011 100644
--- a/security/hs-crypto-random-api/Makefile
+++ b/security/hs-crypto-random-api/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crypto-random-api
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Simple random generators API for cryptography related code
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= entropy
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index cd8d4f0dd2e5..815decca1f8d 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cryptocipher
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,8 @@ COMMENT= Symmetrical Block, Stream, and PubKey Ciphers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal cipher-aes cipher-rc4 cpu>=0.1 crypto-api>=0.5 \
- crypto-pubkey-types>=0.2 primitive tagged vector>=0.7
+ primitive vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cryptocipher/distinfo b/security/hs-cryptocipher/distinfo
index 6121358ba7bf..118c8ec0c2b3 100644
--- a/security/hs-cryptocipher/distinfo
+++ b/security/hs-cryptocipher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptocipher-0.4.0.tar.gz) = c061b8ccca31cbf5601f98081c557d9ab223e38a5a582d0c3c365effd78776e1
-SIZE (cabal/cryptocipher-0.4.0.tar.gz) = 33337
+SHA256 (cabal/cryptocipher-0.5.0.tar.gz) = cd0a034c92c82574623c240b68376884ed5b1e1181a4671302e90d3f84d7f899
+SIZE (cabal/cryptocipher-0.5.0.tar.gz) = 20249
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 31eb52b16611..0a21e721c96d 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cryptohash
-PORTVERSION= 0.8.3
-PORTREVISION= 1
+PORTVERSION= 0.9.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,6 @@ COMMENT= Collection of crypto hashes, fast, pure, and practical
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.2 crypto-api>=0.5 tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-cryptohash/distinfo b/security/hs-cryptohash/distinfo
index b9e61666986d..1150ec1ff0b6 100644
--- a/security/hs-cryptohash/distinfo
+++ b/security/hs-cryptohash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cryptohash-0.8.3.tar.gz) = 6263bc5df13e463430a6a31e10f4ff64b0652dd8c4c013e1aa50c448d95a98b9
-SIZE (cabal/cryptohash-0.8.3.tar.gz) = 64654
+SHA256 (cabal/cryptohash-0.9.0.tar.gz) = f4e8e41f35303f58ed2ad9f9a7b683c0055617ac2bd9fa0ec363fc3bd0cdff46
+SIZE (cabal/cryptohash-0.9.0.tar.gz) = 65000
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index f9fa7ae794b5..8466947963e9 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,7 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Various cryptographic hashes for Bytestrings
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index b74775d03caf..4cfbe61f9138 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= entropy
PORTVERSION= 0.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Platform-independent entropy source
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index f09f1185877c..d0d176bb15ba 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -2,6 +2,7 @@
PORTNAME= monadcryptorandom
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 8170c0343ef9..095fe7c34f12 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Privacy Enhanced Mail (PEM) format reader and writer
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec base64-bytestring cereal mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index 301c1185c530..2c56eda51605 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,11 +2,11 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell-only implementation of MD5 digest (hash) yalgorithm
+COMMENT= Haskell-only implementation of MD5 digest (hash) yalgorithm
LICENSE= BSD
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 7217c6f631a4..574739442d43 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Secure password storage
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index fd6922a5edbf..1921e12735c6 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 0.1.0.12
+PORTVERSION= 1.0.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Skein, a family of cryptographic hash functions
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.3 crypto-api>=0.6 tagged>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index 22dcbe54132c..ccdca7112296 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-0.1.0.12.tar.gz) = 6abc01432df1fe290a46b18dbf21383a3b03af123672780f93b4fee34153a0db
-SIZE (cabal/skein-0.1.0.12.tar.gz) = 117780
+SHA256 (cabal/skein-1.0.3.tar.gz) = 55cd57e5c102ca263bbf4acca1375d47cb1da6a366efa5967f4d72c87df37f97
+SIZE (cabal/skein-1.0.3.tar.gz) = 118432
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index 37d6e3cd5d01..19204293de6f 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tls-extra
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= TLS extra default values and helpers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= certificate>=1.3.5 cipher-aes>=0.1 cipher-rc4 crypto-pubkey \
crypto-random-api cryptohash>=0.6 mtl network>=2.3 \
pem>=0.1.0 text>=0.5 tls>=1.1.0 vector
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 10345ddb1947..ec2cfc4cb018 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tls
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= TLS/SSL protocol native implementation (Server and Client)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-pubkey \
crypto-random-api>=0.2 cryptohash>=0.6 mtl network
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 3d3a0c2d4550..2fd5175feaf3 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= angel
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Process management and supervision daemon
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= configurator>=0.1 MissingH mtl stm>=2.0 text>=0.11 \
unordered-containers>=0.1.4
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index 59ee49030248..13c00d1aad0d 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Cpu information and properties helpers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile
index 5758c4edfabf..2ebe1c9a1de0 100644
--- a/textproc/bibutils/Makefile
+++ b/textproc/bibutils/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for: bibutils
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= bibutils
-PORTVERSION= 4.12
+PORTVERSION= 5.0
CATEGORIES= textproc
-MASTER_SITES= http://www.scripps.edu/~cdputnam/software/bibutils/
+MASTER_SITES= SF/${PORTNAME}/
+
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
EXTRACT_SUFX= .tgz
@@ -21,14 +17,18 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
-post-patch:
- @${REINPLACE_CMD} 's|make |gmake |g' \
- ${WRKSRC}/Makefile_start
-
do-configure:
@cd ${WRKSRC} && ./configure --install-dir ${PREFIX}/bin
test: all
cd ${WRKSRC}/test && ${GMAKE} all test
+BINARIES= bib2xml biblatex2xml copac2xml ebi2xml end2xml endx2xml \
+ isi2xml med2xml modsclean ris2xml wordbib2xml xml2ads \
+ xml2bib xml2end xml2isi xml2ris xml2wordbib
+
+.for binary in ${BINARIES}
+PLIST_FILES+= bin/${binary}
+.endfor
+
.include <bsd.port.mk>
diff --git a/textproc/bibutils/distinfo b/textproc/bibutils/distinfo
index 0665ded962fb..e4ee4a233c59 100644
--- a/textproc/bibutils/distinfo
+++ b/textproc/bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bibutils_4.12_src.tgz) = 2b19875f9a525350e0a7ca5f3b95a1408fb3530fac11276d42e0b2e6c0dfe648
-SIZE (bibutils_4.12_src.tgz) = 816430
+SHA256 (bibutils_5.0_src.tgz) = 0a3f1dfc8f3ee98c2f6507e68358678fe355c5a3b3d0157dcab5d4fa2e6c662b
+SIZE (bibutils_5.0_src.tgz) = 458532
diff --git a/textproc/bibutils/files/patch-Makefile_start b/textproc/bibutils/files/patch-Makefile_start
deleted file mode 100644
index 9403ddd7000e..000000000000
--- a/textproc/bibutils/files/patch-Makefile_start
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./Makefile_start.orig 2010-10-10 19:42:50.000000000 +0200
-+++ ./Makefile_start 2011-07-31 01:06:08.000000000 +0200
-@@ -1,6 +1,6 @@
- POSTFIX=REPLACE_POSTFIX
--CC = REPLACE_CC
--RANLIB=REPLACE_RANLIB
-+%%SET_CC%%
-+%%SET_RANLIB%%
- INSTALLDIR=REPLACE_INSTALLDIR
- LIBINSTALLDIR=REPLACE_LIBINSTALLDIR
-
-@@ -12,8 +12,8 @@
- xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean
-
- all : FORCE
-- cd lib; make -k $(CC) -k $(RANLIB); cd ..
-- cd bin; make -k $(CC) -k VERSION="$(VERSION)" -k DATE="$(DATE)"; cd ..
-+ cd lib; make ; cd ..
-+ cd bin; make VERSION="$(VERSION)" DATE="$(DATE)"; cd ..
-
- clean: FORCE
- cd lib ; make clean ; cd ..
-@@ -31,11 +31,12 @@
- cd bin ; make test; cd ..
-
- install: all FORCE
-- cd lib ; make -k LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
-+ cd lib ; make LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
- sed 's/VERSION/${VERSION}/g' packageconfig_start > lib/bibutils.pc
- @for p in ${PROGRAMS}; \
- do ( cp bin/$$p ${INSTALLDIR}/$$p ); \
- done
-+ cp lib/libbibutils.a ${INSTALLDIR}/../lib
-
- package: all FORCE
- csh -f maketgz.csh ${VERSION} ${POSTFIX}
diff --git a/textproc/bibutils/files/patch-bin__Makefile b/textproc/bibutils/files/patch-bin__Makefile
deleted file mode 100644
index 041aa21928e5..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.orig 2010-10-10 19:49:05.000000000 +0200
-+++ ./bin/Makefile 2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LIBDIR = -L../lib
-
- TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-bin__Makefile.dynamic b/textproc/bibutils/files/patch-bin__Makefile.dynamic
deleted file mode 100644
index fafe20bac3d2..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.dynamic
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.dynamic.orig 2010-10-10 19:07:17.000000000 +0200
-+++ ./bin/Makefile.dynamic 2011-07-31 01:05:18.000000000 +0200
-@@ -4,7 +4,7 @@
- # dynamic linkage version
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LDFLAGS = -L ../lib
- LDLIBS = -lbibutils
-
diff --git a/textproc/bibutils/files/patch-bin__Makefile.static b/textproc/bibutils/files/patch-bin__Makefile.static
deleted file mode 100644
index ab69b1a81e23..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.static
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.static.orig 2010-10-08 01:57:09.000000000 +0200
-+++ ./bin/Makefile.static 2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LIBDIR = -L../lib
-
- TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-configure b/textproc/bibutils/files/patch-configure
index 8de3874cff3d..c0b5f708301b 100644
--- a/textproc/bibutils/files/patch-configure
+++ b/textproc/bibutils/files/patch-configure
@@ -1,13 +1,11 @@
---- ./configure.orig 2010-10-10 19:38:32.000000000 +0200
-+++ ./configure 2011-07-31 01:05:18.000000000 +0200
-@@ -153,8 +153,8 @@
- endif
-
- cat $INPUT_FILE | \
--sed "s/REPLACE_CC/CC=${CC}/" | \
--sed "s/REPLACE_RANLIB/RANLIB=${RANLIB}/" | \
-+sed "s/%%SET_CC%%/CC?=${CC}/" | \
-+sed "s/%%SET_RANLIB%%/RANLIB?=${RANLIB}/" | \
- sed "s|REPLACE_INSTALLDIR|${INSTALLDIR}|" | \
- sed "s|REPLACE_LIBINSTALLDIR|${LIBINSTALLDIR}|" | \
- sed "s/REPLACE_POSTFIX/${POSTFIX}/" > $OUTPUT_FILE
+--- ./configure.orig 2013-05-28 07:21:47.000000000 +0200
++++ ./configure 2013-06-03 01:00:10.000000000 +0200
+@@ -247,7 +247,7 @@
+ RANLIB='ranlib'
+ POSTFIX='_netbsd'
+ elif [ "$type" = "FreeBSD" ] ; then
+- CC='gcc'
++ CC='cc'
+ CFLAGS='-Wall'
+ if [ "$LIBTYPE" = "dynamic" ] ; then
+ CLIBFLAGS='-Wall -fPIC'
diff --git a/textproc/bibutils/files/patch-lib__Makefile.static b/textproc/bibutils/files/patch-lib__Makefile.static
deleted file mode 100644
index b37dfc308f13..000000000000
--- a/textproc/bibutils/files/patch-lib__Makefile.static
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./lib/Makefile.static.orig 2010-10-08 01:57:00.000000000 +0200
-+++ ./lib/Makefile.static 2011-07-31 01:05:18.000000000 +0200
-@@ -1,5 +1,5 @@
- #CC = gcc -Wall
--RANLIB = echo
-+#RANLIB = echo
-
- SIMPLE_OBJS = is_ws.o strsearch.o charsets.o
-
-@@ -31,12 +31,10 @@
- all: libbibcore.a libbibutils.a
-
- libbibcore.a: $(BIBCORE_OBJS)
-- ar -cr $@ $^
-- $(RANLIB) $@
-+ $(AR) -cr $@ $^
-
- libbibutils.a: $(BIBUTILS_OBJS)
-- ar -cr $@ $^
-- $(RANLIB) $@
-+ $(AR) -cr $@ $^
-
- clean:
- /bin/rm -f *.o core
diff --git a/textproc/bibutils/pkg-descr b/textproc/bibutils/pkg-descr
index 7aa3e4f84efd..b91ce0091214 100644
--- a/textproc/bibutils/pkg-descr
+++ b/textproc/bibutils/pkg-descr
@@ -5,4 +5,4 @@ RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N
programs are required and not N^2-N. These programs operate on the
command line and are styled after standard UNIX-like filters.
-WWW: http://www.scripps.edu/~cdputnam/software/bibutils/
+WWW: http://sourceforge.net/p/bibutils/home/Bibutils/
diff --git a/textproc/bibutils/pkg-plist b/textproc/bibutils/pkg-plist
deleted file mode 100644
index 3813820ebbd6..000000000000
--- a/textproc/bibutils/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-bin/bib2xml
-bin/biblatex2xml
-bin/copac2xml
-bin/ebi2xml
-bin/end2xml
-bin/endx2xml
-bin/isi2xml
-bin/med2xml
-bin/modsclean
-bin/ris2xml
-bin/wordbib2xml
-bin/xml2ads
-bin/xml2bib
-bin/xml2end
-bin/xml2isi
-bin/xml2ris
-bin/xml2wordbib
-lib/libbibutils.a
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 011fbefe37a2..280bcf5e5cf3 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Diff
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 2fd545d3dcbc..1c7b04df5b8e 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= HStringTemplate
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index f6bc34bbd443..4e0b08251324 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,18 +2,15 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.23.3
-PORTREVISION= 2
+PORTVERSION= 1.24
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of utilities for using Haskell and XML together
+COMMENT= Collection of utilities for using Haskell and XML together
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-CABAL_SETUP= Setup.hs
-USE_CABAL= polyparse>=1.5 random
+USE_CABAL= polyparse>=1.9 random
EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \
MkOneOf Validate XsdToHaskell Xtract
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index a3522caffe99..a3c48a69d916 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.23.3.tar.gz) = 0fe925a45f78ca87e197c8ac98976b0dd9737f56d2f9ac415b298287b6dce3be
-SIZE (cabal/HaXml-1.23.3.tar.gz) = 146596
+SHA256 (cabal/HaXml-1.24.tar.gz) = b6f9b147f80dbac04b11633d0bd9309c7ce9d2b0cff67b83086212a4f0567ba2
+SIZE (cabal/HaXml-1.24.tar.gz) = 143107
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index c8514302d444..9f6e41155682 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-conduit
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
index c5e4a7c58361..8d87d383a715 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-1.0.0.tar.gz) = 68c50163ab30c614d8d2fe125d332812e693548ceac1af4cbbbc43ce703880ab
-SIZE (cabal/attoparsec-conduit-1.0.0.tar.gz) = 3761
+SHA256 (cabal/attoparsec-conduit-1.0.1.tar.gz) = e55d67165e53a5d228e6f863be1d78b31052a6ccb0791905eae16da94bf56691
+SIZE (cabal/attoparsec-conduit-1.0.1.tar.gz) = 4237
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 78b2f004a3c2..bc73b5705c4e 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,16 +2,14 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pass input from an enumerator to an Attoparsec parser
LICENSE= MIT
-FILE_LICENSE= license.txt
-CABAL_SETUP= Setup.hs
USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index c10b051905a3..98fc7f3213a3 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec
PORTVERSION= 0.10.4.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 85a4f5734dd3..49ef0c39c43e 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.6.0.0
+PORTVERSION= 0.6.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A blazingly fast HTML combinator library for Haskell
+COMMENT= Blazingly fast HTML combinator library for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.5.1 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 3262656819f1..405d372eb92a 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.6.0.0.tar.gz) = 94b6927d5a268fccc5156e0e9f1a54a800f2da20174ab4bcbb49684675bd1259
-SIZE (cabal/blaze-html-0.6.0.0.tar.gz) = 77780
+SHA256 (cabal/blaze-html-0.6.1.1.tar.gz) = 2cafc98ccbb3b9dc9c444ae306337b2aa7fd0be54b650bf208a656a8f6acee23
+SIZE (cabal/blaze-html-0.6.1.1.tar.gz) = 77759
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 78c8bebc81f7..9a4f15bdf705 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.4
+PORTVERSION= 0.5.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Blazingly fast markup combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index d8c2ac50968f..f10c9b261512 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.4.tar.gz) = 39933d9b6f966c2f08ae72bc00142aa44277d50866240e90f166fb332136613c
-SIZE (cabal/blaze-markup-0.5.1.4.tar.gz) = 11889
+SHA256 (cabal/blaze-markup-0.5.1.5.tar.gz) = e4d034560e6808c5fdb8ca2eeef0031f3caff5398ba4fee72a049eea43ad7a3c
+SIZE (cabal/blaze-markup-0.5.1.5.tar.gz) = 11885
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index a092b092d08e..4189767edfcf 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index cd88aaf4f642..166b8e8fb7f0 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.0
+PORTVERSION= 1.0.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 5b7543ed72c9..4845ef4e792c 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.0.tar.gz) = f323b4b486523a1778841c1c5d0917a1dfd7dca68298dc8a022341efcb3a83f4
-SIZE (cabal/case-insensitive-1.0.tar.gz) = 4772
+SHA256 (cabal/case-insensitive-1.0.0.2.tar.gz) = c2952ea7e2fe052c5f8fc07d2cded328c50cb3282006d9a276d7f8101eff8c85
+SIZE (cabal/case-insensitive-1.0.0.2.tar.gz) = 4803
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 1626e64cfa2d..48ee3d2f423b 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -2,10 +2,11 @@
PORTNAME= citeproc-hs
PORTVERSION= 0.3.8
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Citation Style Language implementation in Haskell
+COMMENT= Citation Style Language implementation in Haskell
LICENSE= BSD
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 4d7f8ef5e81f..67e9cc80de73 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,16 +3,14 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A CSV library for Haskell
+COMMENT= CSV library for Haskell
LICENSE= MIT
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 4b5b8647d571..8e66f527ed60 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,6 +2,7 @@
PORTNAME= double-conversion
PORTVERSION= 0.2.0.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index a5a680dd9b87..fd4ee0605a82 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= feed
PORTVERSION= 0.3.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= utf8-string xml>=1.2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 42e4ac97e2fa..bd2e47cd87ea 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hexpat
PORTVERSION= 0.20.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,8 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD
-USE_CABAL= List>=0.4.2 text>=0.5 transformers utf8-string
+USE_CABAL= extensible-exceptions>=0.1 List>=0.4.2 text>=0.5 transformers \
+ utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index aa73b37bf36f..85851c3e6020 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.3.8
+PORTVERSION= 0.5.3.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index b55f6b5c5f71..f7f16086c03d 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.8.tar.gz) = 5ca00f73773b1638bbbdae736d41c889d3f971dbdfbfacdf7ab5001e21afafb9
-SIZE (cabal/highlighting-kate-0.5.3.8.tar.gz) = 661579
+SHA256 (cabal/highlighting-kate-0.5.3.9.tar.gz) = 0ca2abc648da30cebfffcdf22140a380df3c5d98c80984bf97ee416c351a1395
+SIZE (cabal/highlighting-kate-0.5.3.9.tar.gz) = 662621
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index dcc2b1efb266..f4b2f85ccd63 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 4.17
+PORTVERSION= 5.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Bindings to bibutils, the bibliography conversion utilities
LICENSE= GPLv2
-BUILD_DEPENDS= bibutils>=4.9:${PORTSDIR}/textproc/bibutils
-RUN_DEPENDS= bibutils>=4.9:${PORTSDIR}/textproc/bibutils
+BUILD_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
+RUN_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
USE_CABAL= syb
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 34cf13114ce9..5ee776de4369 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.17.tar.gz) = aff139a7f589d71ebbaa918f9e1be55a0f2d1d5378f77db9b36171bebac6616f
-SIZE (cabal/hs-bibutils-4.17.tar.gz) = 443548
+SHA256 (cabal/hs-bibutils-5.0.tar.gz) = 54403646b4530649e9a48b01f0d23818566d62691c651ba4ff9889278c85eca1
+SIZE (cabal/hs-bibutils-5.0.tar.gz) = 428490
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index ac1efd772553..f2eb8265c076 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= html-conduit
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \
system-filepath>=0.4 tagstream-conduit>=0.4 text \
transformers xml-conduit>=1.1 xml-types>=0.3
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index b85292a2c042..d31b4558d292 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= HTML combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 41885e1f8f6a..ba3fa083c822 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,13 +2,11 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Character properties and classes for XML and Unicode
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 59e74dae053d..8e74814022d2 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hxt-charproperties>=9 parsec>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 9653f138b360..45f9be00d2b1 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,14 +2,12 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unicode functions for UTF-8, iso-latin-* and other encodings
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hxt-charproperties>=9
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index f61ae640769a..de24e47974d2 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,11 +2,11 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of tools for processing XML with Haskell
+COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
diff --git a/textproc/hs-hxt/files/patch-hxt.cabal b/textproc/hs-hxt/files/patch-hxt.cabal
deleted file mode 100644
index 1ce1d1ce667e..000000000000
--- a/textproc/hs-hxt/files/patch-hxt.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./hxt.cabal.orig 2012-09-26 12:02:16.000000000 +0200
-+++ ./hxt.cabal 2012-10-20 00:32:05.000000000 +0200
-@@ -182,7 +182,7 @@
- parsec >= 2.1 && < 4,
- HUnit >= 1.2 && < 2,
- mtl >= 2 && < 3,
-- network >= 2.4 && < 3,
-+ network >= 2.3 && < 2.4,
- deepseq >= 1.1 && < 2,
- bytestring >= 0.9 && < 1,
- binary >= 0.5 && < 1,
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index b969a05429a3..beb2689e83b9 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.18.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Preprocessor for typesetting Haskell sources with LaTeX
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl regex-compat
USE_TEX= latex
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 24de02f19f6b..d72c5b525a47 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 1087e1488cb6..17310b0d9902 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -2,15 +2,13 @@
PORTNAME= pandoc-types
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Types for representing a structured document
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= syb
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 539cee27513f..21bd6defcb81 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -3,16 +3,13 @@
PORTNAME= pandoc
PORTVERSION= 1.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Conversion between markup formats
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
@@ -23,6 +20,10 @@ USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
EXECUTABLE= pandoc
+# For PDF generation
+RUN_DEPENDS+= latex-ifluatex>=1.3:${PORTSDIR}/print/latex-ifluatex \
+ ifxetex>=0:${PORTSDIR}/print/ifxetex
+
MAN1= pandoc.1
MAN5= pandoc_markdown.5
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index f0429c329e40..e351d06f0aad 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -2,7 +2,7 @@
PORTNAME= parsec
PORTVERSION= 3.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Monadic parser combinators
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl text>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 065e049af281..5ae3826bf27d 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.8
-PORTREVISION= 3
+PORTVERSION= 1.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A variety of alternative parser combinator libraries
+COMMENT= Variety of alternative parser combinator libraries
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
USE_CABAL= text
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index e025f2d04ad2..b4c0d24ffbb4 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/polyparse-1.8.tar.gz) = 96fbc3ce3c239c6ce566437e17dc98649982e72dc3edcb68ef5ee083b210d922
-SIZE (cabal/polyparse-1.8.tar.gz) = 22223
+SHA256 (cabal/polyparse-1.9.tar.gz) = 9f12d6821594166af881941d6c346a6ad617eae18a0ee8659044ef163694708a
+SIZE (cabal/polyparse-1.9.tar.gz) = 22256
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index a749cc87d7b8..f0de37bcc186 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Interface API for regex-posix,pcre,parsec,tdfa,dfa
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index c2b4deaa5c69..ac432fc1cdbd 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= regex-base>=0.93 regex-posix>=0.95.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 1ccb9ab35ebb..05c5a318fa25 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.5.8.31
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= regex-base>=0.93
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 233428590a16..8ab18d99ecee 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Replaces/enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= regex-base>=0.93
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index 69350b0c8250..57f013d2739d 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -2,13 +2,12 @@
PORTNAME= regex-tdfa
PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl parsec regex-base>=0.93.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 65621a3b2bfc..10d3f62b0ac0 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,16 +3,13 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast searching, splitting and replacing of ByteStrings
LICENSE= BSD
-FILE_LICENSE= LICENCE
-
-CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a87a92a744e0..5bfbd71e1415 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tagsoup
PORTVERSION= 0.12.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ COMMENT= Parsing and extracting information from HTML/XML documents
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= text
INSTALL_PORTDATA= cd ${WRKSRC} && \
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index d7e03be24649..d0e4fcf6e797 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Streamlined HTML tag parser
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \
blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
text transformers>=0.3
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 31c842e6be57..8e4347a524f5 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.6.1.3
+PORTVERSION= 0.6.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Conversion of LaTeX math formulas to MathML or OMML
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
-
USE_CABAL= parsec>=3 syb xml
OPTIONS_DEFINE= CGI
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index b483e2df659c..1a4a212d7b33 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.1.3.tar.gz) = 0570c4feae01905b64656b03aeb6d0fdb7ebbc4968fcc3774b35532e939a50b8
-SIZE (cabal/texmath-0.6.1.3.tar.gz) = 43978
+SHA256 (cabal/texmath-0.6.1.5.tar.gz) = 888cca454fc585272ed5fa41711943250f76efebbff302534d02c349409c9d95
+SIZE (cabal/texmath-0.6.1.5.tar.gz) = 43225
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index cab760be4e19..5b9c61cd8f9c 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -2,15 +2,13 @@
PORTNAME= xhtml
PORTVERSION= 3000.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An XHTML combinator library
+COMMENT= XHTML combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 0668cede3748..9b4f1dd6b6e7 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-conduit
PORTVERSION= 1.1.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index e20ac244448c..66577b103dc3 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,16 +2,13 @@
PORTNAME= xml-types
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Basic types for representing XML
LICENSE= MIT
-FILE_LICENSE= license.txt
-
-CABAL_SETUP= Setup.hs
USE_CABAL= text
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 442426a02aeb..73039df14569 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -2,17 +2,14 @@
# $FreeBSD$
PORTNAME= xml
-PORTVERSION= 1.3.12
-PORTREVISION= 4
+PORTVERSION= 1.3.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A simple XML library for Haskell
+COMMENT= Simple XML library for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index eb7a8e844f4c..ecabcbb0789f 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-1.3.12.tar.gz) = 51410e12facc989bad32133a58d3ffc624a2ce8e1b1b4cfc49c27fa0ecb7b8d2
-SIZE (cabal/xml-1.3.12.tar.gz) = 11921
+SHA256 (cabal/xml-1.3.13.tar.gz) = c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813
+SIZE (cabal/xml-1.3.13.tar.gz) = 12082
diff --git a/textproc/hs-xml/pkg-descr b/textproc/hs-xml/pkg-descr
index b47d2bc63727..625325f56044 100644
--- a/textproc/hs-xml/pkg-descr
+++ b/textproc/hs-xml/pkg-descr
@@ -1,3 +1,4 @@
-A simple XML library for Haskell.
+A simple XML library.
+
+WWW: http://code.galois.com/
-WWW: http://hackage.haskell.org/package/xml
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index d3fc9dc08adb..9d9085b30e41 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xmlhtml
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5 \
parsec>=3.1.2 text>=0.11 unordered-containers>=0.1.4
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 6faa529bb6bb..2272cea74281 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.2.3
+PORTVERSION= 0.8.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 509073958787..20238c5b6945 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.3.tar.gz) = 8a8fce53772722087631a1c7475ff2eb50a975751128e8449dafcff5924946b7
-SIZE (cabal/yaml-0.8.2.3.tar.gz) = 66311
+SHA256 (cabal/yaml-0.8.2.4.tar.gz) = a00da810d835c04c49940eb73d3de9f0cd9cf52c508622579428a0eef880623e
+SIZE (cabal/yaml-0.8.2.4.tar.gz) = 66338
diff --git a/www/Makefile b/www/Makefile
index 24cc71a31336..fa268bfb36c9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -333,9 +333,7 @@
SUBDIR += hs-yesod
SUBDIR += hs-yesod-auth
SUBDIR += hs-yesod-core
- SUBDIR += hs-yesod-default
SUBDIR += hs-yesod-form
- SUBDIR += hs-yesod-json
SUBDIR += hs-yesod-persistent
SUBDIR += hs-yesod-platform
SUBDIR += hs-yesod-routes
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index d8ca325e4a70..80e569339c6b 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.5
-PORTREVISION= 1
+PORTVERSION= 4000.2.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for client-side HTTP
+COMMENT= Library for client-side HTTP
LICENSE= BSD
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index ae66c473fc49..b8b17ea35308 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.5.tar.gz) = 67dd0e6b5b97657dcef8d906d329f73243b75b33ffeb90454783b0e9e70f320e
-SIZE (cabal/HTTP-4000.2.5.tar.gz) = 66587
+SHA256 (cabal/HTTP-4000.2.8.tar.gz) = 086a2aa771a31845b190e2f9651ab4d8e85116aa463de5bc5e0204c1e5e70c5c
+SIZE (cabal/HTTP-4000.2.8.tar.gz) = 67903
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 669699ee8b4d..f14114b0f4a7 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell code presentation tool
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
new file mode 100644
index 000000000000..e4e7da82e900
--- /dev/null
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -0,0 +1,13 @@
+--- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Converter.hs 2013-05-28 16:20:35.000000000 +0200
+@@ -249,8 +249,8 @@
+
+ mkName :: String -> HSyn.Name
+ mkName n@(c:_)
+- | isSymbol c = HSyn.Symbol n
+-mkName n = HSyn.Ident n
++ | isLetter c = HSyn.Ident n
++mkName n = HSyn.Symbol n
+
+ mkImport_ :: String -> String -> HSyn.ImportDecl
+ mkImport_ magic m
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
deleted file mode 100644
index 0920ef39498b..000000000000
--- a/www/hs-activehs/files/patch-Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Main.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Main.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -31,7 +31,6 @@
- import System.Locale (defaultTimeLocale)
- import Data.Time (getCurrentTime, formatTime, diffUTCTime)
- import Data.Maybe (listToMaybe)
----import Prelude hiding (catch)
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
deleted file mode 100644
index bc6f6eeca660..000000000000
--- a/www/hs-activehs/files/patch-Simple.hs
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Simple.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
-+{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts, CPP #-}
-
- module Simple
- ( Task (..), TaskChan
-@@ -23,7 +23,9 @@
- import Control.Monad (when, forever)
- import Control.Monad.Error (MonadError, catchError)
- import Data.List (isPrefixOf)
----import Prelude hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- -------------------------
-
diff --git a/www/hs-activehs/files/patch-Smart.hs b/www/hs-activehs/files/patch-Smart.hs
deleted file mode 100644
index ad3d8eb0ba59..000000000000
--- a/www/hs-activehs/files/patch-Smart.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Smart.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Smart.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -37,7 +37,6 @@
- import qualified Data.Data as D
- import Data.List (nub)
- import Data.Char (isAlpha)
----import Prelude hiding (catch)
-
-
- ----------------------------------------------------------------------
diff --git a/www/hs-activehs/files/patch-Special.hs b/www/hs-activehs/files/patch-Special.hs
deleted file mode 100644
index af4c8ebd5c92..000000000000
--- a/www/hs-activehs/files/patch-Special.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Special.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Special.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns #-}
-+{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns, CPP #-}
-
- module Special
- ( SpecialTask (..), exerciseServer'
-@@ -25,8 +25,9 @@
- import System.Directory (getTemporaryDirectory)
-
- import Control.Concurrent (threadDelay, forkIO, killThread)
----import Prelude hiding (catch)
--
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 0528ec55bb35..68ed888b6f5d 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,6 +1,21 @@
--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2013-03-10 13:53:48.000000000 +0100
-@@ -76,11 +76,12 @@
++++ ./activehs.cabal 2013-05-28 16:18:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ activehs-base >= 0.2 && < 0.4,
+ data-pprint >= 0.2 && < 0.3,
+ base >= 4.0 && < 4.7,
+- QuickCheck >= 2.4 && < 2.6,
++ QuickCheck >= 2.4 && < 2.7,
+ array >= 0.3 && < 0.5,
+ directory >= 1.1 && < 1.3,
+ containers >= 0.4 && < 0.6,
+@@ -71,16 +71,17 @@
+ text >= 0.11 && < 0.12,
+ snap-core >= 0.6 && < 0.10,
+ snap-server >= 0.6 && < 0.10,
+- syb >= 0.2 && < 0.4,
++ syb >= 0.2 && < 0.5,
+ haskell-src-exts >= 1.12 && < 1.14,
bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 989957610dcc..e6d5083c66c4 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= authenticate
PORTVERSION= 1.3.2.6
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index bf0e3c7d2b87..2700b80a63e7 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,18 +2,16 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.1.7.4
-PORTREVISION= 6
+PORTVERSION= 3001.1.7.5
PORTEPOCH= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for writing CGI programs
+COMMENT= Haskell library for writing CGI programs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_CABAL= mtl>=1 network>=2 parsec>=2 xhtml>=3000
+USE_CABAL= extensible-exceptions mtl>=1 network>=2 parsec>=2 xhtml>=3000
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index 936482382a00..f39abd85abc9 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cgi-3001.1.7.4.tar.gz) = 6de5da8be4bb8323a864761bbb604ca8c1cdc9048bf33990f91e7ed948a331ba
-SIZE (cabal/cgi-3001.1.7.4.tar.gz) = 21357
+SHA256 (cabal/cgi-3001.1.7.5.tar.gz) = 5126e2eaa53cd5de59572981c00aedae5790882afda67545228eb29fe76faffd
+SIZE (cabal/cgi-3001.1.7.5.tar.gz) = 21377
diff --git a/www/hs-cgi/pkg-descr b/www/hs-cgi/pkg-descr
index 2ce7f8f821f5..51768124759e 100644
--- a/www/hs-cgi/pkg-descr
+++ b/www/hs-cgi/pkg-descr
@@ -1,3 +1,3 @@
This is a Haskell library for writing CGI programs.
-WWW: http://hackage.haskell.org/package/cgi
+WWW: http://andersk.mit.edu/haskell/cgi/
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index a4f9f0cc64cb..19485d131435 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cookie
PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 8da00df73001..dd2de9c28e46 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index a1fd23576fb3..7e9cbb585e93 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 09a237d26d6e..f3f550891e78 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gitit
PORTVERSION= 0.10.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 9457a301e5d6..9f9b69fd4af4 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Interface to Amazon's Simple Storage Service (S3)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
MissingH>=0.18.6 network random regex-compat utf8-string
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
index c692eaacddcc..8cd2e811e837 100644
--- a/www/hs-hamlet/Makefile
+++ b/www/hs-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hamlet
-PORTVERSION= 1.1.6.3
+PORTVERSION= 1.1.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
index 8b9a6b4c84ac..28bf72ec048b 100644
--- a/www/hs-hamlet/distinfo
+++ b/www/hs-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hamlet-1.1.6.3.tar.gz) = 5a5b79cfaad1823a3a83384e1e563454430452b10e5862866b95457a8844f2ce
-SIZE (cabal/hamlet-1.1.6.3.tar.gz) = 20596
+SHA256 (cabal/hamlet-1.1.7.1.tar.gz) = b7e0549a2bfb4f76acba63f85a959f365785f1c42cbce3afc248c74ef5fe92cd
+SIZE (cabal/hamlet-1.1.7.1.tar.gz) = 21529
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 83ccca8dbef1..b31a28f65aaf 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,20 +1,17 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.1.7
+PORTVERSION= 7.1.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web-related tools and services
LICENSE= BSD
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= base64-bytestring blaze-html>=0.5 hslogger>=1.0.2 html \
- monad-control>=0.3 mtl>=2 network>=2.2.3 parsec \
- sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
+USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \
+ hslogger>=1.0.2 html monad-control>=0.3 mtl>=2 network>=2.2.3 \
+ parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
threads>=0.5 time-compat transformers>=0.1.3 \
transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 0bf201058c56..c2586de0b0d6 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.1.7.tar.gz) = e7d5bf684c7a9644cd87116f2639423c161f2f5cb939429457047c2284c2a7bd
-SIZE (cabal/happstack-server-7.1.7.tar.gz) = 76019
+SHA256 (cabal/happstack-server-7.1.7.1.tar.gz) = e2fc2bf7a78a25c3a24f965972cd78ffa8c66755b54249ac34d0590fb63a09e1
+SIZE (cabal/happstack-server-7.1.7.1.tar.gz) = 78293
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 1b294f53ff21..94d7247b1cba 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,16 +2,13 @@
PORTNAME= happstack
PORTVERSION= 7.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The haskell application server stack + code generation
LICENSE= BSD
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= happstack-server>=7.0
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 5b30430bc537..73446f70f0de 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.11.1
+PORTVERSION= 0.12.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Haskell template system supporting both HTML5 and XML
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.4 \
hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index cd8571e3d969..5c4ffd04db13 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.11.1.tar.gz) = 50e6f3586e0a757f17d6f8109428fa3b891a47b1d4f2d134faaef4fe9897a69d
-SIZE (cabal/heist-0.11.1.tar.gz) = 61291
+SHA256 (cabal/heist-0.12.0.tar.gz) = 49ba5adf1e223507eb965b79b22f3b211e33381523330719f592767d6fdcb839
+SIZE (cabal/heist-0.12.0.tar.gz) = 61816
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 0f2d1e58196b..587c361586c5 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hjsmin
PORTVERSION= 0.1.4.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 text>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 828e7428bf9a..27964af5e60d 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \
blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
- certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.2 \
+ certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.3 \
data-default failure>=0.1 http-types>=0.7 lifted-base>=0.1 \
mime-types>=0.1 monad-control>=0.3 mtl network>=2.3 \
publicsuffixlist>=0.0.3 random regex-compat resourcet>=0.3 \
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index f94656487990..5687b6a73f39 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.9.0.tar.gz) = f365952e83dacfdb6218ae7a5c462bc904f493dc6bbbc57d99ad39939e16ceac
-SIZE (cabal/http-conduit-1.9.0.tar.gz) = 44423
+SHA256 (cabal/http-conduit-1.9.3.tar.gz) = 73e620353cf1f818cca9c755f79ccee2768b914616181e0bed339064a444800d
+SIZE (cabal/http-conduit-1.9.3.tar.gz) = 45412
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 141767655f00..6107850c3042 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= HTTP Date parser/formatter
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index 27c337f1b3e1..26bc3635dd63 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.1.1.3
+PORTVERSION= 0.1.1.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Reverse proxy HTTP requests, either over raw sockets or with WAI
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \
conduit>=0.5 data-default http-conduit>=1.6 http-types>=0.6 \
lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 7a5abb694f33..6632a92f105b 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = f65adce5c858710ac2df048aa9183d4596fbc506ecc3019dd56480b75717507c
-SIZE (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = 6357
+SHA256 (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 34ad0eab9ca014477fabf5372242dfe85837ad8b6f36a1e3871a80396a0e063a
+SIZE (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 6786
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 9437c99680a6..22c5c677eae6 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= Library for writing Haskell web servers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 36de4256ee8d..bcb75d70c57b 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= http-types
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Generic HTTP types for Haskell (for both client and server code)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index faf7d1e9f2a1..65fa0528f25e 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,15 +3,14 @@
PORTNAME= oeis
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell interface to the Online Encyclopedia of Integer Sequences
+COMMENT= Haskell interface to the Online Encyclopedia of Integer Sequences
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= HTTP>=4000.0.2 network>=2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index b2caebb42c8e..87e13650f902 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,7 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 607dc03822a6..a013be71702b 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index ed26a963b159..7af1a22a225f 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -5,11 +5,11 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for writing SCGI programs
+COMMENT= Haskell library for writing SCGI programs
LICENSE= BSD
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index 5c8013a5302b..d080161fa353 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-css
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
index 25694c0ff2fc..3eab08f37ee4 100644
--- a/www/hs-shakespeare-css/distinfo
+++ b/www/hs-shakespeare-css/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-css-1.0.3.tar.gz) = 7f81c6147f8eb2ef0a6a879ae36cc437f187afb30afff5e6dc04f4b4c9b2647e
-SIZE (cabal/shakespeare-css-1.0.3.tar.gz) = 14769
+SHA256 (cabal/shakespeare-css-1.0.5.1.tar.gz) = 5ae7e5e970affa31375e95b0d31564f0bfdaf0fdf8f3f6637bec449b2a3ba51b
+SIZE (cabal/shakespeare-css-1.0.5.1.tar.gz) = 16370
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index f5a6b11147d7..77307ecd743e 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -2,11 +2,11 @@
PORTNAME= shakespeare-i18n
PORTVERSION= 1.0.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A type-based approach to internationalization
+COMMENT= Type-based approach to internationalization
LICENSE= MIT
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index 48bceee10136..44816e77aed0 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-js
-PORTVERSION= 1.1.2.1
+PORTVERSION= 1.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Stick your Haskell variables into JavaScript at compile time
LICENSE= MIT
-USE_CABAL= aeson>=0.5 shakespeare>=1.0.3 text>=0.7
+USE_CABAL= aeson>=0.5 shakespeare>=1.0.5 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
index d4c51b33abfb..18932dfa3cb8 100644
--- a/www/hs-shakespeare-js/distinfo
+++ b/www/hs-shakespeare-js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-js-1.1.2.1.tar.gz) = 1ff94325635d2a7ba26efe1967732f061e26ec41304ea9aaa88b9b212eb03611
-SIZE (cabal/shakespeare-js-1.1.2.1.tar.gz) = 7857
+SHA256 (cabal/shakespeare-js-1.1.4.tar.gz) = c3bba5e4ebb914eded23a060beb68f6e76d134aa2a42c8f654c6b118dec51616
+SIZE (cabal/shakespeare-js-1.1.4.tar.gz) = 7942
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index e8d24934005f..04104fce56b1 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shakespeare-text
PORTVERSION= 1.0.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 5ec3ff4b0e8e..3990ca07dacf 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 1.0.3.1
+PORTVERSION= 1.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= parsec>=2 text>=0.7
+USE_CABAL= parsec>=2 system-fileio>=0.3 system-filepath>=0.4 \
+ text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index e5d47737d5ff..24c392adb8ff 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.3.1.tar.gz) = dae1111a232d02e50b06e291a64060506ec4629b62c8427cdb2ded3453788123
-SIZE (cabal/shakespeare-1.0.3.1.tar.gz) = 9807
+SHA256 (cabal/shakespeare-1.0.5.tar.gz) = 6e931034316149ace4a5aa2d035188786ba0d5a5763b20b62b04f65bc6f381b5
+SIZE (cabal/shakespeare-1.0.5.tar.gz) = 10552
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 45c988de0523..ef36ae8ba69a 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-core
PORTVERSION= 0.9.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Snap: A Haskell Web Framework (core interfaces and types)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
case-insensitive>=0.3 enumerator>=0.4.15 HUnit>=1.2 \
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index d8deab311304..a3c218ddda24 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-server
PORTVERSION= 0.9.3.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
case-insensitive>=0.3 enumerator>=0.4.15 \
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 6d49a52f63e0..40351d1b74d2 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.11.2
+PORTVERSION= 0.12.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,14 +9,12 @@ COMMENT= Top-level package for the Snap Web Framework
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
comonad>=1.1 configurator>=0.1 directory-tree>=0.10 \
- dlist>=0.5 errors>=1.4 hashable>=1.2 heist>=0.11 \
- lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \
- mtl>2.0 mwc-random>=0.8 pwstore-fast>=2.3 regex-posix>=0.95 \
- snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 \
+ dlist>=0.5 errors>=1.4 hashable heist>=0.12 lens>=3.7.6 \
+ logict>=0.4.2 MonadCatchIO-transformers>=0.2 mtl>2.0 \
+ mwc-random>=0.8 pwstore-fast>=2.2 regex-posix>=0.95 \
+ snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 tagged \
text>=0.11 transformers>=0.2 unordered-containers>=0.1.4 \
vector>=0.7.1 vector-algorithms>=0.4 xmlhtml>=0.1
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index eaa865f23df4..541a2af02690 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.11.2.tar.gz) = 2a143fe96e59a6e79c24ad9790c0f955f80e1bdc60c6c04e90e0f5055b0936fd
-SIZE (cabal/snap-0.11.2.tar.gz) = 79858
+SHA256 (cabal/snap-0.12.0.tar.gz) = cec5990f0063be66453941cf91226051c00a8260708573c89f8e650ef7aa8c59
+SIZE (cabal/snap-0.12.0.tar.gz) = 82197
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index a37e9518b2c9..faf100e05a04 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,11 +3,11 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for working with URLs
+COMMENT= Library for working with URLs
LICENSE= BSD
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 950d4fb3a0e8..9d492d38bfe4 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai-app-static
PORTVERSION= 1.3.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index a4eda6827d2d..0214cb9a0852 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.2.4
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +10,11 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 data-default \
- date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
+ base64-bytestring case-insensitive>=0.2 conduit>=0.5 \
+ data-default date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
network>=2.2.1.5 resourcet>=0.3 stringsearch>=0.3 \
text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \
- wai-logger>=0.2 zlib-conduit>=0.5
+ wai-logger>=0.2 word8 zlib-conduit>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index 911e2b246842..c2d91cbbce98 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.2.4.tar.gz) = 69b56b36ee5434af030f8bcc481bb8363ddb8461b5545919b404cc4560790d8a
-SIZE (cabal/wai-extra-1.3.2.4.tar.gz) = 31566
+SHA256 (cabal/wai-extra-1.3.4.tar.gz) = ddbde27aa5bde76dc9e8d548ea71ff5b4ae1963f1f35023322ecc78b0a16c8ab
+SIZE (cabal/wai-extra-1.3.4.tar.gz) = 32600
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 0f3958b2b71f..849b27d9e7f2 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -2,16 +2,14 @@
PORTNAME= wai-logger
PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A logging system for WAI
+COMMENT= Logging system for WAI
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \
fast-logger>=0.3 http-types network wai
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index f626c8d4dda7..c69f7e0119ba 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-test
-PORTVERSION= 1.3.0.4
+PORTVERSION= 1.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE= MIT
USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
case-insensitive>=0.2 conduit>=0.5 cookie>=0.2 \
- http-types>=0.7 HUnit>=1.2 text>=0.7 transformers>=0.2.2 \
- wai>=1.3
+ http-types>=0.7 HUnit>=1.2 network text>=0.7 \
+ transformers>=0.2.2 wai>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
index 980bfb259cec..7952dc2b8996 100644
--- a/www/hs-wai-test/distinfo
+++ b/www/hs-wai-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-test-1.3.0.4.tar.gz) = c07b23c9a67ead44da427f6d260572572d9cc32930313c3dc84823abb32325ea
-SIZE (cabal/wai-test-1.3.0.4.tar.gz) = 3165
+SHA256 (cabal/wai-test-1.3.1.tar.gz) = 6f2ac40a1cd06eaad47a48b12856d90aef78c4c980d2384a1ad91fb1f8a28937
+SIZE (cabal/wai-test-1.3.1.tar.gz) = 3800
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index c11b48449e8b..c3d2fff97047 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 8d82bfdd8ad8..767ad3ada3c2 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.7.4
+PORTVERSION= 1.3.8.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 47ed54308209..9e21d9f00012 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.7.4.tar.gz) = 3daf8e0a0ed8c9b3f53bb8e3631c5f1f7315913cf74342ecdc8b2ee9c21e047c
-SIZE (cabal/warp-1.3.7.4.tar.gz) = 17755
+SHA256 (cabal/warp-1.3.8.1.tar.gz) = 7dc4b9d3d3a8590c19a17523a2bdf1086116f333d443391385d8f424d1767f1e
+SIZE (cabal/warp-1.3.8.1.tar.gz) = 19185
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index cdf077f90129..f6f4142a3f76 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,16 +2,14 @@
PORTNAME= webkit
PORTVERSION= 0.12.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Webkit library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12 glib>=0.12 gtk>=0.12 mtl pango>=0.12
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index f8f52335fe40..fb40dcfea06e 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 4a3052d080bc..0cb83a657f15 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.1.5.3
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,14 +10,14 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
- blaze-markup>=0.5.1 file-embed hamlet>=1.1 http-conduit>=1.5 \
- http-types lifted-base>=0.1 mime-mail>=0.3 network \
- persistent>=1.0 persistent-template>=1.0 pureMD5>=2.0 \
- pwstore-fast>=2.2 random>=1.0.0.2 SHA>=1.4.1.3 \
- shakespeare-css>=1.0 shakespeare-js>=1.0.2 text>=0.7 \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- yesod-core>=1.1 yesod-form>=1.1 yesod-json>=1.1 \
- yesod-persistent>=1.1
+ blaze-markup>=0.5.1 data-default email-validate>=1.0 \
+ file-embed hamlet>=1.1 http-conduit>=1.5 http-types \
+ lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.2 \
+ persistent-template>=1.2 pureMD5>=2.0 pwstore-fast>=2.2 \
+ random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
+ shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
+ unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \
+ yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index 8d428aaf0669..c07f593a5174 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.1.5.3.tar.gz) = 02fdd42abcb77a18f84f01855281a3f7cd04ab891945de051a1cd9793ff9591f
-SIZE (cabal/yesod-auth-1.1.5.3.tar.gz) = 23041
+SHA256 (cabal/yesod-auth-1.2.0.tar.gz) = 0740b3fc8825ca9d97ae3589cb86ff9d81e87c1703f8d2341fd45b9ed728b7aa
+SIZE (cabal/yesod-auth-1.2.0.tar.gz) = 26852
diff --git a/www/hs-yesod-auth/pkg-descr b/www/hs-yesod-auth/pkg-descr
index 84cc25320cd6..b3ba19883de8 100644
--- a/www/hs-yesod-auth/pkg-descr
+++ b/www/hs-yesod-auth/pkg-descr
@@ -1,3 +1,7 @@
-Authentication for Yesod.
+This package provides a pluggable mechanism for allowing users to
+authenticate with your site. It comes with a number of common plugins,
+such as OpenID, BrowserID (a.k.a., Mozilla Persona), and email. Other
+packages are available from Hackage as well. If you've written such an
+add-on, please notify me so that it can be added to this description.
WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 4d49b8c18043..5b8ab0c44672 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.1.8.2
+PORTVERSION= 1.2.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,16 +9,17 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \
- clientsession>=0.8 conduit>=0.5 cookie>=0.4 failure>=0.2 \
- fast-logger>=0.2 hamlet>=1.1 http-types>=0.7 lifted-base>=0.1 \
- monad-control>=0.3 monad-logger>=0.2.1 parsec>=2 \
- path-pieces>=0.1.2 random>=1.0.0.2 resourcet>=0.3 \
- shakespeare>=1.0 shakespeare-css>=1.0 shakespeare-i18n>=1.0 \
- shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
- transformers-base>=0.4 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
- yesod-routes>=1.1
+USE_CABAL= aeson>=0.5 attoparsec-conduit blaze-builder>=0.2.1.4 \
+ blaze-html>=0.5 blaze-markup>=0.5.1 case-insensitive>=0.2 \
+ cereal>=0.3 clientsession>=0.9 conduit>=0.5 cookie>=0.4 \
+ data-default failure>=0.2 fast-logger>=0.2 hamlet>=1.1 \
+ http-types>=0.7 lifted-base>=0.1 monad-control>=0.3 \
+ monad-logger>=0.3.1 parsec>=2 path-pieces>=0.1.2 \
+ random>=1.0.0.2 resourcet>=0.4.6 safe shakespeare>=1.0 \
+ shakespeare-css>=1.0 shakespeare-i18n>=1.0 shakespeare-js>=1.0.2 \
+ text>=0.7 transformers>=0.2.2 transformers-base>=0.4 \
+ vector>=0.9 wai>=1.4 wai-extra>=1.3 warp>=1.3.8 \
+ yesod-routes>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 9523f4b96b91..551574a78b89 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.1.8.2.tar.gz) = 5fa74a4fa1bc66688509631ef7324e87f4e0d48cd6db3df22fabd11d64dc392f
-SIZE (cabal/yesod-core-1.1.8.2.tar.gz) = 44289
+SHA256 (cabal/yesod-core-1.2.0.4.tar.gz) = b45c7a827472ea30b48e42687f6287df3cc8d43882fed6a35cc796224d455d25
+SIZE (cabal/yesod-core-1.2.0.4.tar.gz) = 54637
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
deleted file mode 100644
index 2f78d67ed1a8..000000000000
--- a/www/hs-yesod-default/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-default
-PORTVERSION= 1.1.3.2
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Default config and main functions for your yesod application
-
-LICENSE= MIT
-
-USE_CABAL= data-default hamlet>=1.1 network-conduit>=0.5 safe \
- shakespeare-css>=1.0 shakespeare-js>=1.0 text>=0.9 \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-core>=1.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
deleted file mode 100644
index 09ac7191121b..000000000000
--- a/www/hs-yesod-default/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-default-1.1.3.2.tar.gz) = 0fb35bf68a029a00492998417bb8330a6f8e7470edacea6ae3610846a44ef51d
-SIZE (cabal/yesod-default-1.1.3.2.tar.gz) = 7082
diff --git a/www/hs-yesod-default/pkg-descr b/www/hs-yesod-default/pkg-descr
deleted file mode 100644
index 5d7241f4fbd6..000000000000
--- a/www/hs-yesod-default/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Convenient wrappers for your the configuration and execution of your yesod
-application.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index a8b32056e242..6a941536e4c2 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.2.1.3
+PORTVERSION= 1.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,12 +9,12 @@ COMMENT= Form handling support for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
+USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 crypto-api>=0.8 data-default \
- email-validate>=0.2.6 hamlet>=1.1 network>=2.2 \
- persistent>=1.0 shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
+ email-validate>=1.0 hamlet>=1.1 network>=2.2 persistent>=1.2 \
+ resourcet shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
- yesod-core>=1.1 yesod-persistent>=1.1
+ yesod-core>=1.2 yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index a85a2c4a0889..7a77230b936b 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.2.1.3.tar.gz) = f87aec0ccbbedde53466b2e2a8b286a1211663e7a4419af60673c2ecaec938d7
-SIZE (cabal/yesod-form-1.2.1.3.tar.gz) = 19573
+SHA256 (cabal/yesod-form-1.3.0.tar.gz) = cc9a11a07d182656dd59fd4b63a10587b577c238e2a8cd2a891e0c1e0c4ce2f8
+SIZE (cabal/yesod-form-1.3.0.tar.gz) = 18892
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
deleted file mode 100644
index 05c67bcd96b0..000000000000
--- a/www/hs-yesod-json/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-json
-PORTVERSION= 1.1.2.1
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Generate content for Yesod using the aeson package
-
-LICENSE= MIT
-
-USE_CABAL= aeson>=0.5 attoparsec-conduit>=0.5 blaze-builder \
- conduit>=0.5 safe>=0.2 shakespeare-js>=1.0 text>=0.8 \
- transformers>=0.2.2 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
- yesod-core>=1.1 yesod-routes>=1.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-json/distinfo b/www/hs-yesod-json/distinfo
deleted file mode 100644
index 5f6f131aab3f..000000000000
--- a/www/hs-yesod-json/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-json-1.1.2.1.tar.gz) = 0db7f3981fd4365af8b1fe7d1cb7ed7e278057f418a6a41bc7ec6023f6b0306f
-SIZE (cabal/yesod-json-1.1.2.1.tar.gz) = 3150
diff --git a/www/hs-yesod-json/pkg-descr b/www/hs-yesod-json/pkg-descr
deleted file mode 100644
index 3c3f7ba0c2bc..000000000000
--- a/www/hs-yesod-json/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Generate content for Yesod using the aeson package.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 6a4610181c23..2a667fca2989 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= persistent>=1.0 persistent-template>=1.0 transformers>=0.2.2 \
- yesod-core>=1.1
+USE_CABAL= blaze-builder conduit lifted-base persistent>=1.2 \
+ persistent-template>=1.2 pool-conduit resourcet \
+ transformers>=0.2.2 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 8f37ac5e578d..012fce1e320d 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.1.0.1.tar.gz) = 374c51b8ba61480053bbbed9f64118139fdcfd286cee252121c64535cf0aed4d
-SIZE (cabal/yesod-persistent-1.1.0.1.tar.gz) = 1899
+SHA256 (cabal/yesod-persistent-1.2.0.tar.gz) = 1334f48f1386003699a08f4e24505c633e89519874c351750958745b85d1ffbf
+SIZE (cabal/yesod-persistent-1.2.0.tar.gz) = 3926
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index cd4bce5d236f..27b5d7bdfb12 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.1.8
+PORTVERSION= 1.2.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,137 +9,130 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.1.0_1 \
- ansi-terminal==0.6 \
- asn1-data==0.7.1_1 \
- attoparsec==0.10.4.0 \
- attoparsec-conduit==1.0.0 \
- authenticate==1.3.2.6 \
- base-unicode-symbols==0.2.2.4_1 \
- base64-bytestring==1.0.0.1 \
- base64-conduit==1.0.0 \
- basic-prelude==0.3.4.0 \
- blaze-builder==0.3.1.0_4 \
- blaze-builder-conduit==1.0.0 \
- blaze-html==0.6.0.0 \
- blaze-markup==0.5.1.4 \
- byteorder==1.0.3_4 \
- case-insensitive==1.0 \
- cereal==0.3.5.2_2 \
- certificate==1.3.5_1 \
- cipher-aes==0.1.7 \
- cipher-rc4==0.1.2 \
- classy-prelude==0.5.3 \
- clientsession==0.8.1_1 \
- conduit==1.0.2 \
- cookie==0.4.0.1_1 \
- cprng-aes==0.3.4_1 \
- crypto-api==0.11 \
- crypto-conduit==0.5.0 \
- crypto-numbers==0.1.3 \
- crypto-pubkey==0.1.2_1 \
- crypto-pubkey-types==0.2.0_1 \
- crypto-random-api==0.2.0 \
- cryptohash==0.8.3_1 \
- css-text==0.1.1_5 \
- data-default==0.5.0_1 \
- date-cache==0.3.0_1 \
- dlist==0.5_8 \
- email-validate==1.0.0 \
- entropy==0.2.1_4 \
- failure==0.2.0.1_3 \
- fast-logger==0.3.1_2 \
- file-embed==0.0.4.7 \
- filesystem-conduit==1.0.0 \
- fsnotify==0.0.6 \
- ghc-paths==0.1.0.9 \
- hamlet==1.1.6.3 \
- hashable==1.2.0.5 \
- hjsmin==0.1.4.1 \
- hspec==1.4.4 \
- hspec-expectations==0.3.0.3_1 \
- html-conduit==1.1.0 \
- http-conduit==1.9.0 \
- http-date==0.0.4_1 \
- http-reverse-proxy==0.1.1.3 \
- http-types==0.8.0 \
- language-javascript==0.5.7_1 \
- lifted-base==0.2.0.2 \
- mime-mail==0.4.1.2_2 \
- mime-types==0.1.0.3 \
- monad-control==0.3.1.4_1 \
- monad-logger==0.3.0.1 \
- network-conduit==1.0.0 \
- optparse-applicative==0.5.2.1 \
- path-pieces==0.1.2_1 \
- pem==0.1.2_1 \
- persistent==1.1.5.1 \
- persistent-template==1.1.2.4 \
- pool-conduit==0.1.1_1 \
- primitive==0.5.0.1_1 \
- project-template==0.1.3 \
- publicsuffixlist==0.0.3 \
- pureMD5==2.1.2.1_2 \
- pwstore-fast==2.3_2 \
- ReadArgs==1.2.1_1 \
- resource-pool==0.2.1.1_1 \
- resourcet==0.4.5 \
- safe==0.3.3_4 \
- semigroups==0.9 \
- setenv==0.1.0_1 \
- SHA==1.6.1_1 \
- shakespeare==1.0.3.1 \
- shakespeare-css==1.0.3 \
- shakespeare-i18n==1.0.0.2_4 \
- shakespeare-js==1.1.2.1 \
- shakespeare-text==1.0.0.5_2 \
- silently==1.2.4.1 \
- simple-sendfile==0.2.11 \
- skein==0.1.0.12 \
- socks==0.5.0 \
- split==0.2.1.1_1 \
- stringsearch==0.3.6.4_1 \
- system-fileio==0.3.11 \
- system-filepath==0.4.7_1 \
- tagged==0.4.4_1 \
- tagsoup==0.12.8_1 \
- tagstream-conduit==0.5.4 \
- tar==0.4.0.1_1 \
- tls==1.1.2 \
- tls-extra==0.6.1_1 \
- transformers-base==0.4.1_4 \
- unix-compat==0.4.1.0 \
- unordered-containers==0.2.3.0 \
- utf8-light==0.4.0.1_3 \
- utf8-string==0.3.7_4 \
- vault==0.2.0.4 \
- vector==0.10.0.1_1 \
- void==0.5.11 \
- wai==1.4.0 \
- wai-app-static==1.3.1.2 \
- wai-extra==1.3.2.4 \
- wai-logger==0.3.0_2 \
- wai-test==1.3.0.4 \
- warp==1.3.7.4 \
- word8==0.0.3 \
- xml-conduit==1.1.0.3 \
- xml-types==0.3.3_1 \
- xss-sanitize==0.3.3_1 \
- yaml==0.8.2.3 \
- yesod==1.1.9.2 \
- yesod-auth==1.1.5.3 \
- yesod-core==1.1.8.2 \
- yesod-default==1.1.3.2 \
- yesod-form==1.2.1.3 \
- yesod-json==1.1.2.1 \
- yesod-persistent==1.1.0.1_1 \
- yesod-routes==1.1.2 \
- yesod-static==1.1.2.2 \
- yesod-test==0.3.5 \
- zlib-bindings==0.1.1.3 \
- zlib-conduit==1.0.0
-
-IGNORE_DYNAMIC= yes
+USE_CABAL= aeson==0.6.1.0_2 \
+ ansi-terminal==0.6_1 \
+ asn1-data==0.7.1_2 \
+ asn1-types==0.1.3 \
+ attoparsec==0.10.4.0_1 \
+ attoparsec-conduit==1.0.1 \
+ authenticate==1.3.2.6_1 \
+ base-unicode-symbols==0.2.2.4_2 \
+ base64-bytestring==1.0.0.1_1 \
+ blaze-builder==0.3.1.1 \
+ blaze-builder-conduit==1.0.0_1 \
+ blaze-html==0.6.1.1 \
+ blaze-markup==0.5.1.5 \
+ byteorder==1.0.4 \
+ case-insensitive==1.0.0.2 \
+ cereal==0.3.5.2_3 \
+ certificate==1.3.7 \
+ cipher-aes==0.1.8 \
+ cipher-rc4==0.1.2_1 \
+ clientsession==0.9 \
+ conduit==1.0.5 \
+ cookie==0.4.0.1_2 \
+ cprng-aes==0.3.4_2 \
+ crypto-api==0.12.1 \
+ crypto-conduit==0.5.2 \
+ crypto-numbers==0.1.3_1 \
+ crypto-pubkey==0.1.3 \
+ crypto-pubkey-types==0.3.2 \
+ crypto-random-api==0.2.0_1 \
+ cryptohash==0.9.0 \
+ css-text==0.1.1_6 \
+ data-default==0.5.3 \
+ data-default-class==0.0.1 \
+ data-default-instances-base==0.0.1 \
+ data-default-instances-containers==0.0.1 \
+ data-default-instances-dlist==0.0.1 \
+ data-default-instances-old-locale==0.0.1 \
+ date-cache==0.3.0_2 \
+ dlist==0.5_9 \
+ email-validate==1.0.0_1 \
+ entropy==0.2.1_5 \
+ failure==0.2.0.1_4 \
+ fast-logger==0.3.1_3 \
+ file-embed==0.0.4.7_1 \
+ filesystem-conduit==1.0.0_1 \
+ hamlet==1.1.7.1 \
+ hashable==1.1.2.5,1 \
+ hjsmin==0.1.4.1_1 \
+ hspec==1.5.4 \
+ hspec-expectations==0.3.2 \
+ html-conduit==1.1.0_1 \
+ http-conduit==1.9.3 \
+ http-date==0.0.4_2 \
+ http-types==0.8.0_1 \
+ language-javascript==0.5.7_2 \
+ lifted-base==0.2.0.5 \
+ mime-mail==0.4.1.2_3 \
+ mime-types==0.1.0.3_1 \
+ mmorph==1.0.0 \
+ monad-control==0.3.2.1 \
+ monad-logger==0.3.1.1 \
+ network-conduit==1.0.0_1 \
+ path-pieces==0.1.2_2 \
+ pem==0.1.2_2 \
+ persistent==1.2.0.1 \
+ persistent-template==1.2.0 \
+ pool-conduit==0.1.2 \
+ primitive==0.5.0.1_2 \
+ publicsuffixlist==0.1 \
+ pureMD5==2.1.2.1_3 \
+ pwstore-fast==2.3_3 \
+ quickcheck-io==0.1.0 \
+ resource-pool==0.2.1.1_2 \
+ resourcet==0.4.7.1 \
+ safe==0.3.3_5 \
+ semigroups==0.9.1 \
+ setenv==0.1.0_2 \
+ SHA==1.6.1_2 \
+ shakespeare==1.0.5 \
+ shakespeare-css==1.0.5.1 \
+ shakespeare-i18n==1.0.0.2_5 \
+ shakespeare-js==1.1.4 \
+ shakespeare-text==1.0.0.5_3 \
+ silently==1.2.4.1_1 \
+ simple-sendfile==0.2.11_1 \
+ skein==1.0.3 \
+ socks==0.5.1 \
+ stringsearch==0.3.6.4_2 \
+ system-fileio==0.3.11_1 \
+ system-filepath==0.4.7_2 \
+ tagged==0.6 \
+ tagsoup==0.12.8_2 \
+ tagstream-conduit==0.5.4_1 \
+ tls==1.1.2_1 \
+ tls-extra==0.6.1_2 \
+ transformers-base==0.4.1_5 \
+ unix-compat==0.4.1.1 \
+ unordered-containers==0.2.3.1 \
+ utf8-light==0.4.0.1_4 \
+ utf8-string==0.3.7_5 \
+ vault==0.2.0.4_1 \
+ vector==0.10.0.1_2 \
+ void==0.6 \
+ wai==1.4.0_1 \
+ wai-app-static==1.3.1.2_1 \
+ wai-extra==1.3.4 \
+ wai-logger==0.3.0_3 \
+ wai-test==1.3.1 \
+ warp==1.3.8.1 \
+ word8==0.0.3_1 \
+ xml-conduit==1.1.0.3_1 \
+ xml-types==0.3.3_2 \
+ xss-sanitize==0.3.3_2 \
+ yaml==0.8.2.4 \
+ yesod==1.2.0.1 \
+ yesod-auth==1.2.0 \
+ yesod-core==1.2.0.4 \
+ yesod-form==1.3.0 \
+ yesod-persistent==1.2.0 \
+ yesod-routes==1.2.0 \
+ yesod-static==1.2.0 \
+ yesod-test==1.2.0 \
+ zlib-bindings==0.1.1.3_1 \
+ zlib-conduit==1.0.0_1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index 66486c86b4b1..da99efc3d3c3 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.1.8.tar.gz) = 50a863685942745b530c77957ac75d0d5cd4af211a0e183eee58e74ed1941108
-SIZE (cabal/yesod-platform-1.1.8.tar.gz) = 2670
+SHA256 (cabal/yesod-platform-1.2.0.1.tar.gz) = 253ce16ed96383f11959f3b345a211999c93fc86ff5b777cede88756fa44ce41
+SIZE (cabal/yesod-platform-1.2.0.1.tar.gz) = 2583
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
index 2daf8095e1b9..33a0aebc30b5 100644
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -1,11 +1,11 @@
---- ./yesod-platform.cabal.orig 2013-03-04 09:57:32.000000000 +0100
-+++ ./yesod-platform.cabal 2013-03-07 22:27:51.000000000 +0100
-@@ -102,7 +102,7 @@
- , simple-sendfile == 0.2.11
- , skein == 0.1.0.12
- , socks == 0.5.0
-- , split == 0.2.1.2
-+ , split == 0.2.1.1
- , stringsearch == 0.3.6.4
- , system-fileio == 0.3.11
- , system-filepath == 0.4.7
+--- ./yesod-platform.cabal.orig 2013-04-25 08:09:38.000000000 +0200
++++ ./yesod-platform.cabal 2013-05-03 19:11:59.000000000 +0200
+@@ -67,7 +67,7 @@
+ , fsnotify == 0.0.11
+ , ghc-paths == 0.1.0.9
+ , hamlet == 1.1.7.1
+- , hashable == 1.2.0.7
++ , hashable == 1.1.2.5
+ , hjsmin == 0.1.4.1
+ , hspec == 1.5.3
+ , hspec-expectations == 0.3.2
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index d0c47af2d7ac..9c1d8035451a 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-routes
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index 855e875f15ce..54b19c75d08a 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.1.2.tar.gz) = 5b96189ab0e4ae07fd3904a9b8a7d53b5ecec0bc5c94627d4725e930cf17db9f
-SIZE (cabal/yesod-routes-1.1.2.tar.gz) = 17709
+SHA256 (cabal/yesod-routes-1.2.0.tar.gz) = 62c5aa9a212a467c5918e250247c2801efa1b56cfcaaf1f1e108d02ccd06ffb4
+SIZE (cabal/yesod-routes-1.2.0.tar.gz) = 20175
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 7043a8602b95..091179f9f1f5 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.1.2.2
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +10,11 @@ COMMENT= Static file serving subsite for Yesod Web Framework
LICENSE= MIT
USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \
- crypto-conduit>=0.4 cryptohash>=0.6.1 file-embed>=0.0.4.1 \
- http-types>=0.7 system-filepath>=0.4.6 text>=0.9 \
+ crypto-conduit>=0.4 cryptohash>=0.6.1 data-default \
+ file-embed>=0.0.4.1 http-types>=0.7 shakespeare-css>=1.0.3 \
+ system-fileio>=0.3 system-filepath>=0.4.6 text>=0.9 \
transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \
- wai-app-static>=1.3 yesod-core>=1.1
+ wai-app-static>=1.3 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index f3f7af392133..980979c2e51b 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.1.2.2.tar.gz) = e198f1909fc47d872dc4b04303f2dec11cc48f3bda2fca35bf94ad9ef2752afc
-SIZE (cabal/yesod-static-1.1.2.2.tar.gz) = 6304
+SHA256 (cabal/yesod-static-1.2.0.tar.gz) = 5f72dfc5c72de6eac00b4e7f82aac185eeba2aa5bbed0872a9507f8c26bcd3a1
+SIZE (cabal/yesod-static-1.2.0.tar.gz) = 8505
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index f739f22c482b..2267254655ac 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 0.3.5
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \
network>=2.2 persistent>=1.0 pool-conduit text \
transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \
- xml-types>=0.3
+ xml-types>=0.3 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 754d62a5d41a..b0921e9d0b98 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-0.3.5.tar.gz) = 721c615066f4119591b580ce018c29800149231d1d19458f21b392da02e5b024
-SIZE (cabal/yesod-test-0.3.5.tar.gz) = 11113
+SHA256 (cabal/yesod-test-1.2.0.tar.gz) = 7894450772e93995bb156ffaba53024669d6f644dad0603d8b024b612e7490a0
+SIZE (cabal/yesod-test-1.2.0.tar.gz) = 11914
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index 675e0f18d841..623ef0e10cfa 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.1.9.2
+PORTVERSION= 1.2.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,23 +9,12 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \
- blaze-html>=0.5 blaze-markup>=0.5.1 conduit>=0.5.1 file-embed \
- fsnotify>=0.0 ghc-paths>=0.1 hamlet>=1.1 http-conduit \
- http-reverse-proxy>=0.1.0.4 http-types>=0.7 lifted-base \
- monad-control>=0.3 network network-conduit \
- optparse-applicative>=0.4 parsec>=2.1 project-template>=0.1.1 \
- resourcet>=0.3 shakespeare>=1.0.2 shakespeare-css>=1.0.2 \
- shakespeare-js>=1.0.2 shakespeare-text>=1.0 split>=0.2 \
- system-fileio>=0.3 system-filepath>=0.4 tar>=0.4 text>=0.11 \
- transformers>=0.2.2 unix-compat>=0.2 unordered-containers \
- wai>=1.3 wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-auth>=1.1 \
- yesod-core>=1.1.5 yesod-default>=1.1.3 yesod-form>=1.1 \
- yesod-json>=1.1 yesod-persistent>=1.1 zlib>=0.5
-
-EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
-
-IGNORE_DYNAMIC= yes
+USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 data-default \
+ hamlet>=1.1 monad-control>=0.3 network-conduit safe \
+ shakespeare-css>=1.0 shakespeare-js>=1.0.2 text \
+ transformers>=0.2.2 unordered-containers wai>=1.3 \
+ wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 yesod-core>=1.2 \
+ yesod-form>=1.3 yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 79dbba1e995a..e02b4ba9d926 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.1.9.2.tar.gz) = b2c1432de8e0e9d5c39300189088a159fcf28565c527aa7ee3382d41d0ac69e7
-SIZE (cabal/yesod-1.1.9.2.tar.gz) = 338371
+SHA256 (cabal/yesod-1.2.0.1.tar.gz) = a32a88bd9cd2fcda76965c66457241acc25a652e8eb9b58d144afa5929e013f2
+SIZE (cabal/yesod-1.2.0.1.tar.gz) = 7652
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 8a239cca4508..926820f8d2b9 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -76,8 +76,10 @@
SUBDIR += gtoolkit
SUBDIR += guile-gtk
SUBDIR += hippo-canvas
+ SUBDIR += hs-GLURaw
SUBDIR += hs-GLUT
SUBDIR += hs-OpenGL
+ SUBDIR += hs-OpenGLRaw
SUBDIR += hs-frantk
SUBDIR += hs-gtk
SUBDIR += hs-gtk2hs
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
new file mode 100644
index 000000000000..47c642781bf7
--- /dev/null
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= GLURaw
+PORTVERSION= 1.3.0.0
+CATEGORIES= x11-toolkits haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Raw binding for the OpenGL graphics system
+
+LICENSE= BSD
+
+USE_CABAL= OpenGLRaw>=1.3
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo
new file mode 100644
index 000000000000..9b072353f7e9
--- /dev/null
+++ b/x11-toolkits/hs-GLURaw/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/GLURaw-1.3.0.0.tar.gz) = e03905710043eb2e9878e5fc75f969c4f120321bc6a7709cde3a9890be3c08ea
+SIZE (cabal/GLURaw-1.3.0.0.tar.gz) = 7779
diff --git a/x11-toolkits/hs-GLURaw/pkg-descr b/x11-toolkits/hs-GLURaw/pkg-descr
new file mode 100644
index 000000000000..ab020ac46afa
--- /dev/null
+++ b/x11-toolkits/hs-GLURaw/pkg-descr
@@ -0,0 +1,8 @@
+GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library.
+It is basically a 1:1 mapping of GLU's C API, intended as a basis for a
+nicer interface. OpenGL is the industry's most widely used and
+supported 2D and 3D graphics application programming interface (API),
+incorporating a broad set of rendering, texture mapping, special
+effects, and other powerful visualization functions.
+
+WWW: http://www.haskell.org/haskellwiki/Opengl
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 5916874a3780..5ad7c8bcc750 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -2,19 +2,16 @@
# $FreeBSD$
PORTNAME= GLUT
-PORTVERSION= 2.1.2.1
-PORTREVISION= 7
+PORTVERSION= 2.4.0.0
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell binding for the OpenGL Utility Toolkit
+COMMENT= Haskell binding for the OpenGL Utility Toolkit
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= OpenGL>=2.2
+USE_CABAL= OpenGL>=2.8 OpenGLRaw>=1.3
USE_GL= glut
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index a1190aaca3ac..976142b55474 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/GLUT-2.1.2.1.tar.gz) = 0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264
-SIZE (cabal/GLUT-2.1.2.1.tar.gz) = 720222
+SHA256 (cabal/GLUT-2.4.0.0.tar.gz) = 100df2d724dfad26b0c8d47b17d4cef9dcbc12a75cce7a096046c27485b4cbbc
+SIZE (cabal/GLUT-2.4.0.0.tar.gz) = 643788
diff --git a/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs b/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs
deleted file mode 100644
index f25bc339120c..000000000000
--- a/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./Graphics/UI/GLUT/Types.hs.orig 2009-05-02 18:14:39.000000000 +0200
-+++ ./Graphics/UI/GLUT/Types.hs 2012-05-17 00:04:47.000000000 +0200
-@@ -32,11 +32,10 @@
-
- -- | An opaque identifier for a top-level window or a subwindow.
-
--newtype Window = Window CInt
-- deriving ( Eq, Ord, Show )
-+type Window = CInt
-
- makeWindow :: CInt -> Window
--makeWindow = Window
-+makeWindow = id
-
- --------------------------------------------------------------------------------
-
diff --git a/x11-toolkits/hs-GLUT/pkg-descr b/x11-toolkits/hs-GLUT/pkg-descr
index 76b9b61e75b1..2cac6daac6db 100644
--- a/x11-toolkits/hs-GLUT/pkg-descr
+++ b/x11-toolkits/hs-GLUT/pkg-descr
@@ -1,4 +1,4 @@
-The GLUT package contains a Haskell binding for the OpenGL Utility Toolkit, a
-window system independent toolkit for writing OpenGL programs.
+A Haskell binding for the OpenGL Utility Toolkit, a window system
+independent toolkit for writing OpenGL programs.
-WWW: http://www.haskell.org/HOpenGL/
+WWW: http://www.haskell.org/haskellwiki/Opengl
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 685b58e77dd7..e8b425180beb 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,18 +2,16 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 2.2.3.1
-PORTREVISION= 4
+PORTVERSION= 2.8.0.0
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A binding for the OpenGL graphics system
+COMMENT= Binding for the OpenGL graphics system
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_GL= gl glut
+USE_CABAL= GLURaw>=1.1.0.0 OpenGLRaw>=1.3.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index 81626a748a80..f241d0a43850 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenGL-2.2.3.1.tar.gz) = 9f8425e36994f6602b66059490d00f5f7d7d59dbb97185c2054c5673688885ee
-SIZE (cabal/OpenGL-2.2.3.1.tar.gz) = 189728
+SHA256 (cabal/OpenGL-2.8.0.0.tar.gz) = ce753d8db75b5096e030422765193c4975779b42bfffa467408a40d8c43965f1
+SIZE (cabal/OpenGL-2.8.0.0.tar.gz) = 123107
diff --git a/x11-toolkits/hs-OpenGL/pkg-descr b/x11-toolkits/hs-OpenGL/pkg-descr
index 30a792f6dab2..6ae7c4bb7d35 100644
--- a/x11-toolkits/hs-OpenGL/pkg-descr
+++ b/x11-toolkits/hs-OpenGL/pkg-descr
@@ -1,8 +1,9 @@
A Haskell binding for the OpenGL graphics system (GL, version 2.1) and
-its accompanying utility library (GLU, version 1.3). OpenGL is the
-industry's most widely used and supported 2D and 3D graphics application
-programming interface (API), incorporating a broad set of rendering,
-texture mapping, special effects, and other powerful visualization
-functions.
+its accompanying utility library (GLU, version 1.3).
-WWW: http://www.haskell.org/HOpenGL/
+OpenGL is the industry's most widely used and supported 2D and 3D
+graphics application programming interface (API), incorporating a broad
+set of rendering, texture mapping, special effects, and other powerful
+visualization functions.
+
+WWW: http://www.haskell.org/haskellwiki/Opengl
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
new file mode 100644
index 000000000000..186d31c653d1
--- /dev/null
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= OpenGLRaw
+PORTVERSION= 1.3.0.0
+CATEGORIES= x11-toolkits haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Raw binding for the OpenGL graphics system
+
+LICENSE= BSD
+
+USE_GL= gl glut
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
new file mode 100644
index 000000000000..a170675a30fc
--- /dev/null
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/OpenGLRaw-1.3.0.0.tar.gz) = 6228ca9ac967350fcb6abac25b8027660ad8599914a60ef0fd10919a6d2cd745
+SIZE (cabal/OpenGLRaw-1.3.0.0.tar.gz) = 75328
diff --git a/x11-toolkits/hs-OpenGLRaw/pkg-descr b/x11-toolkits/hs-OpenGLRaw/pkg-descr
new file mode 100644
index 000000000000..4c9981fb3664
--- /dev/null
+++ b/x11-toolkits/hs-OpenGLRaw/pkg-descr
@@ -0,0 +1,17 @@
+OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system
+and lots of OpenGL extensions. It is basically a 1:1 mapping of
+OpenGL's C API, intended as a basis for a nicer interface. OpenGLRaw
+offers access to all necessary functions, tokens and types plus a
+general facility for loading extension entries. The module hierarchy
+closely mirrors the naming structure of the OpenGL extensions, making it
+easy to find the right module to import. All API entries are loaded
+dynamically, so no special C header files are needed for building this
+package. If an API entry is not found at runtime, a userError is
+thrown.
+
+OpenGL is the industry's most widely used and supported 2D and 3D
+graphics application programming interface (API), incorporating a broad
+set of rendering, texture mapping, special effects, and other powerful
+visualization functions.
+
+WWW: http://www.haskell.org/haskellwiki/Opengl
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index e7a0cc21a5e1..d0e5863cbd25 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -2,16 +2,13 @@
PORTNAME= gtk
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Gtk+ graphical user interface library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12.0 gio>=0.12.0 glib>=0.12.0 mtl pango>=0.12.0
USE_GNOME= gtk20
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index bb445bae6d7f..2c67b5bbb933 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -3,12 +3,12 @@
PORTNAME= gtk2hs
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A GTK2 Binding for Haskell
+COMMENT= GTK2 Binding for Haskell
METAPORT= yes
USE_CABAL= glib gio cairo pango gtk
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index 68d68940b85c..03388ad2327c 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gtkglext
PORTVERSION= 0.12.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +11,7 @@ COMMENT= Binding to the GTK+ OpenGL Extension
LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 81fc71b513de..6b7758bedf66 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -2,16 +2,14 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.12.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the GtkSourceView library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 gtk>=0.12 mtl
USE_GNOME= gtksourceview2
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index ca02c77519c3..9c377dc76779 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -2,16 +2,13 @@
PORTNAME= pango
PORTVERSION= 0.12.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Pango text rendering engine
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12.0 glib>=0.12.0 mtl
USE_GNOME= pango
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 4f309de38991..3216d1157399 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -2,16 +2,14 @@
PORTNAME= vte
PORTVERSION= 0.12.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the VTE library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12
USE_GNOME= vte
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 02f9b70a0c68..713c52b14488 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wx
PORTVERSION= 0.90.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 3cbecf8259be..d21fceb62e56 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -2,14 +2,12 @@
PORTNAME= wxc
PORTVERSION= 0.90.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell C++ wrapper
-CABAL_SETUP= Setup.hs
-
USE_CABAL= wxdirect>=0.90
USE_WX= 2.9
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 5d146c9555a2..a06e04166ef4 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -2,14 +2,12 @@
PORTNAME= wxcore
PORTVERSION= 0.90.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell core
-CABAL_SETUP= Setup.hs
-
USE_CABAL= parsec stm wxc>=0.90.0.4 wxdirect>=0.90
USE_WX= 2.9
diff --git a/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs b/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs
new file mode 100644
index 000000000000..7bbb713f4812
--- /dev/null
+++ b/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs
@@ -0,0 +1,10 @@
+--- ./src/haskell/Graphics/UI/WXCore/Events.hs.orig 2012-07-04 12:29:32.000000000 +0200
++++ ./src/haskell/Graphics/UI/WXCore/Events.hs 2013-05-04 03:24:48.030431193 +0200
+@@ -239,6 +239,7 @@
+
+ import Data.List( intersperse, findIndex )
+ import System.Environment( getProgName, getArgs )
++import Foreign.C.Types ( CInt(..) )
+ import Foreign.StablePtr
+ import Foreign.Ptr
+ import Foreign.C.String
diff --git a/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal b/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
new file mode 100644
index 000000000000..f3eec8462d69
--- /dev/null
+++ b/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
@@ -0,0 +1,11 @@
+--- ./wxcore.cabal.orig 2012-07-04 12:29:33.000000000 +0200
++++ ./wxcore.cabal 2013-04-30 23:37:11.000000000 +0200
+@@ -80,7 +80,7 @@
+ build-depends:
+ array >= 0.2 && < 0.5,
+ base >= 4 && < 5,
+- containers >= 0.2 && < 0.5
++ containers >= 0.2 && < 0.6
+ else
+ build-depends:
+ array >= 0.1 && < 0.3,
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index fc94df2cd0f3..57191908ddc3 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wxdirect
PORTVERSION= 0.90.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Helper tool for building wxHaskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= parsec>=2.1.0 strict
EXECUTABLE= wxdirect
diff --git a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs
new file mode 100644
index 000000000000..c286a3cb265b
--- /dev/null
+++ b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClassInfo.hs
@@ -0,0 +1,10 @@
+--- ./src/CompileClassInfo.hs.orig 2012-04-18 17:05:10.000000000 +0200
++++ ./src/CompileClassInfo.hs 2013-05-04 03:12:14.541798377 +0200
+@@ -45,6 +45,7 @@
+ , [ " ) where"
+ , ""
+ , "import System.IO.Unsafe( unsafePerformIO )"
++ , "import Foreign.C.Types ( CInt(..), CWchar(..), CDouble(..) )"
+ , "import " ++ moduleRoot ++ moduleClassTypesName
+ , "import " ++ moduleRoot ++ "WxcTypes"
+ , "import " ++ moduleRoot ++ moduleClassesName
diff --git a/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs
new file mode 100644
index 000000000000..5e78697528cd
--- /dev/null
+++ b/x11-toolkits/hs-wxdirect/files/patch-src__CompileClasses.hs
@@ -0,0 +1,10 @@
+--- ./src/CompileClasses.hs.orig 2012-04-18 17:05:10.000000000 +0200
++++ ./src/CompileClasses.hs 2013-05-04 03:12:06.682675621 +0200
+@@ -101,6 +101,7 @@
+ , "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
+ , "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
+ , "import System.IO.Unsafe( unsafePerformIO )"
++ , "import Foreign.C.Types ( CInt(..), CWchar(..), CDouble(..) )"
+ , "import " ++ moduleRoot ++ "WxcTypes"
+ , "import " ++ moduleRoot ++ moduleClassTypesName
+ , ""
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
new file mode 100644
index 000000000000..e8e10ac59a1b
--- /dev/null
+++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
@@ -0,0 +1,11 @@
+--- ./wxdirect.cabal.orig 2012-04-18 17:05:11.000000000 +0200
++++ ./wxdirect.cabal 2013-04-30 22:35:06.000000000 +0200
+@@ -66,7 +66,7 @@
+ if flag(splitBase)
+ build-depends:
+ base >= 4 && < 5,
+- containers >= 0.2 && < 0.5
++ containers >= 0.2 && < 0.6
+ else
+ build-depends:
+ base >= 3 && < 4,
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 57a939d41cf7..7299320c12fc 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index dcc1440bfa57..a2a56a0f3e92 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Tiling window manager
LICENSE= BSD
-USE_CABAL= mtl utf8-string>=0.3 X11>=1.5
+USE_CABAL= extensible-exceptions mtl utf8-string>=0.3 X11>=1.5
USE_XORG= x11
MAN1= xmonad.1
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 67e7086bb01e..8ddb55eab4a6 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index b410a3c8d135..b2f452a9572c 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.6.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ COMMENT= Binding to the X11 graphics library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= data-default
USE_XORG= x11 xrandr xext
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 9bdae0f95902..baa43754b029 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.16
-PORTREVISION= 2
+PORTVERSION= 0.17
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Minimalistic text-based status bar
LICENSE= BSD
-USE_CABAL= mtl parsec stm>=2.3 X11
+USE_CABAL= mtl>=2.0 parsec stm>=2.3 X11>=1.6.1
USE_XORG= xrandr
EXECUTABLE= xmobar
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 826b865f8d4d..0e8232b68465 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmobar-0.16.tar.gz) = 115d602018ca20c62b35206864f63008c2ede4739a1229892c8cdcff3c9fa4b7
-SIZE (cabal/xmobar-0.16.tar.gz) = 76102
+SHA256 (cabal/xmobar-0.17.tar.gz) = ba8876287b96be1172ee98d1cb3fd5b69a1209bd2b80b47c7f773bd6711f0b2a
+SIZE (cabal/xmobar-0.17.tar.gz) = 79261