aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
commit0c76a8384fc1de4958eb1228befbee727f00c596 (patch)
tree28680b3da252da7f45a2d25108e4e2a6e41a77e5 /devel
parentf2febc81eeab0d296325ecc49e1825762e5cd5d7 (diff)
downloadports-0c76a8384fc1de4958eb1228befbee727f00c596.tar.gz
ports-0c76a8384fc1de4958eb1228befbee727f00c596.zip
- Please welcome GHC 7.0.3
GHC in the ports tree has been updated to 7.0.3 and all other Haskell ports are also updated to their corresponding Haskell Platform versions, or latest versions. We would like to acknowledge the support of the FreeBSD Donations Team and Eotvos Lorand University, Faculty of Informatics who contributed to the server that we used for testing. We would also like to thank all the testers who tested FreeBSD Haskell ports and provided their feedback. PR: ports/156642 Approved by: tabthorpe (mentor) Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=273838
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile24
-rw-r--r--devel/bnfc/Makefile36
-rw-r--r--devel/bnfc/distinfo3
-rw-r--r--devel/bnfc/pkg-descr15
-rw-r--r--devel/bnfc/pkg-plist126
-rw-r--r--devel/hs-BNFC/Makefile31
-rw-r--r--devel/hs-BNFC/distinfo5
-rw-r--r--devel/hs-BNFC/pkg-descr19
-rw-r--r--devel/hs-BNFC/pkg-plist126
-rw-r--r--devel/hs-Boolean/Makefile4
-rw-r--r--devel/hs-Boolean/distinfo1
-rw-r--r--devel/hs-Boolean/pkg-plist14
-rw-r--r--devel/hs-DeepArrow/Makefile5
-rw-r--r--devel/hs-DeepArrow/pkg-plist23
-rw-r--r--devel/hs-FileManip/Makefile18
-rw-r--r--devel/hs-FileManip/distinfo3
-rw-r--r--devel/hs-FileManip/pkg-descr4
-rw-r--r--devel/hs-FileManip/pkg-plist19
-rw-r--r--devel/hs-MemoTrie/Makefile5
-rw-r--r--devel/hs-MemoTrie/distinfo5
-rw-r--r--devel/hs-MemoTrie/pkg-plist13
-rw-r--r--devel/hs-MissingH/Makefile6
-rw-r--r--devel/hs-MissingH/distinfo1
-rw-r--r--devel/hs-MissingH/pkg-plist92
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile6
-rw-r--r--devel/hs-MonadCatchIO-mtl/distinfo5
-rw-r--r--devel/hs-MonadCatchIO-mtl/pkg-plist14
-rw-r--r--devel/hs-ObjectName/Makefile3
-rw-r--r--devel/hs-ObjectName/distinfo1
-rw-r--r--devel/hs-ObjectName/pkg-plist14
-rw-r--r--devel/hs-QuickCheck/Makefile6
-rw-r--r--devel/hs-QuickCheck/distinfo5
-rw-r--r--devel/hs-QuickCheck/pkg-plist26
-rw-r--r--devel/hs-StateVar/Makefile3
-rw-r--r--devel/hs-StateVar/distinfo1
-rw-r--r--devel/hs-StateVar/pkg-plist14
-rw-r--r--devel/hs-Stream/Makefile7
-rw-r--r--devel/hs-Stream/distinfo5
-rw-r--r--devel/hs-Stream/pkg-plist14
-rw-r--r--devel/hs-Tensor/Makefile3
-rw-r--r--devel/hs-Tensor/distinfo1
-rw-r--r--devel/hs-Tensor/pkg-plist14
-rw-r--r--devel/hs-TypeCompose/Makefile4
-rw-r--r--devel/hs-TypeCompose/distinfo5
-rw-r--r--devel/hs-TypeCompose/pkg-plist23
-rw-r--r--devel/hs-alex/Makefile10
-rw-r--r--devel/hs-alex/distinfo5
-rw-r--r--devel/hs-alex/pkg-plist18
-rw-r--r--devel/hs-ansi-terminal/Makefile6
-rw-r--r--devel/hs-ansi-terminal/distinfo5
-rw-r--r--devel/hs-ansi-terminal/pkg-plist19
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile8
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo5
-rw-r--r--devel/hs-ansi-wl-pprint/pkg-plist17
-rw-r--r--devel/hs-arrows/Makefile6
-rw-r--r--devel/hs-arrows/distinfo5
-rw-r--r--devel/hs-arrows/pkg-plist27
-rw-r--r--devel/hs-binary/Makefile3
-rw-r--r--devel/hs-binary/distinfo1
-rw-r--r--devel/hs-binary/pkg-plist18
-rw-r--r--devel/hs-bsd-sysctl/Makefile3
-rw-r--r--devel/hs-bsd-sysctl/distinfo1
-rw-r--r--devel/hs-bsd-sysctl/pkg-plist15
-rw-r--r--devel/hs-c2hs/Makefile6
-rw-r--r--devel/hs-c2hs/distinfo1
-rw-r--r--devel/hs-c2hs/pkg-descr3
-rw-r--r--devel/hs-c2hs/pkg-plist4
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-convertible/Makefile6
-rw-r--r--devel/hs-convertible/distinfo1
-rw-r--r--devel/hs-convertible/pkg-plist23
-rw-r--r--devel/hs-cpphs/Makefile4
-rw-r--r--devel/hs-cpphs/distinfo1
-rw-r--r--devel/hs-cpphs/pkg-plist30
-rw-r--r--devel/hs-darcs/Makefile35
-rw-r--r--devel/hs-darcs/distinfo5
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs14
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal83
-rw-r--r--devel/hs-darcs/pkg-plist160
-rw-r--r--devel/hs-datetime/Makefile6
-rw-r--r--devel/hs-datetime/distinfo1
-rw-r--r--devel/hs-datetime/files/patch-datetime.cabal11
-rw-r--r--devel/hs-datetime/pkg-plist14
-rw-r--r--devel/hs-deepseq/Makefile4
-rw-r--r--devel/hs-deepseq/distinfo5
-rw-r--r--devel/hs-deepseq/pkg-plist14
-rw-r--r--devel/hs-dlist/Makefile4
-rw-r--r--devel/hs-dlist/distinfo1
-rw-r--r--devel/hs-dlist/pkg-plist14
-rw-r--r--devel/hs-drift/Makefile2
-rw-r--r--devel/hs-drift/distinfo1
-rw-r--r--devel/hs-fgl/Makefile4
-rw-r--r--devel/hs-fgl/distinfo1
-rw-r--r--devel/hs-fgl/pkg-plist47
-rw-r--r--devel/hs-filemanip/Makefile8
-rw-r--r--devel/hs-filemanip/distinfo5
-rw-r--r--devel/hs-filemanip/pkg-descr2
-rw-r--r--devel/hs-filemanip/pkg-plist19
-rw-r--r--devel/hs-ghc-mtl/Makefile5
-rw-r--r--devel/hs-ghc-mtl/distinfo1
-rw-r--r--devel/hs-ghc-mtl/pkg-plist15
-rw-r--r--devel/hs-ghc-paths-docs/Makefile5
-rw-r--r--devel/hs-ghc-paths-docs/distinfo5
-rw-r--r--devel/hs-ghc-paths/Makefile9
-rw-r--r--devel/hs-ghc-paths/distinfo5
-rw-r--r--devel/hs-ghc-paths/pkg-plist14
-rw-r--r--devel/hs-haddock-docs/Makefile17
-rw-r--r--devel/hs-haddock-docs/distinfo5
-rw-r--r--devel/hs-haddock/Makefile40
-rw-r--r--devel/hs-haddock/distinfo5
-rw-r--r--devel/hs-haddock/files/pkg-deinstall.in6
-rw-r--r--devel/hs-haddock/pkg-plist23
-rw-r--r--devel/hs-happy/Makefile14
-rw-r--r--devel/hs-happy/distinfo5
-rw-r--r--devel/hs-happy/pkg-plist17
-rw-r--r--devel/hs-hashed-storage/Makefile13
-rw-r--r--devel/hs-hashed-storage/distinfo5
-rw-r--r--devel/hs-hashed-storage/pkg-plist28
-rw-r--r--devel/hs-haskeline/Makefile6
-rw-r--r--devel/hs-haskeline/distinfo5
-rw-r--r--devel/hs-haskeline/pkg-plist45
-rw-r--r--devel/hs-haskell-src-exts/Makefile6
-rw-r--r--devel/hs-haskell-src-exts/distinfo5
-rw-r--r--devel/hs-haskell-src-exts/pkg-plist37
-rw-r--r--devel/hs-hdoc/Makefile4
-rw-r--r--devel/hs-hint/Makefile7
-rw-r--r--devel/hs-hint/distinfo5
-rw-r--r--devel/hs-hint/pkg-plist36
-rw-r--r--devel/hs-hmake/Makefile4
-rw-r--r--devel/hs-hoogle/Makefile10
-rw-r--r--devel/hs-hoogle/distinfo5
-rw-r--r--devel/hs-hoogle/files/patch-hoogle.cabal22
-rw-r--r--devel/hs-hoogle/files/patch-src__General__Web.hs11
-rw-r--r--devel/hs-hoogle/files/patch-src__Web__Server.hs11
-rw-r--r--devel/hs-hoogle/pkg-plist4
-rw-r--r--devel/hs-hslogger/Makefile18
-rw-r--r--devel/hs-hslogger/distinfo5
-rw-r--r--devel/hs-hslogger/pkg-plist23
-rw-r--r--devel/hs-idoc/Makefile5
-rw-r--r--devel/hs-idoc/distinfo1
-rw-r--r--devel/hs-idoc/files/patch-Makefile40
-rw-r--r--devel/hs-language-c/Makefile5
-rw-r--r--devel/hs-language-c/distinfo5
-rw-r--r--devel/hs-language-c/pkg-plist51
-rw-r--r--devel/hs-lazysmallcheck/Makefile3
-rw-r--r--devel/hs-lazysmallcheck/distinfo1
-rw-r--r--devel/hs-lazysmallcheck/pkg-plist14
-rw-r--r--devel/hs-mmap/Makefile6
-rw-r--r--devel/hs-mmap/distinfo5
-rw-r--r--devel/hs-mmap/pkg-plist15
-rw-r--r--devel/hs-mueval/Makefile6
-rw-r--r--devel/hs-mueval/distinfo5
-rw-r--r--devel/hs-mueval/files/patch-Mueval__Interpreter.hs11
-rw-r--r--devel/hs-mueval/files/patch-mueval.cabal11
-rw-r--r--devel/hs-mueval/pkg-plist20
-rw-r--r--devel/hs-pcre-light/Makefile3
-rw-r--r--devel/hs-pcre-light/distinfo1
-rw-r--r--devel/hs-pcre-light/pkg-plist19
-rw-r--r--devel/hs-primitive/Makefile4
-rw-r--r--devel/hs-primitive/distinfo5
-rw-r--r--devel/hs-primitive/pkg-plist25
-rw-r--r--devel/hs-reactive/Makefile5
-rw-r--r--devel/hs-reactive/distinfo1
-rw-r--r--devel/hs-reactive/pkg-plist41
-rw-r--r--devel/hs-readline/Makefile4
-rw-r--r--devel/hs-readline/distinfo1
-rw-r--r--devel/hs-readline/pkg-plist19
-rw-r--r--devel/hs-safe/Makefile4
-rw-r--r--devel/hs-safe/distinfo5
-rw-r--r--devel/hs-safe/pkg-plist13
-rw-r--r--devel/hs-show/Makefile8
-rw-r--r--devel/hs-show/distinfo5
-rw-r--r--devel/hs-show/pkg-plist16
-rw-r--r--devel/hs-smallcheck/Makefile3
-rw-r--r--devel/hs-smallcheck/distinfo1
-rw-r--r--devel/hs-smallcheck/pkg-plist14
-rw-r--r--devel/hs-split/Makefile4
-rw-r--r--devel/hs-split/distinfo5
-rw-r--r--devel/hs-split/pkg-plist17
-rw-r--r--devel/hs-terminfo/Makefile3
-rw-r--r--devel/hs-terminfo/distinfo1
-rw-r--r--devel/hs-terminfo/pkg-plist22
-rw-r--r--devel/hs-test-framework-hunit/Makefile5
-rw-r--r--devel/hs-test-framework-hunit/distinfo1
-rw-r--r--devel/hs-test-framework-hunit/pkg-plist16
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile6
-rw-r--r--devel/hs-test-framework-quickcheck2/distinfo5
-rw-r--r--devel/hs-test-framework-quickcheck2/pkg-plist16
-rw-r--r--devel/hs-test-framework/Makefile7
-rw-r--r--devel/hs-test-framework/distinfo5
-rw-r--r--devel/hs-test-framework/pkg-plist41
-rw-r--r--devel/hs-testpack/Makefile6
-rw-r--r--devel/hs-testpack/distinfo5
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs38
-rw-r--r--devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs17
-rw-r--r--devel/hs-testpack/pkg-plist18
-rw-r--r--devel/hs-transformers/Makefile4
-rw-r--r--devel/hs-transformers/distinfo5
-rw-r--r--devel/hs-transformers/pkg-plist42
-rw-r--r--devel/hs-unamb/Makefile4
-rw-r--r--devel/hs-unamb/distinfo5
-rw-r--r--devel/hs-unamb/pkg-plist13
-rw-r--r--devel/hs-uniplate/Makefile5
-rw-r--r--devel/hs-uniplate/distinfo5
-rw-r--r--devel/hs-uniplate/pkg-plist36
-rw-r--r--devel/hs-unix-compat/Makefile4
-rw-r--r--devel/hs-unix-compat/distinfo5
-rw-r--r--devel/hs-unix-compat/pkg-plist20
-rw-r--r--devel/hs-utf8-string/Makefile3
-rw-r--r--devel/hs-utf8-string/distinfo1
-rw-r--r--devel/hs-utf8-string/pkg-plist29
-rw-r--r--devel/hs-utility-ht/Makefile3
-rw-r--r--devel/hs-utility-ht/distinfo1
-rw-r--r--devel/hs-utility-ht/pkg-plist55
-rw-r--r--devel/hs-uuagc/Makefile6
-rw-r--r--devel/hs-uuagc/distinfo5
-rw-r--r--devel/hs-uuagc/pkg-plist21
-rw-r--r--devel/hs-uulib/Makefile5
-rw-r--r--devel/hs-uulib/distinfo5
-rw-r--r--devel/hs-uulib/pkg-plist44
-rw-r--r--devel/hs-uvector-algorithms/Makefile18
-rw-r--r--devel/hs-uvector-algorithms/distinfo3
-rw-r--r--devel/hs-uvector-algorithms/pkg-descr4
-rw-r--r--devel/hs-uvector-algorithms/pkg-plist24
-rw-r--r--devel/hs-uvector/Makefile18
-rw-r--r--devel/hs-uvector/distinfo3
-rw-r--r--devel/hs-uvector/pkg-descr7
-rw-r--r--devel/hs-uvector/pkg-plist32
-rw-r--r--devel/hs-vector-algorithms/Makefile6
-rw-r--r--devel/hs-vector-algorithms/distinfo5
-rw-r--r--devel/hs-vector-algorithms/pkg-plist26
-rw-r--r--devel/hs-vector/Makefile6
-rw-r--r--devel/hs-vector/distinfo5
-rw-r--r--devel/hs-vector/pkg-plist42
-rw-r--r--devel/lhs2TeX/Makefile50
-rw-r--r--devel/lhs2TeX/distinfo3
-rw-r--r--devel/lhs2TeX/files/patch-Makefile34
-rw-r--r--devel/lhs2TeX/files/patch-configure66
-rw-r--r--devel/lhs2TeX/pkg-descr4
-rw-r--r--devel/lhs2TeX/pkg-plist6
-rw-r--r--devel/pure-gen/Makefile3
241 files changed, 670 insertions, 2651 deletions
diff --git a/devel/Makefile b/devel/Makefile
index f1154587b1eb..16b54332b8b1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -100,7 +100,6 @@
SUBDIR += bmake
SUBDIR += bncsutil-ghost++
SUBDIR += bnf
- SUBDIR += bnfc
SUBDIR += boaconstructor
SUBDIR += boehm-gc
SUBDIR += boehm-gc-redirect
@@ -555,8 +554,9 @@
SUBDIR += hp48cc
SUBDIR += hp48xgcc
SUBDIR += hs-Boolean
+ SUBDIR += hs-BNFC
SUBDIR += hs-DeepArrow
- SUBDIR += hs-FileManip
+ SUBDIR += hs-HUnit
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
SUBDIR += hs-MonadCatchIO-mtl
@@ -571,7 +571,9 @@
SUBDIR += hs-ansi-wl-pprint
SUBDIR += hs-arrows
SUBDIR += hs-binary
+ SUBDIR += hs-blaze-builder
SUBDIR += hs-bsd-sysctl
+ SUBDIR += hs-cmdargs
SUBDIR += hs-c2hs
SUBDIR += hs-checkers
SUBDIR += hs-convertible
@@ -581,15 +583,23 @@
SUBDIR += hs-deepseq
SUBDIR += hs-dlist
SUBDIR += hs-drift
+ SUBDIR += hs-enumerator
SUBDIR += hs-fgl
+ SUBDIR += hs-filemanip
+ SUBDIR += hs-gconf
SUBDIR += hs-ghc-mtl
SUBDIR += hs-ghc-paths
SUBDIR += hs-ghc-paths-docs
+ SUBDIR += hs-gio
+ SUBDIR += hs-glade
+ SUBDIR += hs-glib
+ SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
SUBDIR += hs-haddock-docs
SUBDIR += hs-happy
SUBDIR += hs-hashed-storage
SUBDIR += hs-haskeline
+ SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
SUBDIR += hs-hat
SUBDIR += hs-hdoc
@@ -600,8 +610,11 @@
SUBDIR += hs-idoc
SUBDIR += hs-language-c
SUBDIR += hs-lazysmallcheck
+ SUBDIR += hs-mtl
+ SUBDIR += hs-mtl-docs
SUBDIR += hs-mmap
SUBDIR += hs-mueval
+ SUBDIR += hs-parallel
SUBDIR += hs-pcre-light
SUBDIR += hs-primitive
SUBDIR += hs-reactive
@@ -610,12 +623,16 @@
SUBDIR += hs-show
SUBDIR += hs-smallcheck
SUBDIR += hs-split
+ SUBDIR += hs-stm
+ SUBDIR += hs-syb
SUBDIR += hs-terminfo
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
SUBDIR += hs-testpack
+ SUBDIR += hs-text
SUBDIR += hs-transformers
+ SUBDIR += hs-transformers-docs
SUBDIR += hs-unamb
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
@@ -623,8 +640,6 @@
SUBDIR += hs-utility-ht
SUBDIR += hs-uuagc
SUBDIR += hs-uulib
- SUBDIR += hs-uvector
- SUBDIR += hs-uvector-algorithms
SUBDIR += hs-vector
SUBDIR += hs-vector-algorithms
SUBDIR += htable
@@ -712,7 +727,6 @@
SUBDIR += lexi
SUBDIR += lfc
SUBDIR += lfcxml
- SUBDIR += lhs2TeX
SUBDIR += libIDL
SUBDIR += libPropList
SUBDIR += libXGP
diff --git a/devel/bnfc/Makefile b/devel/bnfc/Makefile
deleted file mode 100644
index 0193f06b64b9..000000000000
--- a/devel/bnfc/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for: bnfc
-# Date created: 2007-02-11
-# Whom: Kai Wang <kaiw27@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= bnfc
-PORTVERSION= 2.4b
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= http://www.cs.chalmers.se/Cs/Research/Language-technology/BNFC/download/ \
- http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
-DISTNAME= BNFC-${PORTVERSION}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= kaiw27@gmail.com
-COMMENT= A Labelled BNF converter
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-WRKSRC= ${WRKDIR}/BNFC
-USE_GMAKE= yes
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bnfc ${PREFIX}/bin
-
-post-install:
- ${MKDIR} ${EXAMPLESDIR}
- ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/bnfc/distinfo b/devel/bnfc/distinfo
deleted file mode 100644
index d76c688498db..000000000000
--- a/devel/bnfc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (BNFC-2.4b.tgz) = 8eac71d4883e5209a6c78fbad2c2c5fd
-SHA256 (BNFC-2.4b.tgz) = fba3ae8546f37bed3ca224db336e6417b5ead442570f09e15be0507334c01772
-SIZE (BNFC-2.4b.tgz) = 1073563
diff --git a/devel/bnfc/pkg-descr b/devel/bnfc/pkg-descr
deleted file mode 100644
index 6f9ec8f2a61a..000000000000
--- a/devel/bnfc/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The BNF Converter is a compiler construction tool generating a
-compiler front-end from a Labeled BNF grammar. It was originally
-written to generate Haskell, but starting from Version 2.0, it can
-also be used for generating Java, C++, and C.
-
-Given a Labeled BNF grammar the tool produces:
-
- * an abstract syntax as a Haskell/C++/C module or Java directory
- * a case skeleton for the abstract syntax in the same language
- * an Alex, JLex, or Flex lexer generator file
- * a Happy, CUP, or Bison parser generator file
- * a pretty-printer as a Haskell/Java/C++/C module
- * a Latex file containing a readable specification of the language
-
-WWW: http://www.cs.chalmers.se/~markus/BNFC/
diff --git a/devel/bnfc/pkg-plist b/devel/bnfc/pkg-plist
deleted file mode 100644
index a0e908079abd..000000000000
--- a/devel/bnfc/pkg-plist
+++ /dev/null
@@ -1,126 +0,0 @@
-bin/bnfc
-%%PORTDOCS%%%%DOCSDIR%%/BNF.jpg
-%%PORTDOCS%%%%DOCSDIR%%/BNFC_XML.html
-%%PORTDOCS%%%%DOCSDIR%%/BNFConv.bib
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_CPP_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_C_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Haskell_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Java1_5_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Java_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_OCaml_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Report.tex
-%%PORTDOCS%%%%DOCSDIR%%/CC-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/CC-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/HW-tooldemo.tex
-%%PORTDOCS%%%%DOCSDIR%%/HW2004.pdf
-%%PORTDOCS%%%%DOCSDIR%%/HW2004.sxi
-%%PORTDOCS%%%%DOCSDIR%%/HW2004_slides.tex
-%%PORTDOCS%%%%DOCSDIR%%/LBNF-report.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LBNF-report.tex
-%%PORTDOCS%%%%DOCSDIR%%/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/bnf-converter.html
-%%PORTDOCS%%%%DOCSDIR%%/bnfc_1.1.html
-%%PORTDOCS%%%%DOCSDIR%%/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/BNFConv.bib
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/CC-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/CC-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/examples/Alfa.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/C.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/DefinedRules.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/LBNF.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/Sorting.alfa
-%%PORTDOCS%%%%DOCSDIR%%/examples/runtime.c
-%%PORTDOCS%%%%DOCSDIR%%/glr-bnfc.html
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/GPCE-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/GPCE-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/pragmas.html
-%%PORTDOCS%%%%DOCSDIR%%/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/quick.html
-%%PORTDOCS%%%%DOCSDIR%%/retrospect2006.txt
-%%PORTDOCS%%%%DOCSDIR%%/sig-alt.cls
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/BNFC_tech_2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/BNFC_tech_2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/ChalmGUmarke.eps
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/ChalmGUtextsvEng.eps
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/tech2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/bnfc-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/bnfc-tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/Calc.cf
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpret.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpreter.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpreter.h
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/ex1.calc
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Compile.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Compiler.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Interpret.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Interpreter.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/java/Calc/Interpret.java
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/java/Calc/Interpreter.java
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/cmm/CMM.cf
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/cmm/fibonacci.cmm
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuttree.dot
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuttree.png
-%%PORTDOCS%%%%DOCSDIR%%/user.html
-%%EXAMPLESDIR%%/C4.cf
-%%EXAMPLESDIR%%/JavaletteLight.cf
-%%EXAMPLESDIR%%/OCL.cf
-%%EXAMPLESDIR%%/Prolog.cf
-%%EXAMPLESDIR%%/fstStudio.cf
-%%EXAMPLESDIR%%/haskell-core/AbsCore.hcr
-%%EXAMPLESDIR%%/haskell-core/Core.cf
-%%EXAMPLESDIR%%/haskell-core/Hello.hcr
-%%EXAMPLESDIR%%/haskell-core/ParCore.hcr
-%%EXAMPLESDIR%%/haskell-core/README
-%%EXAMPLESDIR%%/haskell-core/TopCore.hs
-%%EXAMPLESDIR%%/haskell-core/notes.txt
-%%EXAMPLESDIR%%/koe.jll
-%%EXAMPLESDIR%%/koe2.c
-%%EXAMPLESDIR%%/multi/Arithm.cf
-%%EXAMPLESDIR%%/multi/TestArithm.hs
-%%EXAMPLESDIR%%/multi/types/Types.cf
-%%EXAMPLESDIR%%/multi/types/ex.old
-%%EXAMPLESDIR%%/prolog.pl
-%%EXAMPLESDIR%%/small.pl
-@dirrm %%EXAMPLESDIR%%/multi/types
-@dirrm %%EXAMPLESDIR%%/multi
-@dirrm %%EXAMPLESDIR%%/haskell-core
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/cmm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/java/Calc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/java
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/haskell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/c
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-2004
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gpce-04
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cc-2004
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 0193f06b64b9..0a870448cfa1 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -5,32 +5,21 @@
# $FreeBSD$
#
-PORTNAME= bnfc
-PORTVERSION= 2.4b
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= http://www.cs.chalmers.se/Cs/Research/Language-technology/BNFC/download/ \
- http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
-DISTNAME= BNFC-${PORTVERSION}
-EXTRACT_SUFX= .tgz
+PORTNAME= BNFC
+PORTVERSION= 2.4.2.0
+CATEGORIES= devel haskell
MAINTAINER= kaiw27@gmail.com
COMMENT= A Labelled BNF converter
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
+LICENSE= GPLv2
+FILE_LICENSE= COPYING
-WRKSRC= ${WRKDIR}/BNFC
-USE_GMAKE= yes
+USE_CABAL= mtl
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bnfc ${PREFIX}/bin
-
-post-install:
- ${MKDIR} ${EXAMPLESDIR}
- ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+STANDALONE= yes
+EXECUTABLE= bnfc
+PORTDATA= *
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index d76c688498db..5a5afee487fa 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,3 +1,2 @@
-MD5 (BNFC-2.4b.tgz) = 8eac71d4883e5209a6c78fbad2c2c5fd
-SHA256 (BNFC-2.4b.tgz) = fba3ae8546f37bed3ca224db336e6417b5ead442570f09e15be0507334c01772
-SIZE (BNFC-2.4b.tgz) = 1073563
+SHA256 (cabal/BNFC-2.4.2.0.tar.gz) = c0c69b50f17e13cf5afd9c9d8ce2cabab1273c14bebc91f4f065068af5a7ca5a
+SIZE (cabal/BNFC-2.4.2.0.tar.gz) = 182328
diff --git a/devel/hs-BNFC/pkg-descr b/devel/hs-BNFC/pkg-descr
index 6f9ec8f2a61a..6790411ab8fe 100644
--- a/devel/hs-BNFC/pkg-descr
+++ b/devel/hs-BNFC/pkg-descr
@@ -1,15 +1,6 @@
-The BNF Converter is a compiler construction tool generating a
-compiler front-end from a Labeled BNF grammar. It was originally
-written to generate Haskell, but starting from Version 2.0, it can
-also be used for generating Java, C++, and C.
+The BNF Converter is a compiler construction tool generating a compiler
+front-end from a Labeled BNF grammar. It was originally written to generate
+Haskell, but starting from Version 2.0, it can also be used for generating
+Java, C++, and C.
-Given a Labeled BNF grammar the tool produces:
-
- * an abstract syntax as a Haskell/C++/C module or Java directory
- * a case skeleton for the abstract syntax in the same language
- * an Alex, JLex, or Flex lexer generator file
- * a Happy, CUP, or Bison parser generator file
- * a pretty-printer as a Haskell/Java/C++/C module
- * a Latex file containing a readable specification of the language
-
-WWW: http://www.cs.chalmers.se/~markus/BNFC/
+WWW: http://www.cse.chalmers.se/research/group/Language-technology/BNFC/
diff --git a/devel/hs-BNFC/pkg-plist b/devel/hs-BNFC/pkg-plist
deleted file mode 100644
index a0e908079abd..000000000000
--- a/devel/hs-BNFC/pkg-plist
+++ /dev/null
@@ -1,126 +0,0 @@
-bin/bnfc
-%%PORTDOCS%%%%DOCSDIR%%/BNF.jpg
-%%PORTDOCS%%%%DOCSDIR%%/BNFC_XML.html
-%%PORTDOCS%%%%DOCSDIR%%/BNFConv.bib
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_CPP_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_C_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Haskell_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Java1_5_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_Java_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Converter_OCaml_Mode.html
-%%PORTDOCS%%%%DOCSDIR%%/BNF_Report.tex
-%%PORTDOCS%%%%DOCSDIR%%/CC-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/CC-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/HW-tooldemo.tex
-%%PORTDOCS%%%%DOCSDIR%%/HW2004.pdf
-%%PORTDOCS%%%%DOCSDIR%%/HW2004.sxi
-%%PORTDOCS%%%%DOCSDIR%%/HW2004_slides.tex
-%%PORTDOCS%%%%DOCSDIR%%/LBNF-report.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LBNF-report.tex
-%%PORTDOCS%%%%DOCSDIR%%/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/bnf-converter.html
-%%PORTDOCS%%%%DOCSDIR%%/bnfc_1.1.html
-%%PORTDOCS%%%%DOCSDIR%%/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/BNFConv.bib
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/CC-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/CC-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/cc-2004/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/examples/Alfa.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/C.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/DefinedRules.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/LBNF.cf
-%%PORTDOCS%%%%DOCSDIR%%/examples/Sorting.alfa
-%%PORTDOCS%%%%DOCSDIR%%/examples/runtime.c
-%%PORTDOCS%%%%DOCSDIR%%/glr-bnfc.html
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/GPCE-2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/GPCE-2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/LBNF.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/c.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/cpp.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/gpce-04/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/haskell.tex
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/java.tex
-%%PORTDOCS%%%%DOCSDIR%%/lbnf_spec.tex
-%%PORTDOCS%%%%DOCSDIR%%/llncs.cls
-%%PORTDOCS%%%%DOCSDIR%%/pragmas.html
-%%PORTDOCS%%%%DOCSDIR%%/prototyping.tex
-%%PORTDOCS%%%%DOCSDIR%%/quick.html
-%%PORTDOCS%%%%DOCSDIR%%/retrospect2006.txt
-%%PORTDOCS%%%%DOCSDIR%%/sig-alt.cls
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/BNFC_tech_2004.bib
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/BNFC_tech_2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/ChalmGUmarke.eps
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/ChalmGUtextsvEng.eps
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/tech-2004/tech2004.tex
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/bnfc-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/bnfc-tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/Calc.cf
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpret.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpreter.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/c/Interpreter.h
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/ex1.calc
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Compile.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Compiler.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Interpret.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/haskell/Interpreter.hs
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/java/Calc/Interpret.java
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/calc/java/Calc/Interpreter.java
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/cmm/CMM.cf
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/cmm/fibonacci.cmm
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuttree.dot
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/tuttree.png
-%%PORTDOCS%%%%DOCSDIR%%/user.html
-%%EXAMPLESDIR%%/C4.cf
-%%EXAMPLESDIR%%/JavaletteLight.cf
-%%EXAMPLESDIR%%/OCL.cf
-%%EXAMPLESDIR%%/Prolog.cf
-%%EXAMPLESDIR%%/fstStudio.cf
-%%EXAMPLESDIR%%/haskell-core/AbsCore.hcr
-%%EXAMPLESDIR%%/haskell-core/Core.cf
-%%EXAMPLESDIR%%/haskell-core/Hello.hcr
-%%EXAMPLESDIR%%/haskell-core/ParCore.hcr
-%%EXAMPLESDIR%%/haskell-core/README
-%%EXAMPLESDIR%%/haskell-core/TopCore.hs
-%%EXAMPLESDIR%%/haskell-core/notes.txt
-%%EXAMPLESDIR%%/koe.jll
-%%EXAMPLESDIR%%/koe2.c
-%%EXAMPLESDIR%%/multi/Arithm.cf
-%%EXAMPLESDIR%%/multi/TestArithm.hs
-%%EXAMPLESDIR%%/multi/types/Types.cf
-%%EXAMPLESDIR%%/multi/types/ex.old
-%%EXAMPLESDIR%%/prolog.pl
-%%EXAMPLESDIR%%/small.pl
-@dirrm %%EXAMPLESDIR%%/multi/types
-@dirrm %%EXAMPLESDIR%%/multi
-@dirrm %%EXAMPLESDIR%%/haskell-core
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/cmm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/java/Calc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/java
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/haskell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc/c
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/calc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-2004
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gpce-04
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cc-2004
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 3a6f794db17a..9baf9e83085f 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -7,10 +7,14 @@
PORTNAME= Boolean
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generalized booleans
+LICENSE= BSD
+FILE_LICENSE= COPYING
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index fe4a0bcbaf42..125dfbac8ffd 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/Boolean-0.0.1.tar.gz) = b6cc0d88fae2629693128cb1a7a30cbb
SHA256 (cabal/Boolean-0.0.1.tar.gz) = dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765
SIZE (cabal/Boolean-0.0.1.tar.gz) = 3174
diff --git a/devel/hs-Boolean/pkg-plist b/devel/hs-Boolean/pkg-plist
deleted file mode 100644
index 499079e3b760..000000000000
--- a/devel/hs-Boolean/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Boolean.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile
index 2b96c7104f3b..f7512819eb12 100644
--- a/devel/hs-DeepArrow/Makefile
+++ b/devel/hs-DeepArrow/Makefile
@@ -7,12 +7,15 @@
PORTNAME= DeepArrow
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell arrows for deep application
-USE_HACKAGE= TypeCompose>=0.6.7
+LICENSE= BSD
+
+USE_CABAL= haskell-src mtl TypeCompose>=0.6.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-DeepArrow/pkg-plist b/devel/hs-DeepArrow/pkg-plist
deleted file mode 100644
index 5885a7d1c0b9..000000000000
--- a/devel/hs-DeepArrow/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/DeepArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/DeepArrow/Examples.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DDeepArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/FunArr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Parens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/ToHs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/DeepArrow
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-FileManip/Makefile b/devel/hs-FileManip/Makefile
deleted file mode 100644
index d67c88cdbd5c..000000000000
--- a/devel/hs-FileManip/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: hs-FileManip
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= FileManip
-PORTVERSION= 0.3.3
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Expressive file and directory manipulation for Haskell
-
-CONFIGURE_ARGS+= --constraint='base<4'
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-FileManip/distinfo b/devel/hs-FileManip/distinfo
deleted file mode 100644
index 9e75b2a360de..000000000000
--- a/devel/hs-FileManip/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cabal/FileManip-0.3.3.tar.gz) = 8399e5d22720f140dd1cd6a0f96ae56b
-SHA256 (cabal/FileManip-0.3.3.tar.gz) = 70f880986543476fa8cb8a69bfcd90ee407dc826f6e884771648a25db664f13d
-SIZE (cabal/FileManip-0.3.3.tar.gz) = 10556
diff --git a/devel/hs-FileManip/pkg-descr b/devel/hs-FileManip/pkg-descr
deleted file mode 100644
index 83169fdebeb0..000000000000
--- a/devel/hs-FileManip/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A Haskell library for working with files and directories. Includes code
-for pattern matching, finding files, modifying file contents, and more.
-
-WWW: http://hackage.haskell.org/package/FileManip
diff --git a/devel/hs-FileManip/pkg-plist b/devel/hs-FileManip/pkg-plist
deleted file mode 100644
index b5c1a0c77f0a..000000000000
--- a/devel/hs-FileManip/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Find.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Glob.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/GlobPattern.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Manip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index ef1fc9152fb5..9b8b9d850f09 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -6,11 +6,14 @@
#
PORTNAME= MemoTrie
-PORTVERSION= 0.4.7
+PORTVERSION= 0.4.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Trie-based memo functions for Haskell
+LICENSE= BSD
+FILE_LICENSE= COPYING
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index d296d5bbdcb0..8cd92c2fe6a9 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/MemoTrie-0.4.7.tar.gz) = 4285bd9f1968f373d45c39b37eae2366
-SHA256 (cabal/MemoTrie-0.4.7.tar.gz) = b3558ce6eb9c54052b775860b491d4d70855476b8504523450e6b272d2cdf7fc
-SIZE (cabal/MemoTrie-0.4.7.tar.gz) = 5647
+SHA256 (cabal/MemoTrie-0.4.9.tar.gz) = f17dd0b73c1a11a6edb38fb6f457b9687f2e93aa4677e90f7ec482a528ac02e7
+SIZE (cabal/MemoTrie-0.4.9.tar.gz) = 6857
diff --git a/devel/hs-MemoTrie/pkg-plist b/devel/hs-MemoTrie/pkg-plist
deleted file mode 100644
index 53e8a7a7baa3..000000000000
--- a/devel/hs-MemoTrie/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/MemoTrie.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 797c12f16824..d226bd87e7e5 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -7,13 +7,17 @@
PORTNAME= MissingH
PORTVERSION= 1.1.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Large Haskell utility library
+LICENSE= GPLv2
+FILE_LICENSE= COPYRIGHT
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= hslogger
+USE_CABAL= hslogger HUnit mtl network parsec regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index 8e6be657e49b..538ab48bef02 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/MissingH-1.1.0.3.tar.gz) = a64af1885d60523fe598b4dad086fa6e
SHA256 (cabal/MissingH-1.1.0.3.tar.gz) = 2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf
SIZE (cabal/MissingH-1.1.0.3.tar.gz) = 122038
diff --git a/devel/hs-MissingH/pkg-plist b/devel/hs-MissingH/pkg-plist
deleted file mode 100644
index 34b84a4df01e..000000000000
--- a/devel/hs-MissingH/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Concurrent/Thread/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/BinPacking.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bits/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/CSV.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Compression/Inflate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Either/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/CRC32/GZip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/CRC32/Posix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/MD5.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/MD5/Zord64_HARD.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/MIME/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Map/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maybe/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Progress/Meter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Progress/Tracker.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Quantity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tuple/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Email/Mailbox.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Email/Sendmail.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/SocketServer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Cmd/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/GetOpt/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Daemon.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Debian.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Debian/ControlParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FileArchive/GZip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/Binary.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVFS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVFS/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVFS/InstanceHelpers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVFS/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/PlafCompat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/StatCompat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/WindowsCompat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Path.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Path/Glob.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Path/NameManip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Path/WildMatch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Posix/Consts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Time/ParseDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Time/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Parsec/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Parsec
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Time
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Posix
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Path
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/HVFS
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FileArchive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Debian
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/GetOpt
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Cmd
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Email
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tuple
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Progress
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maybe
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Map
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/MIME
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/MD5
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash/CRC32
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Hash
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Either
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Compression
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bits
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Concurrent/Thread
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Concurrent
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 97583bfca75f..80b8007378ef 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -6,11 +6,15 @@
#
PORTNAME= MonadCatchIO-mtl
-PORTVERSION= 0.3.0.1
+PORTVERSION= 0.3.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monad-transformer version of the Control.Exception Haskell module
+LICENSE= BSD
+
+USE_CABAL= mtl
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-mtl/distinfo b/devel/hs-MonadCatchIO-mtl/distinfo
index 558560523d7e..f3c2541058ef 100644
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ b/devel/hs-MonadCatchIO-mtl/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/MonadCatchIO-mtl-0.3.0.1.tar.gz) = 53f56fece758b15eff950f9c9796fbdf
-SHA256 (cabal/MonadCatchIO-mtl-0.3.0.1.tar.gz) = 56113319439a10e338b2e3169e1df575024fbaf97827511f4856e46efbac9a07
-SIZE (cabal/MonadCatchIO-mtl-0.3.0.1.tar.gz) = 2090
+SHA256 (cabal/MonadCatchIO-mtl-0.3.0.2.tar.gz) = ca93c9a7758309bbb9f7bb9346cdcab8b552d5b8a854832e7be6408b95869aed
+SIZE (cabal/MonadCatchIO-mtl-0.3.0.2.tar.gz) = 2094
diff --git a/devel/hs-MonadCatchIO-mtl/pkg-plist b/devel/hs-MonadCatchIO-mtl/pkg-plist
deleted file mode 100644
index 3a58052e5cd4..000000000000
--- a/devel/hs-MonadCatchIO-mtl/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/CatchIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 7bd7aed2cd23..1d6bd016ecf2 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -7,11 +7,14 @@
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Explicitly handled object names for Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index 281cd8b1d689..978ef01c8d43 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ObjectName-1.0.0.0.tar.gz) = 00140131c26a51ae1118f685a73ad923
SHA256 (cabal/ObjectName-1.0.0.0.tar.gz) = 358b7185d1f3e414a4a28155a93e15b433833967542f81354e50d0a88052217b
SIZE (cabal/ObjectName-1.0.0.0.tar.gz) = 1843
diff --git a/devel/hs-ObjectName/pkg-plist b/devel/hs-ObjectName/pkg-plist
deleted file mode 100644
index 161087fd4014..000000000000
--- a/devel/hs-ObjectName/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ObjectName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 4312cf557f3e..4be2d4dc74b1 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -5,11 +5,15 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.1.1.1
+PORTVERSION= 2.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for random testing in haskell
+LICENSE= BSD
+
+USE_CABAL= mtl
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 6d9f0f290d10..3cb30b5ebc37 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/QuickCheck-2.1.1.1.tar.gz) = a9e9170599223dc21c21a0190aadb195
-SHA256 (cabal/QuickCheck-2.1.1.1.tar.gz) = 626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9
-SIZE (cabal/QuickCheck-2.1.1.1.tar.gz) = 19486
+SHA256 (cabal/QuickCheck-2.4.0.1.tar.gz) = 19057c71c9fc154735b6d2a8b285930ceb5470815caf3c31a274f5bbb560f2f4
+SIZE (cabal/QuickCheck-2.4.0.1.tar.gz) = 23556
diff --git a/devel/hs-QuickCheck/pkg-plist b/devel/hs-QuickCheck/pkg-plist
deleted file mode 100644
index cf3c587c5083..000000000000
--- a/devel/hs-QuickCheck/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Arbitrary.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Exception.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Function.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Gen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Modifiers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Monadic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Poly.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Property.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Test.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Text.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 3f85ce05e9be..9e598ca2012b 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -7,11 +7,14 @@
PORTNAME= StateVar
PORTVERSION= 1.0.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= State variables for Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
index 1eeefaf9509a..76d85c05505f 100644
--- a/devel/hs-StateVar/distinfo
+++ b/devel/hs-StateVar/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/StateVar-1.0.0.0.tar.gz) = 313aa364e9c41bdd87f4bd3710676d63
SHA256 (cabal/StateVar-1.0.0.0.tar.gz) = 8445c998f79ef34105ffc928e50f1488505e8801f77f04d4b28d056b8d322bb0
SIZE (cabal/StateVar-1.0.0.0.tar.gz) = 2728
diff --git a/devel/hs-StateVar/pkg-plist b/devel/hs-StateVar/pkg-plist
deleted file mode 100644
index c9036bba0d02..000000000000
--- a/devel/hs-StateVar/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/StateVar.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 51384da9ae74..b06674b114c0 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -5,14 +5,15 @@
# $FreeBSD$
PORTNAME= Stream
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell library for manipulating infinite lists
-USE_HACKAGE= lazysmallcheck>=0.3 QuickCheck>=2.0
+LICENSE= BSD
+
+USE_CABAL= lazysmallcheck>=0.3 QuickCheck>=2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 2ce613581425..fd93fb02aaf1 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/Stream-0.4.1.tar.gz) = ba93bec9fa43c98d393bcb5318f4b8cf
-SHA256 (cabal/Stream-0.4.1.tar.gz) = 127bfca7787e532b7e0201377b9d97a1e8611354c7d2c833d460d3fee3e469d0
-SIZE (cabal/Stream-0.4.1.tar.gz) = 5911
+SHA256 (cabal/Stream-0.4.2.tar.gz) = addccbf5e8b4c46c15e4500af002fbb56d3672a7292890d6b2595b43a9e3366e
+SIZE (cabal/Stream-0.4.2.tar.gz) = 5918
diff --git a/devel/hs-Stream/pkg-plist b/devel/hs-Stream/pkg-plist
deleted file mode 100644
index 15eb8015686d..000000000000
--- a/devel/hs-Stream/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Stream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index ea0854deb052..a105bbbfe035 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -7,11 +7,14 @@
PORTNAME= Tensor
PORTVERSION= 1.0.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Tensor data types for Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-Tensor/distinfo b/devel/hs-Tensor/distinfo
index 0cd7bf173b07..799a1cfba3a0 100644
--- a/devel/hs-Tensor/distinfo
+++ b/devel/hs-Tensor/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/Tensor-1.0.0.1.tar.gz) = 67e0393f0cf4f2db06f525853e47811c
SHA256 (cabal/Tensor-1.0.0.1.tar.gz) = e93260d22baf4808c88c553017ba6a4e8179e95a00e551d6edb2d8f9ca845981
SIZE (cabal/Tensor-1.0.0.1.tar.gz) = 3314
diff --git a/devel/hs-Tensor/pkg-plist b/devel/hs-Tensor/pkg-plist
deleted file mode 100644
index 06f8ef826b1e..000000000000
--- a/devel/hs-Tensor/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tensor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 8a40fdccfb9b..4f3e4cac89ef 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -6,11 +6,13 @@
#
PORTNAME= TypeCompose
-PORTVERSION= 0.8.0
+PORTVERSION= 0.8.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Type composition classes and instances for Haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index ca34b7097679..1af5f02936bd 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/TypeCompose-0.8.0.tar.gz) = 91f935af1389a38512a161a8466e01f4
-SHA256 (cabal/TypeCompose-0.8.0.tar.gz) = 7a1bdfba9fd9973d6c06c1a6f720c746ba034c661da1d6263f3769a5fb23c307
-SIZE (cabal/TypeCompose-0.8.0.tar.gz) = 18777
+SHA256 (cabal/TypeCompose-0.8.3.tar.gz) = d0db276a809f91f40c83b2f56c40dd671d1c3955c7e7e6e00452228ce3db29e0
+SIZE (cabal/TypeCompose-0.8.3.tar.gz) = 16254
diff --git a/devel/hs-TypeCompose/pkg-plist b/devel/hs-TypeCompose/pkg-plist
deleted file mode 100644
index f33d7b68287f..000000000000
--- a/devel/hs-TypeCompose/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Compose.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Instances.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bijection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/CxMonoid.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Lambda.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Pair.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Partial.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/RefMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Title.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Zip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index c06fd20c270c..4daf84dff1ac 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -5,22 +5,26 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTVERSION= 2.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Alex is a tool for generating lexical analysers in Haskell
+LICENSE= BSD
+
XMLDOCS= doc/alex:html
USE_AUTOTOOLS= autoconf:env
STANDALONE= yes
EXECUTABLE= alex
-PORTDATA= *
PORTEXAMPLES= *
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.if defined(SLAVE)
+GHC_CMD= ghc
+.endif
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index a9231d6885a7..2e82613d0d33 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/alex-2.3.3.tar.gz) = bc5d90c932470ee8a64e6cda162ca05e
-SHA256 (cabal/alex-2.3.3.tar.gz) = 338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8
-SIZE (cabal/alex-2.3.3.tar.gz) = 79083
+SHA256 (cabal/alex-2.3.5.tar.gz) = 2ea6d30b98881c0fd57bfafae024050cd98dc5b0140d64a6d722c64a098ed253
+SIZE (cabal/alex-2.3.5.tar.gz) = 79147
diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist
index 7b3ba3518ab5..b30ec382bc49 100644
--- a/devel/hs-alex/pkg-plist
+++ b/devel/hs-alex/pkg-plist
@@ -1,4 +1,16 @@
@comment $FreeBSD$
-bin/alex
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/AlexTemplate
+%%DATADIR%%/AlexTemplate-debug
+%%DATADIR%%/AlexTemplate-ghc
+%%DATADIR%%/AlexTemplate-ghc-debug
+%%DATADIR%%/AlexWrapper-basic
+%%DATADIR%%/AlexWrapper-basic-bytestring
+%%DATADIR%%/AlexWrapper-gscan
+%%DATADIR%%/AlexWrapper-monad
+%%DATADIR%%/AlexWrapper-monad-bytestring
+%%DATADIR%%/AlexWrapper-monadUserState
+%%DATADIR%%/AlexWrapper-monadUserState-bytestring
+%%DATADIR%%/AlexWrapper-posn
+%%DATADIR%%/AlexWrapper-posn-bytestring
+%%DATADIR%%/AlexWrapper-strict-bytestring
+@dirrmtry %%DATADIR%%
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 70f46dace71c..56141936f757 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ansi-terminal
-PORTVERSION= 0.5.3
+PORTVERSION= 0.5.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,16 +14,16 @@ COMMENT= Simple ANSI terminal support, with Windows compatibility
OPTIONS= EXAMPLE "Build the example application" off
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
.if defined(WITH_EXAMPLE)
CONFIGURE_ARGS+= --flags="Example"
EXECUTABLE= ansi-terminal-example
-PLIST_SUB+= MAYBE_EXAMPLE=""
.else
CONFIGURE_ARGS+= --flags="-Example"
-PLIST_SUB+= MAYBE_EXAMPLE="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index d110b32143d7..184b3323ce48 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ansi-terminal-0.5.3.tar.gz) = e3b71bbf2c37b3f75ff60c6a8e642fc1
-SHA256 (cabal/ansi-terminal-0.5.3.tar.gz) = 5bcf9ec1757d1e40c94bf6e2c4a76c7e144b4c7ab827d6adeae520dd5ceb4ef7
-SIZE (cabal/ansi-terminal-0.5.3.tar.gz) = 13067
+SHA256 (cabal/ansi-terminal-0.5.5.tar.gz) = 489565cf36471bdbf38b1b76fc09bce6c311b472d54f09c66546c7592fb52427
+SIZE (cabal/ansi-terminal-0.5.5.tar.gz) = 13136
diff --git a/devel/hs-ansi-terminal/pkg-plist b/devel/hs-ansi-terminal/pkg-plist
deleted file mode 100644
index fadbc815b090..000000000000
--- a/devel/hs-ansi-terminal/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_EXAMPLE%%bin/ansi-terminal-example
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/ANSI.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/ANSI/Common.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/ANSI/Unix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/ANSI
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index ce9bd2dbe55a..f29512cc0cb9 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.5.1
+PORTVERSION= 0.6.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The Wadler/Leijen Pretty Printer for colored ANSI terminal output
-USE_HACKAGE= ansi-terminal>=0.4.0
+LICENSE= BSD
+
+USE_CABAL= ansi-terminal>=0.4.0
OPTIONS= EXAMPLE "Build the example application" off
@@ -22,10 +24,8 @@ OPTIONS= EXAMPLE "Build the example application" off
.if defined(WITH_EXAMPLE)
CONFIGURE_ARGS+= --flags="Example"
EXECUTABLE= ansi-wl-pprint-example
-PLIST_SUB+= MAYBE_EXAMPLE=""
.else
CONFIGURE_ARGS+= --flags="-Example"
-PLIST_SUB+= MAYBE_EXAMPLE="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index 172a6faea30d..da8a3f3ae48c 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ansi-wl-pprint-0.5.1.tar.gz) = d427a18a5a071b8dbcdff28633f4b800
-SHA256 (cabal/ansi-wl-pprint-0.5.1.tar.gz) = aa5e0ba85c46f2f71970645066a8efeeea2c663f222185968fda8e09383ef7e0
-SIZE (cabal/ansi-wl-pprint-0.5.1.tar.gz) = 13492
+SHA256 (cabal/ansi-wl-pprint-0.6.3.tar.gz) = 745245f9db01ad9a3c421ecd5fab26fa84153ce7bdeba6a7f65283468375f3b2
+SIZE (cabal/ansi-wl-pprint-0.6.3.tar.gz) = 13693
diff --git a/devel/hs-ansi-wl-pprint/pkg-plist b/devel/hs-ansi-wl-pprint/pkg-plist
deleted file mode 100644
index dcc808a4a0f7..000000000000
--- a/devel/hs-ansi-wl-pprint/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_EXAMPLE%%bin/ansi-wl-pprint-example
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/PrettyPrint/ANSI/Leijen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/PrettyPrint/ANSI
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/PrettyPrint
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 1a49807ffaa4..73ce89e783c3 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= arrows
-PORTVERSION= 0.4.2.0
+PORTVERSION= 0.4.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell arrow classes and transformers
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= Stream
+USE_CABAL= Stream
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index eb09e3d7ddc2..00a77563a982 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/arrows-0.4.2.0.tar.gz) = e6536e2809cf23a0504bfdf11881209e
-SHA256 (cabal/arrows-0.4.2.0.tar.gz) = 9c8508a08af50f7e449883390a2670c7b180ad13c5623a1e7ad4cf59cd58a69f
-SIZE (cabal/arrows-0.4.2.0.tar.gz) = 12211
+SHA256 (cabal/arrows-0.4.4.0.tar.gz) = 4999ba909061f5bede09e6116e2cac1cf89f04d3429a4a2be6ef79a677d89bb5
+SIZE (cabal/arrows-0.4.4.0.tar.gz) = 12393
diff --git a/devel/hs-arrows/pkg-plist b/devel/hs-arrows/pkg-plist
deleted file mode 100644
index 7a2740b70cd1..000000000000
--- a/devel/hs-arrows/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Internals.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Operations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/All.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Automaton.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/CoState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Reader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Static.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Stream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer/Writer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/Transformer
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-binary/Makefile b/devel/hs-binary/Makefile
index 32e67efcdc5b..bbae537719ea 100644
--- a/devel/hs-binary/Makefile
+++ b/devel/hs-binary/Makefile
@@ -7,10 +7,13 @@
PORTNAME= binary
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient binary serialisation for Haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-binary/distinfo b/devel/hs-binary/distinfo
index f3d00fc775bf..7fb46d9350c1 100644
--- a/devel/hs-binary/distinfo
+++ b/devel/hs-binary/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/binary-0.5.0.2.tar.gz) = 6bf8f3d1441602c9ab09a75e3bd6e926
SHA256 (cabal/binary-0.5.0.2.tar.gz) = e0c2dede617dc9b1611f62f2801f21d2fd48e044ee6886e77b55df10e0f2130b
SIZE (cabal/binary-0.5.0.2.tar.gz) = 41494
diff --git a/devel/hs-binary/pkg-plist b/devel/hs-binary/pkg-plist
deleted file mode 100644
index db13b5df3e71..000000000000
--- a/devel/hs-binary/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 79d5b62fedb7..fbe9c6b93f04 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -7,11 +7,14 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= jupengfei@gmail.com
COMMENT= Access to the BSD sysctl(3) interface
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-bsd-sysctl/distinfo b/devel/hs-bsd-sysctl/distinfo
index 3bf8b343c1c4..1cda6a73e226 100644
--- a/devel/hs-bsd-sysctl/distinfo
+++ b/devel/hs-bsd-sysctl/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/bsd-sysctl-1.0.6.tar.gz) = b5faba2541399f914efc66a322ef57e3
SHA256 (cabal/bsd-sysctl-1.0.6.tar.gz) = 22a96060db6937bb5b0388c67bc6c41bd225e14531bb710bf9ffe261985064ca
SIZE (cabal/bsd-sysctl-1.0.6.tar.gz) = 6182
diff --git a/devel/hs-bsd-sysctl/pkg-plist b/devel/hs-bsd-sysctl/pkg-plist
deleted file mode 100644
index 518e8d969c5e..000000000000
--- a/devel/hs-bsd-sysctl/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/BSD/Sysctl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/BSD
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index eb3d07d0b490..57fd41169f87 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -7,13 +7,17 @@
PORTNAME= c2hs
PORTVERSION= 0.16.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= C->Haskell, an Interface Generator for Haskell
+LICENSE= GPLv2
+FILE_LICENSE= COPYING
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= language-c>=0.3.1.1
+USE_CABAL= language-c>=0.3.1.1
XMLDOCS= doc/users_guide:html
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index 63d7bfffb8a8..87ff13865074 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/c2hs-0.16.2.tar.gz) = 9137f6b5e3592c5c9e0becdba318e65a
SHA256 (cabal/c2hs-0.16.2.tar.gz) = e73ac273aa054dd959b51dd6d4c11612f506fc171b88aaee6abe541493a42768
SIZE (cabal/c2hs-0.16.2.tar.gz) = 135669
diff --git a/devel/hs-c2hs/pkg-descr b/devel/hs-c2hs/pkg-descr
index 0dae83c1c040..ccded44a2df6 100644
--- a/devel/hs-c2hs/pkg-descr
+++ b/devel/hs-c2hs/pkg-descr
@@ -8,6 +8,3 @@ information from the corresponding C header file. Another noteworthy property
is the lightweight nature of the approach.
WWW: http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
-
--- Oliver Braun
-obraun@FreeBSD.org
diff --git a/devel/hs-c2hs/pkg-plist b/devel/hs-c2hs/pkg-plist
deleted file mode 100644
index 6f914bb545c9..000000000000
--- a/devel/hs-c2hs/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/c2hs
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 2d6b5d710460..5bf2b1bddc8e 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -14,5 +14,7 @@ COMMENT= Check properties on standard Haskell classes and data structures
USE_HACKAGE= QuickCheck>=2.1.0.2
+BROKEN= does not compile
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 9b65b201d250..e4af59e085f5 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -7,10 +7,16 @@
PORTNAME= convertible
PORTVERSION= 1.0.9.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell type classes and instances for converting between types
+LICENSE= LGPL21
+FILE_LICENSE= COPYRIGHT
+
+USE_CABAL= mtl
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index f141babd0bd7..aa177ddcfc1c 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/convertible-1.0.9.1.tar.gz) = 9c1e83a4cd189011920865b7b1b0821c
SHA256 (cabal/convertible-1.0.9.1.tar.gz) = a1f46bf1166356c02e7a241d0bfea7010dc3e5f9f15181cfc2405a95df402914
SIZE (cabal/convertible-1.0.9.1.tar.gz) = 22563
diff --git a/devel/hs-convertible/pkg-plist b/devel/hs-convertible/pkg-plist
deleted file mode 100644
index 9fd6f3efd6f8..000000000000
--- a/devel/hs-convertible/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances/C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances/Map.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances/Num.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances/Time.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible/Instances
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Convertible
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index e42b3d81c77f..87f980eb3698 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -7,11 +7,15 @@
PORTNAME= cpphs
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A simplified re-implementation of cpp in Haskell
+LICENSE= LGPL21
+FILE_LICENSE= LICENCE-LGPL
+
CABAL_SETUP= Setup.hs
MAN1= cpphs.1
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 9999d69fbb2a..5bbb50190a86 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/cpphs-1.11.tar.gz) = ece7f9a5335a8fd569f0b8c7153ecfaa
SHA256 (cabal/cpphs-1.11.tar.gz) = 26124ca2b1af9a9804ba37c627dbbca3977bde93925f979f08b342895548db01
SIZE (cabal/cpphs-1.11.tar.gz) = 68421
diff --git a/devel/hs-cpphs/pkg-plist b/devel/hs-cpphs/pkg-plist
deleted file mode 100644
index 09fff04e24bc..000000000000
--- a/devel/hs-cpphs/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $FreeBSD$
-bin/cpphs
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/CppIfdef.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/HashDefine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/MacroPass.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Options.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Position.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/ReadFirst.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/RunCpphs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/SymTab.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs/Tokenise.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Unlit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENCE-LGPL
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor/Cpphs
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Preprocessor
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index b8d704263eee..44e8a429939a 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,21 +6,25 @@
#
PORTNAME= darcs
-PORTVERSION= 2.4.4
+PORTVERSION= 2.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A distributed, interactive, smart revision control system
-USE_HACKAGE= hashed-storage haskeline>=0.6.1 utf8-string>=0.3 zlib>=0.5.1.0
+LICENSE= GPLv2
+FILE_LICENSE= COPYING
+
+USE_CABAL= hashed-storage>=0.5.2 haskeline>=0.6.2.2 html>=1.0 HUnit>=1 \
+ mtl>=1 parsec>=2 QuickCheck>=2.1 regex-compat>=0.71 tar>=0.3 \
+ test-framework>=0.2.2 test-framework-hunit>=0.2.2 \
+ test-framework-quickcheck2>=0.2.2 text>=0.11 zlib>=0.5.1
EXECUTABLE= darcs
MAN1= darcs.1
-MAN1SRC= dist/build/darcs
OPTIONS= CURL "Use libcurl for HTTP support" on \
- CURL_PIPELINING "Use libcurl's HTTP pipelining" off \
HTTP "Use the pure HTTP package" off \
STATIC "Build static binary" off \
TERMINFO "Use the terminfo package" off \
@@ -33,6 +37,8 @@ OPTIONS= CURL "Use libcurl for HTTP support" on \
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
+CONFIGURE_ARGS+= --flags="library"
+
.if defined(WITH_CURL)
CONFIGURE_ARGS+= --flags="curl"
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
@@ -40,19 +46,9 @@ LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+= --flags="-curl"
.endif
-.if defined(WITH_CURL_PIPELINING)
-CONFIGURE_ARGS+= --flags="curl-pipelining"
-BUILD_DEPENDS+= pkg-config>=0.9.0:${PORTSDIR}/devel/pkg-config
-.if !defined(WITH_CURL)
-IGNORE= cannot be compiled without CURL in this configuration. Please (re)run 'make config' and choose CURL too
-.endif
-.else
-CONFIGURE_ARGS+= --flags="-curl-pipelining"
-.endif
-
.if defined(WITH_HTTP)
CONFIGURE_ARGS+= --flags="http"
-USE_HACKAGE+= HTTP>=3000.0
+USE_CABAL+= HTTP>=3000.0 network>=2.2
.else
CONFIGURE_ARGS+= --flags="-http"
.endif
@@ -69,7 +65,7 @@ CONFIGURE_ARGS+= --flags="-static"
.if defined(WITH_TERMINFO)
CONFIGURE_ARGS+= --flags="terminfo"
-USE_HACKAGE+= terminfo>=0.3
+USE_CABAL+= terminfo>=0.3
.else
CONFIGURE_ARGS+= --flags="-terminfo"
.endif
@@ -83,10 +79,8 @@ CONFIGURE_ARGS+= --flags="-threaded"
.if defined(WITH_TYPE_WITNESSES)
CONFIGURE_ARGS+= --flags="type-witnesses"
EXECUTABLE+= witnesses
-PLIST_SUB+= MAYBE_TYPE_WITNESSES=""
.else
CONFIGURE_ARGS+= --flags="-type-witnesses"
-PLIST_SUB+= MAYBE_TYPE_WITNESSES="@comment "
.endif
.if defined(WITH_COLOR)
@@ -97,19 +91,16 @@ CONFIGURE_ARGS+= --flags="-color"
.if defined(WITH_MMAP)
CONFIGURE_ARGS+= --flags="mmap"
-USE_HACKAGE+= mmap>=0.2
+USE_CABAL+= mmap>=0.5
.else
CONFIGURE_ARGS+= --flags="-mmap"
.endif
.if defined(WITH_TEST)
CONFIGURE_ARGS+= --flags="test"
-USE_HACKAGE+= QuickCheck>=2.1.0.0 test-framework>=0.2.2 test-framework-hunit>=0.2.2 test-framework-quickcheck2>=0.2.2
EXECUTABLE+= unit
-PLIST_SUB+= MAYBE_TEST=""
.else
CONFIGURE_ARGS+= --flags="-test"
-PLIST_SUB+= MAYBE_TEST="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index c0510ca2b797..a2d0377d6b0e 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/darcs-2.4.4.tar.gz) = 86fe4f695f0fe2f297fe536341de1b21
-SHA256 (cabal/darcs-2.4.4.tar.gz) = 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e
-SIZE (cabal/darcs-2.4.4.tar.gz) = 1193126
+SHA256 (cabal/darcs-2.5.1.tar.gz) = 48e66ddb01424baf506ab9b40481856da1eed6da98b1fff8cead4e17b815f140
+SIZE (cabal/darcs-2.5.1.tar.gz) = 1233049
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index 5bf1fce13516..df31ea371518 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,20 +1,20 @@
---- ./Setup.lhs.orig 2010-05-09 15:23:32.000000000 +0200
-+++ ./Setup.lhs 2010-05-15 13:37:00.000000000 +0200
-@@ -17,7 +17,7 @@
- ( Version(versionBranch) )
+--- ./Setup.lhs.orig 2011-02-11 00:35:43.000000000 +0100
++++ ./Setup.lhs 2011-03-13 18:05:02.180256196 +0100
+@@ -21,7 +21,7 @@
+ import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
- ( LocalBuildInfo(..), absoluteInstallDirs )
+ ( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
import Distribution.Simple.Setup
(buildVerbosity, copyDest, copyVerbosity, fromFlag,
haddockVerbosity, installVerbosity, sDistVerbosity)
-@@ -168,7 +168,7 @@
+@@ -180,7 +180,7 @@
-> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy =
copyFiles verbosity
- (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
-+ (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
++ (prefix (absoluteInstallDirs pkg lbi copy) </> "man" </> "man1")
[(buildDir lbi </> "darcs", "darcs.1")]
determineVersion :: Verbosity -> PackageDescription -> IO (String, String)
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
index 595619a55580..0216265a9956 100644
--- a/devel/hs-darcs/files/patch-darcs.cabal
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -1,47 +1,38 @@
---- ./darcs.cabal.orig 2010-05-09 15:23:32.000000000 +0200
-+++ ./darcs.cabal 2010-05-21 21:08:36.000000000 +0200
-@@ -328,7 +328,7 @@
+--- ./darcs.cabal.orig 2011-02-11 00:35:43.000000000 +0100
++++ ./darcs.cabal 2011-03-13 18:05:27.057566301 +0100
+@@ -172,7 +172,7 @@
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+ mtl >= 1.0 && < 2.1,
+- parsec >= 2.0 && < 3.1,
++ parsec >= 2.0,
+ html == 1.0.*,
+ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+@@ -377,7 +377,7 @@
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+ mtl >= 1.0 && < 2.1,
+- parsec >= 2.0 && < 3.1,
++ parsec >= 2.0,
+ html == 1.0.*,
+ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+@@ -525,7 +525,7 @@
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+ mtl >= 1.0 && < 2.1,
+- parsec >= 2.0 && < 3.1,
++ parsec >= 2.0,
html == 1.0.*,
- filepath == 1.1.*,
- haskeline >= 0.6.1 && < 0.7,
-- hashed-storage == 0.4.13
-+ hashed-storage
-
- if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
-@@ -374,7 +374,7 @@
- buildable: False
-
- if flag(mmap) && !os(windows)
-- build-depends: mmap >= 0.2 && < 0.5
-+ build-depends: mmap >= 0.2
- cpp-options: -DHAVE_MMAP
-
- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-@@ -459,7 +459,7 @@
- html == 1.0.*,
- filepath == 1.1.*,
- haskeline >= 0.6.1 && < 0.7,
-- hashed-storage == 0.4.13
-+ hashed-storage
-
- if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
-@@ -497,7 +497,7 @@
- buildable: False
-
- if flag(mmap) && !os(windows)
-- build-depends: mmap >= 0.2 && < 0.5
-+ build-depends: mmap >= 0.2
- cpp-options: -DHAVE_MMAP
-
- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
-@@ -605,7 +605,7 @@
- random == 1.0.*
-
- if flag(mmap) && !os(windows)
-- build-depends: mmap >= 0.2 && < 0.5
-+ build-depends: mmap >= 0.2
- cpp-options: -DHAVE_MMAP
-
- build-depends: zlib >= 0.5.1.0 && < 0.6.0.0
+ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+@@ -621,7 +621,7 @@
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+ mtl >= 1.0 && < 2.1,
+- parsec >= 2.0 && < 3.1,
++ parsec >= 2.0,
+ html == 1.0.*,
+ filepath >= 1.1.0.0 && < 1.3.0.0,
+ QuickCheck >= 2.1.0.0,
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
deleted file mode 100644
index 0091e7a49aa6..000000000000
--- a/devel/hs-darcs/pkg-plist
+++ /dev/null
@@ -1,160 +0,0 @@
-@comment $FreeBSD$
-bin/darcs
-%%MAYBE_TEST%%bin/unit
-%%MAYBE_TYPE_WITNESSES%%bin/witnesses
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/ByteStringUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/CommandLine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Crypt/SHA256.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ArgumentDefaults.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Arguments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Bug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/CheckFileSystem.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ColorPrinter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Add.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/AmendRecord.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Annotate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Apply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Changes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Check.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Convert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Diff.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Dist.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/GZCRCs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Get.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Help.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Init.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/MarkConflicts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Move.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Optimize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Pull.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Push.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Put.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Record.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Remove.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Repair.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Replace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Revert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Rollback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Send.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/SetPref.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowAuthors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowBug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowContents.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowFiles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowIndex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowTags.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Tag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/TrackDown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/TransferMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Unrecord.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Unrevert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/WhatsNew.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/CommandsAux.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Compat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Diff.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Email.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/External.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/FilePathMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Flags.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Global.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Hopefully.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/IO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Lock.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Apply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Bundle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Choices.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Commute.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Depends.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/FileName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Info.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/MatchData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Non.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/OldDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Patchy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Permutations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Prim.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Properties.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Read.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/ReadMonads.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Real.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/RegChars.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Set.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Split.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/TouchesFiles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Viewing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Population.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/PopulationData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/PrintPatch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ProgressPatches.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RemoteApply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RepoPath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/ApplyPatches.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Cache.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Checkpoint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/DarcsRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Format.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/HashedIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/HashedRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/InternalTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/LowLevel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Merge.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Motd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Prefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Pristine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Repair.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Resolution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RunCommand.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SelectChanges.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SignalHandler.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Test.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/TheCommands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/URL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Ordered.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Sealed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/DateMatcher.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/English.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Exec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HTTP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/IsoDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Lcs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Printer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Progress.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Ratified.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/SHA1.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Ssh.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/URL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Version.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Workaround.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Crypt
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index aff12dbe31d1..b56cab104dd4 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -7,12 +7,16 @@
PORTNAME= datetime
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities to make Data.Time.* easier to use in Haskell
-USE_HACKAGE= QuickCheck>=2
+LICENSE= GPLv3
+FILE_LICENSE= COPYING
+
+USE_CABAL= QuickCheck>=2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index c2b3defb1dfe..bc02c6fc72bd 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/datetime-0.2.tar.gz) = 14daaf5ef011983dfcce22d2753c9ef4
SHA256 (cabal/datetime-0.2.tar.gz) = 143e4063ed6971a4580469e1faeae446dd8590003d5e9641ab37b27fe63bb3bd
SIZE (cabal/datetime-0.2.tar.gz) = 14553
diff --git a/devel/hs-datetime/files/patch-datetime.cabal b/devel/hs-datetime/files/patch-datetime.cabal
new file mode 100644
index 000000000000..a3af4f998293
--- /dev/null
+++ b/devel/hs-datetime/files/patch-datetime.cabal
@@ -0,0 +1,11 @@
+--- ./datetime.cabal.orig 2010-01-23 14:27:04.000000000 +0100
++++ ./datetime.cabal 2011-03-13 14:17:27.621072557 +0100
+@@ -16,7 +16,7 @@
+ build-type: Simple
+
+ library
+- build-depends: base >= 2 && < 4,
++ build-depends: base >= 2,
+ QuickCheck >= 2 && < 3,
+ old-locale >= 1.0.0.1,
+ old-time >= 1.0.0.1,
diff --git a/devel/hs-datetime/pkg-plist b/devel/hs-datetime/pkg-plist
deleted file mode 100644
index 7771060742d2..000000000000
--- a/devel/hs-datetime/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DateTime.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-deepseq/Makefile b/devel/hs-deepseq/Makefile
index ad6ddb68057b..388857cfeda7 100644
--- a/devel/hs-deepseq/Makefile
+++ b/devel/hs-deepseq/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= deepseq
-PORTVERSION= 1.1.0.0
+PORTVERSION= 1.1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fully evaluate Haskell data structures
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-deepseq/distinfo b/devel/hs-deepseq/distinfo
index db215b6abfa8..437381978e19 100644
--- a/devel/hs-deepseq/distinfo
+++ b/devel/hs-deepseq/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/deepseq-1.1.0.0.tar.gz) = 41194f8633be8e30cacad88146dbf7c2
-SHA256 (cabal/deepseq-1.1.0.0.tar.gz) = 947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a
-SIZE (cabal/deepseq-1.1.0.0.tar.gz) = 2920
+SHA256 (cabal/deepseq-1.1.0.2.tar.gz) = 6504d3bcd61e89c2ca6b957e45418028fcb8943727339a6468595825184513c7
+SIZE (cabal/deepseq-1.1.0.2.tar.gz) = 3619
diff --git a/devel/hs-deepseq/pkg-plist b/devel/hs-deepseq/pkg-plist
deleted file mode 100644
index 5769dea5ac45..000000000000
--- a/devel/hs-deepseq/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/DeepSeq.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index d92ffc1264e7..c7b9b6febe97 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -6,11 +6,13 @@
PORTNAME= dlist
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A list-like type supporting O(1) append for Haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index 3e65a4d3dd7a..2ce4b9833448 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/dlist-0.5.tar.gz) = 54f6c18ff689b7ef54e3229dc4a94107
SHA256 (cabal/dlist-0.5.tar.gz) = 4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea
SIZE (cabal/dlist-0.5.tar.gz) = 5962
diff --git a/devel/hs-dlist/pkg-plist b/devel/hs-dlist/pkg-plist
deleted file mode 100644
index 75122018eab7..000000000000
--- a/devel/hs-dlist/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DList.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index e070435e77cd..ae4aee7307f0 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -6,7 +6,7 @@
PORTNAME= drift
PORTVERSION= 2.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/
PKGNAMEPREFIX= hs-
diff --git a/devel/hs-drift/distinfo b/devel/hs-drift/distinfo
index cdd4ba74d974..3c4546e10220 100644
--- a/devel/hs-drift/distinfo
+++ b/devel/hs-drift/distinfo
@@ -1,3 +1,2 @@
-MD5 (DrIFT-2.2.3.tar.gz) = 89644a167f151ef581f7c2753f511b01
SHA256 (DrIFT-2.2.3.tar.gz) = c5edb6e89e3a04aa7918acd2db37413ff80f945fdd1370f3614dc0d93e8913a9
SIZE (DrIFT-2.2.3.tar.gz) = 219321
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 85d89118a5c7..0dbfad0b202d 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -7,12 +7,16 @@
PORTNAME= fgl
PORTVERSION= 5.4.2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Martin Erwig Functional Graph Library
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
+USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 2709c24ff481..cf5df5f5d151 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/fgl-5.4.2.3.tar.gz) = 29ccab8bebed16a8d7346c3ed52c5d9c
SHA256 (cabal/fgl-5.4.2.3.tar.gz) = e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8
SIZE (cabal/fgl-5.4.2.3.tar.gz) = 36357
diff --git a/devel/hs-fgl/pkg-plist b/devel/hs-fgl/pkg-plist
deleted file mode 100644
index 94de4c073461..000000000000
--- a/devel/hs-fgl/pkg-plist
+++ /dev/null
@@ -1,47 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Basic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Example.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Graph.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Graphviz.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal/FiniteMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal/Heap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal/Queue.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal/RootPath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal/Thread.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Monad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Monad/IOArray.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/NodeMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/PatriciaTree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/ArtPoint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/BCC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/BFS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/DFS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/Dominators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/GVD.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/Indep.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/MST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/MaxFlow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/MaxFlow2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/Monad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/SP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query/TransClos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Tree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Query
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph/Inductive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Graph
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index d67c88cdbd5c..3df5cb4ee244 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -5,14 +5,16 @@
# $FreeBSD$
#
-PORTNAME= FileManip
-PORTVERSION= 0.3.3
+PORTNAME= filemanip
+PORTVERSION= 0.3.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Expressive file and directory manipulation for Haskell
-CONFIGURE_ARGS+= --constraint='base<4'
+LICENSE= BSD
+
+USE_CABAL= mtl unix-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 9e75b2a360de..0607ff4f31f1 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/FileManip-0.3.3.tar.gz) = 8399e5d22720f140dd1cd6a0f96ae56b
-SHA256 (cabal/FileManip-0.3.3.tar.gz) = 70f880986543476fa8cb8a69bfcd90ee407dc826f6e884771648a25db664f13d
-SIZE (cabal/FileManip-0.3.3.tar.gz) = 10556
+SHA256 (cabal/filemanip-0.3.5.2.tar.gz) = 7611ffb3ef26c0c983723e34f93b12888c9a5ee54510b2229aa39fcda386da4e
+SIZE (cabal/filemanip-0.3.5.2.tar.gz) = 10209
diff --git a/devel/hs-filemanip/pkg-descr b/devel/hs-filemanip/pkg-descr
index 83169fdebeb0..396e697e1579 100644
--- a/devel/hs-filemanip/pkg-descr
+++ b/devel/hs-filemanip/pkg-descr
@@ -1,4 +1,4 @@
A Haskell library for working with files and directories. Includes code
for pattern matching, finding files, modifying file contents, and more.
-WWW: http://hackage.haskell.org/package/FileManip
+WWW: http://hackage.haskell.org/package/filemanip
diff --git a/devel/hs-filemanip/pkg-plist b/devel/hs-filemanip/pkg-plist
deleted file mode 100644
index b5c1a0c77f0a..000000000000
--- a/devel/hs-filemanip/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Find.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Glob.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/GlobPattern.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath/Manip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/FilePath
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index f007e4100744..bf7802b6841c 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -7,12 +7,15 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.0.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= An mtl compatible version of the Ghc-Api monads and monad-transformers
-USE_HACKAGE= MonadCatchIO-mtl>=0.2.0.0
+LICENSE= BSD
+
+USE_CABAL= MonadCatchIO-mtl>=0.2.0.0 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index 7c0a79f39fc9..4f269e1bd88f 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ghc-mtl-1.0.1.0.tar.gz) = 73d8685fb937a27fe6ee2fce1f5fc3e6
SHA256 (cabal/ghc-mtl-1.0.1.0.tar.gz) = 5284e0ecf99511e6263503412faf6fa809dc577c009fde63203d46405eb1b191
SIZE (cabal/ghc-mtl-1.0.1.0.tar.gz) = 2239
diff --git a/devel/hs-ghc-mtl/pkg-plist b/devel/hs-ghc-mtl/pkg-plist
deleted file mode 100644
index 9a3ecae29225..000000000000
--- a/devel/hs-ghc-mtl/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Ghc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-ghc-paths-docs/Makefile b/devel/hs-ghc-paths-docs/Makefile
index bba5348cc75a..c628d30988af 100644
--- a/devel/hs-ghc-paths-docs/Makefile
+++ b/devel/hs-ghc-paths-docs/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= ghc-paths
-PORTVERSION= 0.1.0.5
-PORTREVISION= 1
+PORTVERSION= 0.1.0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Documentation for ghc-paths
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
DOCUMENTATION= yes
diff --git a/devel/hs-ghc-paths-docs/distinfo b/devel/hs-ghc-paths-docs/distinfo
index d2e7e9d70b85..7997b1ec5b19 100644
--- a/devel/hs-ghc-paths-docs/distinfo
+++ b/devel/hs-ghc-paths-docs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155
-SHA256 (cabal/ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-SIZE (cabal/ghc-paths-0.1.0.5.tar.gz) = 2304
+SHA256 (cabal/ghc-paths-0.1.0.8.tar.gz) = 8672c1e65525555481091443f44abf738f9442516c612d67dde12ebfe02f0c56
+SIZE (cabal/ghc-paths-0.1.0.8.tar.gz) = 2369
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 3c73a0759f63..f2ca1256bd26 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -5,18 +5,15 @@
# $FreeBSD$
PORTNAME= ghc-paths
-PORTVERSION= 0.1.0.5
-PORTREVISION= 1
+PORTVERSION= 0.1.0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utility looking for GHC installation directories
-CABAL_SETUP= Setup.hs
+LICENSE= BSD
-.if defined(SLAVE)
-GHC_CMD= ghc
-.endif
+CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo
index d2e7e9d70b85..7997b1ec5b19 100644
--- a/devel/hs-ghc-paths/distinfo
+++ b/devel/hs-ghc-paths/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/ghc-paths-0.1.0.5.tar.gz) = 8fdc122e65845d2d53734f78e22c5155
-SHA256 (cabal/ghc-paths-0.1.0.5.tar.gz) = ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-SIZE (cabal/ghc-paths-0.1.0.5.tar.gz) = 2304
+SHA256 (cabal/ghc-paths-0.1.0.8.tar.gz) = 8672c1e65525555481091443f44abf738f9442516c612d67dde12ebfe02f0c56
+SIZE (cabal/ghc-paths-0.1.0.8.tar.gz) = 2369
diff --git a/devel/hs-ghc-paths/pkg-plist b/devel/hs-ghc-paths/pkg-plist
deleted file mode 100644
index 74d42dd9d1ab..000000000000
--- a/devel/hs-ghc-paths/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC/Paths.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%DOCSDIR%%/LICENSE
-@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile
index 27f986739929..43a0c5d36fef 100644
--- a/devel/hs-haddock-docs/Makefile
+++ b/devel/hs-haddock-docs/Makefile
@@ -6,27 +6,22 @@
#
PORTNAME= haddock
-PORTVERSION= 2.4.2
-PORTREVISION= 2
+PORTVERSION= 2.9.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Documentation for Haddock
+LICENSE= BSD
+
USE_AUTOTOOLS= autoconf:env
+USE_CABAL= xhtml>=3000.2 ghc-paths
+USE_ALEX= true
+USE_HAPPY= true
DOCUMENTATION= yes
XMLDOCS= doc/haddock:users_guide
SHOW_PKGMSG= yes
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if ${PORT_HADDOCK} == 11
-ECHO_MSG= ${PRINTF} "%b"
-IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n
-IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n
-IGNORE+= \t You have to reinstall this last one with the right option\n
-IGNORE+= \t WITHOUT_HADDOCK.\n\c
-.endif
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haddock-docs/distinfo b/devel/hs-haddock-docs/distinfo
index 024dc3b353d8..77400f7e6dc3 100644
--- a/devel/hs-haddock-docs/distinfo
+++ b/devel/hs-haddock-docs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (cabal/haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (cabal/haddock-2.4.2.tar.gz) = 103033
+SHA256 (cabal/haddock-2.9.2.tar.gz) = e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
+SIZE (cabal/haddock-2.9.2.tar.gz) = 154040
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index eabf51ecb833..6b1bb61c7d72 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,39 +5,29 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.4.2
-PORTREVISION= 2
+PORTVERSION= 2.9.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A documentation tool for Haskell
-USE_HACKAGE= ghc-paths
+LICENSE= BSD
-EXECUTABLE= haddock
+USE_CABAL= xhtml>=3000.2 ghc-paths
+USE_ALEX= true
+USE_HAPPY= true
+
+EXECUTABLE= haddock-${PORTVERSION}
PORTDATA= *
-.include <bsd.port.pre.mk>
-
-.if !defined(SLAVE)
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if ${PORT_HADDOCK} == 11
-ECHO_MSG= ${PRINTF} "%b"
-IGNORE+= \n\t The ${LOCALBASE}/bin/haddock executable was already installed\n
-IGNORE+= \t by the lang/ghc port, setting the option WITH_HADDOCK.\n
-IGNORE+= \t You have to reinstall this last one with the right option\n
-IGNORE+= \t WITHOUT_HADDOCK.\n\c
-.elif ${PORT_HADDOCK} == 01
-ECHO_MSG= ${PRINTF} "%b"
-IGNORE+= \n\t This port depends on the lang/ghc port, which will install\n
-IGNORE+= \t the ${LOCALBASE}/bin/haddock executable, for the WITH_HADDOCK\n
-IGNORE+= \t option was set in it. You have to set the WITHOUT_HADDOCK\n
-IGNORE+= \t options in lang/ghc before to install devel/hs-haddock.\n\c
-.endif
-.else
-GHC_CMD= ghc
-.endif
+SUB_FILES= pkg-deinstall
+SUB_LIST= GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock
+
+CONFIGURE_ARGS= --program-suffix=-${PORTVERSION}
+
+post-install::
+ @${LN} -sf ${PREFIX}/bin/${EXECUTABLE} ${PREFIX}/bin/haddock
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 024dc3b353d8..77400f7e6dc3 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (cabal/haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (cabal/haddock-2.4.2.tar.gz) = 103033
+SHA256 (cabal/haddock-2.9.2.tar.gz) = e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
+SIZE (cabal/haddock-2.9.2.tar.gz) = 154040
diff --git a/devel/hs-haddock/files/pkg-deinstall.in b/devel/hs-haddock/files/pkg-deinstall.in
new file mode 100644
index 000000000000..51712ae3e452
--- /dev/null
+++ b/devel/hs-haddock/files/pkg-deinstall.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+[ "$2" = "POST-DEINSTALL" ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
+
+exit 0
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
deleted file mode 100644
index b3c29ec7ce95..000000000000
--- a/devel/hs-haddock/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-bin/haddock
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%DOCSDIR%%/LICENSE
-@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %%LOCALBASE%%/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 3a504b215c42..487e00358800 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,22 +5,30 @@
# $FreeBSD$
PORTNAME= happy
-PORTVERSION= 1.18.5
-PORTREVISION= 1
+PORTVERSION= 1.18.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= An LALR(1) parser generator for the functional language Haskell
+LICENSE= BSD
+
+USE_CABAL= mtl
+
XMLDOCS= doc/happy:html
USE_AUTOTOOLS= autoconf:env
STANDALONE= yes
EXECUTABLE= happy
-PORTDATA= *
+USE_PERL5_BUILD= 5.8+
+
PORTEXAMPLES= *
INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+.if defined(SLAVE)
+GHC_CMD= ghc
+.endif
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index b1c0dc8a03cb..d46ec50c1e17 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/happy-1.18.5.tar.gz) = 9e77b67df7b6a4d7273383cc890f39e8
-SHA256 (cabal/happy-1.18.5.tar.gz) = 91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e
-SIZE (cabal/happy-1.18.5.tar.gz) = 158157
+SHA256 (cabal/happy-1.18.6.tar.gz) = 840c8fb6b9795faa4fae3c3bf3fb28ad403bc6891002dc703007870823b7cd60
+SIZE (cabal/happy-1.18.6.tar.gz) = 158096
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index 23bafdcccd94..e4c156399dc0 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,4 +1,15 @@
@comment $FreeBSD$
-bin/happy
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/GLR_Base
+%%DATADIR%%/GLR_Lib
+%%DATADIR%%/GLR_Lib-ghc
+%%DATADIR%%/GLR_Lib-ghc-debug
+%%DATADIR%%/HappyTemplate
+%%DATADIR%%/HappyTemplate-arrays
+%%DATADIR%%/HappyTemplate-arrays-coerce
+%%DATADIR%%/HappyTemplate-arrays-coerce-debug
+%%DATADIR%%/HappyTemplate-arrays-debug
+%%DATADIR%%/HappyTemplate-arrays-ghc
+%%DATADIR%%/HappyTemplate-arrays-ghc-debug
+%%DATADIR%%/HappyTemplate-coerce
+%%DATADIR%%/HappyTemplate-ghc
+@dirrmtry %%DATADIR%%
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 01e8ce2c4993..803734df7607 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= hashed-storage
-PORTVERSION= 0.5.2
+PORTVERSION= 0.5.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Hashed file storage support code
-CABAL_SETUP= Setup.hs
+LICENSE= BSD
-USE_HACKAGE= binary dataenc mmap>=0.5 zlib
+CABAL_SETUP= Setup.hs
+USE_CABAL= binary dataenc mmap>=0.5 mtl zlib
OPTIONS= TEST "Build tests" off
@@ -23,12 +24,12 @@ OPTIONS= TEST "Build tests" off
.if defined(WITH_TEST)
CONFIGURE_ARGS+= --flags="test"
-USE_HACKAGE+= test-framework test-framework-hunit test-framework-quickcheck2 QuickCheck>=2.0.0.0 zip-archive
+USE_CABAL+= test-framework test-framework-hunit \
+ test-framework-quickcheck2 HUnit \
+ QuickCheck>=2.3 zip-archive
EXECUTABLE+= hashed-storage-test
-PLIST_SUB+= MAYBE_TEST=""
.else
CONFIGURE_ARGS+= --flags="-test"
-PLIST_SUB+= MAYBE_TEST="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 6e56ccf28845..0a4e0a5c5d4e 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hashed-storage-0.5.2.tar.gz) = 9173f18fc672dab4e05d38092d5e7dc6
-SHA256 (cabal/hashed-storage-0.5.2.tar.gz) = 4277228f7ba67d3de35fdfbbc2772911f6c4e2a84951fcd98103644379e106dc
-SIZE (cabal/hashed-storage-0.5.2.tar.gz) = 55447
+SHA256 (cabal/hashed-storage-0.5.5.tar.gz) = 82206b4470af3c89afb5bfd912eaea5ae45bd0e3067d6716f2766efb66109d0f
+SIZE (cabal/hashed-storage-0.5.5.tar.gz) = 55919
diff --git a/devel/hs-hashed-storage/pkg-plist b/devel/hs-hashed-storage/pkg-plist
deleted file mode 100644
index 7fd117f25af6..000000000000
--- a/devel/hs-hashed-storage/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_TEST%%bin/hashed-storage-test
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bundled/Posix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bundled/SHA256.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/AnchoredPath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Darcs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Hash.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Index.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Monad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Packed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Plain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Tree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage/Hashed
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Storage
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bundled
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index 8cb6a34da940..9990a5908360 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -5,14 +5,16 @@
# $FreeBSD$
PORTNAME= haskeline
-PORTVERSION= 0.6.2.3
+PORTVERSION= 0.6.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A command-line interface for user input, written in Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= utf8-string>=0.3.6
+USE_CABAL= mtl>=1.1 utf8-string>=0.3.6
USE_ICONV= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskeline/distinfo b/devel/hs-haskeline/distinfo
index da0e76878adf..731d89d12c50 100644
--- a/devel/hs-haskeline/distinfo
+++ b/devel/hs-haskeline/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/haskeline-0.6.2.3.tar.gz) = 4e48c5dd0133f20ce69c6a5813fb82d9
-SHA256 (cabal/haskeline-0.6.2.3.tar.gz) = d6dced71c4ebd9ad1f1f9415275aa522342a17d0cc800de9ae122e997e099d24
-SIZE (cabal/haskeline-0.6.2.3.tar.gz) = 57759
+SHA256 (cabal/haskeline-0.6.3.2.tar.gz) = 0833f0d77577927593936f871c585d48702e3d1d783960512e53d3987f8d4f65
+SIZE (cabal/haskeline-0.6.3.2.tar.gz) = 61464
diff --git a/devel/hs-haskeline/pkg-plist b/devel/hs-haskeline/pkg-plist
deleted file mode 100644
index 4ab0f0588974..000000000000
--- a/devel/hs-haskeline/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/DumbTerm.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/IConv.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/Posix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend/WCWidth.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/Completion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/History.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/KillRing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command/Undo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Completion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Directory.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Emacs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Encoding.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/History.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/IO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/InputT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Key.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/LineState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/MonadException.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Monads.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Prefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/RunCommand.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Term.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Vi.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/h_iconv.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Command
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline/Backend
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Haskeline
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index aa0c5601addc..baa1baa0cd87 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -6,15 +6,17 @@
#
PORTNAME= haskell-src-exts
-PORTVERSION= 1.9.0
+PORTVERSION= 1.10.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Manipulating Haskell source
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
USE_HAPPY= yes
-USE_HACKAGE= cpphs>=1.3
+USE_CABAL= cpphs>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index 8a93cdc06839..ffb5a5999418 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/haskell-src-exts-1.9.0.tar.gz) = 1caa8d81c9f12d14ddb8a02dc9e6df1a
-SHA256 (cabal/haskell-src-exts-1.9.0.tar.gz) = dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da
-SIZE (cabal/haskell-src-exts-1.9.0.tar.gz) = 176438
+SHA256 (cabal/haskell-src-exts-1.10.2.tar.gz) = 34bad3970f3602cfdd0cd0d4a51b5a68abec61b3969632eeb57ff61880cf1026
+SIZE (cabal/haskell-src-exts-1.10.2.tar.gz) = 285949
diff --git a/devel/hs-haskell-src-exts/pkg-plist b/devel/hs-haskell-src-exts/pkg-plist
deleted file mode 100644
index 8e4fa943a64b..000000000000
--- a/devel/hs-haskell-src-exts/pkg-plist
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Build.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/ExactPrint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Fixity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Simplify.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Build.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Comments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ExtScheme.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Extension.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Fixity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/InternalParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Lexer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseSyntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/SrcLoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index fc88caf374c9..e02f149fbb83 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= hdoc
PORTVERSION= 0.8.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MASTER_SITES= http://staff.fmi.uni-passau.de/~groessli/hdoc/
PKGNAMEPREFIX= hs-
@@ -14,6 +14,8 @@ PKGNAMEPREFIX= hs-
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTML documentation tool for Haskell
+LICENSE= GPLv2
+
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 38e762157290..e81eef12b206 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -6,13 +6,16 @@
#
PORTNAME= hint
-PORTVERSION= 0.3.2.3
+PORTVERSION= 0.3.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Runtime Haskell interpreter (GHC API wrapper)
-USE_HACKAGE= ghc-mtl>=1.0.1.0 ghc-paths MonadCatchIO-mtl>=0.2 utf8-string
+LICENSE= BSD
+
+USE_CABAL= ghc-mtl>=1.0.1.0 ghc-paths haskell-src MonadCatchIO-mtl>=0.2 \
+ mtl utf8-string
PORTEXAMPLES= *
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 879ef62f8de3..e07499727d4e 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hint-0.3.2.3.tar.gz) = 9c1d25241997a0a80fcb68fe67a03d4c
-SHA256 (cabal/hint-0.3.2.3.tar.gz) = 1cc01037cfd32eb1a299ce625487411a97ce70178778d7bbd1d5fcef7d3d40c4
-SIZE (cabal/hint-0.3.2.3.tar.gz) = 24503
+SHA256 (cabal/hint-0.3.3.2.tar.gz) = c16ac1593aecc654821f920a4a431e2ca6f74902fa70b6d5bebe33f42524a7e2
+SIZE (cabal/hint-0.3.3.2.tar.gz) = 26974
diff --git a/devel/hs-hint/pkg-plist b/devel/hs-hint/pkg-plist
deleted file mode 100644
index 5ece040f43c9..000000000000
--- a/devel/hs-hint/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Compat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Configuration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Conversions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Eval.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Extension.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/GHC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/InterpreterT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Parsers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Reflection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Sandbox.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Typecheck.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Extension.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC/Unsafe.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Unsafe.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile
index d1652a0ba9db..135eb45db11c 100644
--- a/devel/hs-hmake/Makefile
+++ b/devel/hs-hmake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hmake
PORTVERSION= 3.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MASTER_SITES= http://www.haskell.org/hmake/ \
ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \
@@ -17,6 +17,8 @@ PKGNAMEPREFIX= hs-
MAINTAINER= haskell@FreeBSD.org
COMMENT= Intelligent compilation management tool for Haskell programs
+BROKEN= does not compile
+
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
hs-readline>=1.0.1.0:${PORTSDIR}/devel/hs-readline
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 475d35d72874..73e7a3c82e0f 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -6,17 +6,19 @@
#
PORTNAME= hoogle
-PORTVERSION= 4.0.7
-PORTREVISION= 1
+PORTVERSION= 4.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell API Search
+LICENSE= GPLv2
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= safe uniplate
+USE_CABAL= binary blaze-builder>=0.2 cmdargs>=0.6 enumerator>=0.4 \
+ haskell-src-exts>=1.9 parsec safe tagsoup>=0.11 \
+ transformers>=0.2 uniplate>=1.6 wai>=0.3 warp>=0.3
-STANDALONE= yes
EXECUTABLE= hoogle
PORTDATA= *
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index 6ec5b70027f7..f539de4b20e0 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hoogle-4.0.7.tar.gz) = 903f96c6b25796c4e7290e0c134486d1
-SHA256 (cabal/hoogle-4.0.7.tar.gz) = 3d757c4c0897deae18cc6fa1db26e27025f452f4a4f117c55c675695c424640d
-SIZE (cabal/hoogle-4.0.7.tar.gz) = 1763525
+SHA256 (cabal/hoogle-4.2.1.tar.gz) = 7bacacc4783ee4df825eaf3ce46ffcfcf5e277fc2d0969fedd5c2093ecd7808c
+SIZE (cabal/hoogle-4.2.1.tar.gz) = 107296
diff --git a/devel/hs-hoogle/files/patch-hoogle.cabal b/devel/hs-hoogle/files/patch-hoogle.cabal
new file mode 100644
index 000000000000..902a40039146
--- /dev/null
+++ b/devel/hs-hoogle/files/patch-hoogle.cabal
@@ -0,0 +1,22 @@
+--- ./hoogle.cabal.orig 2011-01-26 12:16:52.000000000 +0100
++++ ./hoogle.cabal 2011-03-13 06:06:29.686517189 +0100
+@@ -35,7 +35,7 @@
+ array, bytestring, containers, directory, filepath, process, random,
+ safe,
+ binary,
+- parsec == 2.1.*,
++ parsec,
+ transformers == 0.2.*,
+ uniplate == 1.6.*,
+ haskell-src-exts >= 1.9 && < 1.11
+@@ -108,8 +108,8 @@
+ tagsoup >= 0.11 && < 0.13,
+ enumerator == 0.4.*,
+ blaze-builder == 0.2.*,
+- wai == 0.3.0,
+- warp == 0.3.0,
++ wai == 0.3.*,
++ warp == 0.3.*,
+ Cabal >= 1.8 && < 1.11
+
+ other-modules:
diff --git a/devel/hs-hoogle/files/patch-src__General__Web.hs b/devel/hs-hoogle/files/patch-src__General__Web.hs
new file mode 100644
index 000000000000..b4a2697497f9
--- /dev/null
+++ b/devel/hs-hoogle/files/patch-src__General__Web.hs
@@ -0,0 +1,11 @@
+--- ./src/General/Web.hs.orig 2011-01-26 12:16:52.000000000 +0100
++++ ./src/General/Web.hs 2011-03-13 06:06:29.688516885 +0100
+@@ -15,7 +15,7 @@
+
+ import General.System
+ import General.Base
+-import Network.Wai
++import Network.Wai hiding(statusOK)
+ import Blaze.ByteString.Builder(toLazyByteString)
+ import Data.Enumerator.List(consume)
+ import qualified Data.ByteString.Lazy.Char8 as LBS
diff --git a/devel/hs-hoogle/files/patch-src__Web__Server.hs b/devel/hs-hoogle/files/patch-src__Web__Server.hs
new file mode 100644
index 000000000000..22ce4419a216
--- /dev/null
+++ b/devel/hs-hoogle/files/patch-src__Web__Server.hs
@@ -0,0 +1,11 @@
+--- ./src/Web/Server.hs.orig 2011-01-26 12:16:52.000000000 +0100
++++ ./src/Web/Server.hs 2011-03-13 06:06:43.636623976 +0100
+@@ -10,7 +10,7 @@
+ import General.System
+ import Control.Concurrent
+
+-import Network.Wai
++import Network.Wai hiding(statusOK)
+ import Network.Wai.Handler.Warp
+ import qualified Data.ByteString.Lazy.Char8 as LBS
+ import qualified Data.ByteString.Char8 as BS
diff --git a/devel/hs-hoogle/pkg-plist b/devel/hs-hoogle/pkg-plist
deleted file mode 100644
index e5508266df85..000000000000
--- a/devel/hs-hoogle/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/hoogle
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 3253132c0924..9f744b66622a 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -6,25 +6,17 @@
#
PORTNAME= hslogger
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Versatile logging framework for Haskell
-CABAL_SETUP= Setup.hs
+LICENSE= LGPL21
+FILE_LICENSE= COPYRIGHT
-post-patch:
-#
-# Work around features unsupported by current Haddock. This shall be
-# removed on update.
-#
- @${REINPLACE_CMD} 's|-- ^|--|' \
- ${WRKSRC}/src/System/Log.hs \
- ${WRKSRC}/src/System/Log/Logger.hs \
- ${WRKSRC}/src/System/Log/Formatter.hs \
- ${WRKSRC}/src/System/Log/Handler/Growl.hs \
- ${WRKSRC}/src/System/Log/Handler/Syslog.hs
+CABAL_SETUP= Setup.hs
+USE_CABAL= mtl network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index 97cb833cc0b1..4243223d78dc 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hslogger-1.1.0.tar.gz) = 8039e079338dae19e1273bbd73332014
-SHA256 (cabal/hslogger-1.1.0.tar.gz) = 6f36f9e0959d0b0c4834be09e7b5c5bdb82f83a5d94c7002541a401d51625a89
-SIZE (cabal/hslogger-1.1.0.tar.gz) = 44335
+SHA256 (cabal/hslogger-1.1.4.tar.gz) = c7cf96394659c3b552de85342883d26e7b199e15975ad9bf64eca826e792a820
+SIZE (cabal/hslogger-1.1.4.tar.gz) = 44342
diff --git a/devel/hs-hslogger/pkg-plist b/devel/hs-hslogger/pkg-plist
deleted file mode 100644
index 71d9554c4d42..000000000000
--- a/devel/hs-hslogger/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler/Growl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler/Log4jXML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler/Simple.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler/Syslog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Formatter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Logger.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log/Handler
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Log
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 9f072dba4325..3e110885135f 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= idoc
PORTVERSION= 0.2.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/idoc/
PKGNAMEPREFIX= hs-
@@ -14,6 +14,9 @@ PKGNAMEPREFIX= hs-
MAINTAINER= haskell@FreeBSD.org
COMMENT= A 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-idoc/distinfo b/devel/hs-idoc/distinfo
index 78a356447ba9..84032f7f48a6 100644
--- a/devel/hs-idoc/distinfo
+++ b/devel/hs-idoc/distinfo
@@ -1,3 +1,2 @@
-MD5 (idoc-0.2.6.tar.gz) = 5acb412b8fe0c13a9818f2b84c9637c4
SHA256 (idoc-0.2.6.tar.gz) = 9ef75016bc74b17e959d64e2542441605aeaeba394fa7a8e134ef8ee23ccef8d
SIZE (idoc-0.2.6.tar.gz) = 27594
diff --git a/devel/hs-idoc/files/patch-Makefile b/devel/hs-idoc/files/patch-Makefile
new file mode 100644
index 000000000000..27d4bf3f2d28
--- /dev/null
+++ b/devel/hs-idoc/files/patch-Makefile
@@ -0,0 +1,40 @@
+--- Makefile.orig 2002-02-28 07:33:03.000000000 +0100
++++ Makefile 2011-03-26 12:47:27.290996479 +0100
+@@ -56,7 +56,6 @@
+ #
+ PACKAGE = idoc
+ SRCS = GetOpt.hs IDoc.hs
+-OBJS = $(patsubst %.hs,%.o,$(filter %.hs,$(SRCS)))
+
+ # file that contains a `versnum = "x.y.z"' line
+ #
+@@ -78,18 +77,10 @@
+ #
+ default: idoc
+
+-# compile rules
+-#
+-%.o: %.hs
+- $(RM) $@
+- $(HC) -c $(HCFLAGS) $<
+-%.hi: %.o
+- @:
+-
+ # link target
+ #
+-idoc: $(OBJS)
+- $(HC) $(HCFLAGS) -o $@ $^
++idoc: $(SRCS)
++ $(HC) --make $(HCFLAGS) -o $@ $^
+
+ # install target
+ #
+@@ -116,8 +107,3 @@
+ tar czf $(PACKAGE)-$(VERSION).tar.gz\
+ $(addprefix $(PACKAGE)-$(VERSION)/,$(DISTFILES))
+ $(RM) $(PACKAGE)-$(VERSION)
+-
+-# dependencies
+-#
+-IDoc.o : IDoc.hs GetOpt.hi
+-GetOpt.o: GetOpt.hs
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index f99a86055c85..d3738daea054 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -6,16 +6,19 @@
#
PORTNAME= language-c
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Analysis and generation of C code in Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
USE_ALEX= yes
USE_HAPPY= yes
+USE_CABAL= syb
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 7b76bd2f3c0d..6c3a16a4b3e8 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/language-c-0.3.2.tar.gz) = 9056fcde8918cf0b7f9a469e039d8166
-SHA256 (cabal/language-c-0.3.2.tar.gz) = b372ed745055163827dcf137a200d92b464572b3239342417e7ddde16628c19a
-SIZE (cabal/language-c-0.3.2.tar.gz) = 141677
+SHA256 (cabal/language-c-0.3.2.1.tar.gz) = bdc6680ef0b66454989245b626c437d08e1b5378e522fa160b538a8bd03568e2
+SIZE (cabal/language-c-0.3.2.1.tar.gz) = 141660
diff --git a/devel/hs-language-c/pkg-plist b/devel/hs-language-c/pkg-plist
deleted file mode 100644
index 67168498c5c7..000000000000
--- a/devel/hs-language-c/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/AstAnalysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Debug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DeclAnalysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DefTable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/NameSpaceMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemError.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemRep.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/TravMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Ident.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/InputStream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Name.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Node.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Position.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/RList.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Builtin.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Lexer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/ParserMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/AST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Constants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Ops.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/GCC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/Preprocess.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index dc056aa566f2..b7c0c5c66a19 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -7,11 +7,14 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A library for demand-driven testing of Haskell programs
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
PORTEXAMPLES= *
diff --git a/devel/hs-lazysmallcheck/distinfo b/devel/hs-lazysmallcheck/distinfo
index 5989f4b81465..cc00ce625c8a 100644
--- a/devel/hs-lazysmallcheck/distinfo
+++ b/devel/hs-lazysmallcheck/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/lazysmallcheck-0.5.tar.gz) = f14dc0b5e2e2df93bfc3ced9e040d98f
SHA256 (cabal/lazysmallcheck-0.5.tar.gz) = 981d48118e02501cf5c7fe726ebe01428c99d94c19005dd7f4b55e1ad414faed
SIZE (cabal/lazysmallcheck-0.5.tar.gz) = 17059
diff --git a/devel/hs-lazysmallcheck/pkg-plist b/devel/hs-lazysmallcheck/pkg-plist
deleted file mode 100644
index 492b19a8767f..000000000000
--- a/devel/hs-lazysmallcheck/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index eca112901f3f..37fc9498c1fd 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -5,11 +5,13 @@
# $FreeBSD$
PORTNAME= mmap
-PORTVERSION= 0.5.6
+PORTVERSION= 0.5.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Memory mapped files for POSIX and Windows
+COMMENT= Memory-mapped files for POSIX and Windows
+
+LICENSE= BSD
CABAL_SETUP= Setup.hs
diff --git a/devel/hs-mmap/distinfo b/devel/hs-mmap/distinfo
index 81340c3d0e1a..9e716f4d9b25 100644
--- a/devel/hs-mmap/distinfo
+++ b/devel/hs-mmap/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/mmap-0.5.6.tar.gz) = 642ecd97d88229ba4cd0a6d14b43f113
-SHA256 (cabal/mmap-0.5.6.tar.gz) = c2457c663baaab662662b35c653c6fdc3d3c59b5f4c11ffeebbce6ad1bbcc362
-SIZE (cabal/mmap-0.5.6.tar.gz) = 11680
+SHA256 (cabal/mmap-0.5.7.tar.gz) = d73c683a0e835b29ecc5a55c9d342b454f0b46eeb71955fe1c408d5d67ea0838
+SIZE (cabal/mmap-0.5.7.tar.gz) = 9197
diff --git a/devel/hs-mmap/pkg-plist b/devel/hs-mmap/pkg-plist
deleted file mode 100644
index 6ef4b3156373..000000000000
--- a/devel/hs-mmap/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/MMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 03945273997d..c657b4d024c2 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= mueval
-PORTVERSION= 0.8
+PORTVERSION= 0.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Safely evaluate Haskell expressions
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= hint>=0.3.1 show>=0.3 utf8-string
+USE_CABAL= hint>=0.3.1 mtl show>=0.3 utf8-string
EXECUTABLE= mueval mueval-core
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index f08d2b961b37..4645993df23e 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/mueval-0.8.tar.gz) = 26528dd9ceb8e37779b311ae1614295b
-SHA256 (cabal/mueval-0.8.tar.gz) = cb2cf474d1a94fb71b84b572e134bed85ecbceafd3dbe9daed3d0a1023504c8a
-SIZE (cabal/mueval-0.8.tar.gz) = 14353
+SHA256 (cabal/mueval-0.8.1.tar.gz) = 41c6ab1d0f406106061322ae98aecc8bd650b2c41ae1a32abdbaad00513646a5
+SIZE (cabal/mueval-0.8.1.tar.gz) = 14744
diff --git a/devel/hs-mueval/files/patch-Mueval__Interpreter.hs b/devel/hs-mueval/files/patch-Mueval__Interpreter.hs
new file mode 100644
index 000000000000..45f0a82a44a9
--- /dev/null
+++ b/devel/hs-mueval/files/patch-Mueval__Interpreter.hs
@@ -0,0 +1,11 @@
+--- ./Mueval/Interpreter.hs.orig 2011-01-11 21:24:11.000000000 +0100
++++ ./Mueval/Interpreter.hs 2011-03-13 14:28:39.132489232 +0100
+@@ -120,7 +120,7 @@
+ exceptionMsg = "*Exception: "
+
+ -- | Renders the input String including its exceptions using @exceptionMsg@
+-render :: (Control.Monad.Trans.MonadIO m)
++render :: (Functor m, Control.Monad.Trans.MonadIO m)
+ => Int -- ^ max number of characters to include
+ -> String -- ^ input
+ -> m (String, Bool) -- ^ ( output, @True@ if we found an exception )
diff --git a/devel/hs-mueval/files/patch-mueval.cabal b/devel/hs-mueval/files/patch-mueval.cabal
new file mode 100644
index 000000000000..50590a6efa02
--- /dev/null
+++ b/devel/hs-mueval/files/patch-mueval.cabal
@@ -0,0 +1,11 @@
+--- ./mueval.cabal.orig 2011-01-11 21:24:11.000000000 +0100
++++ ./mueval.cabal 2011-03-13 14:27:32.901910764 +0100
+@@ -31,7 +31,7 @@
+ library
+ exposed-modules: Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
+ Mueval.ArgsParse, Mueval.Resources
+- build-depends: base>=4 && < 5, containers, directory, mtl<1.2, filepath, unix, process,
++ build-depends: base>=4 && < 5, containers, directory, mtl, filepath, unix, process,
+ hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions
+ ghc-options: -Wall -static -O2
+
diff --git a/devel/hs-mueval/pkg-plist b/devel/hs-mueval/pkg-plist
deleted file mode 100644
index 0a41778dc54c..000000000000
--- a/devel/hs-mueval/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $FreeBSD$
-bin/mueval
-bin/mueval-core
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/ArgsParse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Interpreter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Parallel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Resources.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 624b45727c73..385dd7668704 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -7,11 +7,14 @@
PORTNAME= pcre-light
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A lightweight Haskell regex library compatible with Perl 5
+LICENSE= BSD
+
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index ffcdd9648e1d..c51dbb154e73 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/pcre-light-0.4.tar.gz) = 4907d8d239d3c41f06855faee340d052
SHA256 (cabal/pcre-light-0.4.tar.gz) = b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6
SIZE (cabal/pcre-light-0.4.tar.gz) = 28943
diff --git a/devel/hs-pcre-light/pkg-plist b/devel/hs-pcre-light/pkg-plist
deleted file mode 100644
index 81a92be7e128..000000000000
--- a/devel/hs-pcre-light/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Char8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index ecc936ba4f31..7b4d77fd5c31 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= primitive
-PORTVERSION= 0.3
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Wrappers for primitive operations
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 5367e0554894..d616e4af3eb0 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/primitive-0.3.tar.gz) = c676bc633309c346aec784c37ce334cb
-SHA256 (cabal/primitive-0.3.tar.gz) = b63cb5dd3417433429b3ad5489791bddd0973b96b7c3314a4ecc9e6a68b2a35d
-SIZE (cabal/primitive-0.3.tar.gz) = 7168
+SHA256 (cabal/primitive-0.3.1.tar.gz) = 7246b1aef318b714bccbead89b6fc6b3122f0d9a4001d0bd7f8d7485508703a4
+SIZE (cabal/primitive-0.3.1.tar.gz) = 7376
diff --git a/devel/hs-primitive/pkg-plist b/devel/hs-primitive/pkg-plist
deleted file mode 100644
index c44ed7ab99ab..000000000000
--- a/devel/hs-primitive/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/primitive-memops.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Primitive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive/Addr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive/Array.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive/ByteArray.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive/MachDeps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Primitive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 6acb08191619..100c66297c05 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -7,12 +7,15 @@
PORTNAME= reactive
PORTVERSION= 0.11.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Push-pull functional reactive programming
-USE_HACKAGE= category-extras>=0.53.5 checkers>=0.2.3 \
+BROKEN= cannot be compiled
+
+USE_CABAL= category-extras>=0.53.5 checkers>=0.2.3 \
QuickCheck>=2.1.0.2 Stream>=0.3.1 TypeCompose>=0.8.0 \
unamb>=0.1.5 vector-space>=0.5
diff --git a/devel/hs-reactive/distinfo b/devel/hs-reactive/distinfo
index 30b6fba3ca2a..5e75671efba3 100644
--- a/devel/hs-reactive/distinfo
+++ b/devel/hs-reactive/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/reactive-0.11.5.tar.gz) = 4142095852240a503d11cdc43d6a3825
SHA256 (cabal/reactive-0.11.5.tar.gz) = 321ca74b1182a4412611628a3818d343b04ee4b4eb047477931ebd40df7bb0ab
SIZE (cabal/reactive-0.11.5.tar.gz) = 60662
diff --git a/devel/hs-reactive/pkg-plist b/devel/hs-reactive/pkg-plist
deleted file mode 100644
index 857a22a52783..000000000000
--- a/devel/hs-reactive/pkg-plist
+++ /dev/null
@@ -1,41 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AddBounds.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Max.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Min.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/PairMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Behavior.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Fun.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Future.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Improving.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Behavior.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Chan.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Clock.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Fun.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Future.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/IVar.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Misc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Reactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Serial.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/TVal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal/Timing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/LegacyAdapters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Num.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/PrimReactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Reactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/VectorSpace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP/Reactive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/FRP
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 665dcc680604..0edee0c5baa1 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -6,12 +6,14 @@
PORTNAME= readline
PORTVERSION= 1.0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell interface to the GNU readline library
+LICENSE= GPLv2
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-readline/distinfo b/devel/hs-readline/distinfo
index db37575daa7e..b7833261a4cd 100644
--- a/devel/hs-readline/distinfo
+++ b/devel/hs-readline/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/readline-1.0.1.0.tar.gz) = eade9576def53ed293628a2f8580007e
SHA256 (cabal/readline-1.0.1.0.tar.gz) = 07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d
SIZE (cabal/readline-1.0.1.0.tar.gz) = 52394
diff --git a/devel/hs-readline/pkg-plist b/devel/hs-readline/pkg-plist
deleted file mode 100644
index d164392986da..000000000000
--- a/devel/hs-readline/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Readline.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/SimpleLineEditor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsReadline.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsReadlineConfig.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index be92538c7fb1..85347c592820 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= safe
-PORTVERSION= 0.2
+PORTVERSION= 0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell library for safe (pattern match free) functions
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 036cbc890eb7..05f1db84e6ae 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/safe-0.2.tar.gz) = e5331578ea7e0b68ed1ea4df923a23ca
-SHA256 (cabal/safe-0.2.tar.gz) = 73b9a247c3ba8092236c8c912687399778ff31bf3df42d707563a1528a6fc0e0
-SIZE (cabal/safe-0.2.tar.gz) = 3557
+SHA256 (cabal/safe-0.3.tar.gz) = a01ef6260a7d4bfb5d1ccbf69b9c16de9b1ea99deecaaaac61fb694ceda9929c
+SIZE (cabal/safe-0.3.tar.gz) = 3491
diff --git a/devel/hs-safe/pkg-plist b/devel/hs-safe/pkg-plist
deleted file mode 100644
index 2fe16354c640..000000000000
--- a/devel/hs-safe/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Safe.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 3b7cf2981332..5f4b70758644 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= show
-PORTVERSION= 0.3.4
+PORTVERSION= 0.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell Show instances for Lambdabot
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= smallcheck>=0.4
+LICENSE= GPLv2
-CONFIGURE_ARGS+= --constraint='base<4'
+CABAL_SETUP= Setup.hs
+USE_CABAL= QuickCheck>=2.4 smallcheck>=0.4 syb>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-show/distinfo b/devel/hs-show/distinfo
index 0ff977a06454..65a1b5cb8a0d 100644
--- a/devel/hs-show/distinfo
+++ b/devel/hs-show/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/show-0.3.4.tar.gz) = cd95f8c63f8fa3d20063a5c0617df42f
-SHA256 (cabal/show-0.3.4.tar.gz) = c009da079ec154a7c55e0e81f29f6ceed629e082b15d5de8c445481b7eec10cf
-SIZE (cabal/show-0.3.4.tar.gz) = 11716
+SHA256 (cabal/show-0.4.1.1.tar.gz) = 2e9ef8bb8ef78ec29c452459bbbac9bbc31eb05543508b29f28691f0f1f430fa
+SIZE (cabal/show-0.4.1.1.tar.gz) = 11064
diff --git a/devel/hs-show/pkg-plist b/devel/hs-show/pkg-plist
deleted file mode 100644
index 27c492c1673b..000000000000
--- a/devel/hs-show/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/ShowFun.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/ShowIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/ShowQ.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/SimpleReflect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 1cb61797d2a8..0fa878d78416 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -7,11 +7,14 @@
PORTNAME= smallcheck
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Another lightweight testing library in Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
PORTDATA= *
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index 42d9d64fcb54..eb687ff19412 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/smallcheck-0.4.tar.gz) = dbb3e22742e5ef5f00ec9a5328408936
SHA256 (cabal/smallcheck-0.4.tar.gz) = aa86853b3c480fb3d13115823a7b70126c136ed4913261cd7c354f35aa1c015b
SIZE (cabal/smallcheck-0.4.tar.gz) = 21543
diff --git a/devel/hs-smallcheck/pkg-plist b/devel/hs-smallcheck/pkg-plist
deleted file mode 100644
index 6bb10bf68cd3..000000000000
--- a/devel/hs-smallcheck/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/SmallCheck.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index 9090ddc23cb2..7bf5f0a894af 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -6,11 +6,13 @@
#
PORTNAME= split
-PORTVERSION= 0.1.2
+PORTVERSION= 0.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell combinator library for splitting lists
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index fd735e235af6..0aaeb1978600 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/split-0.1.2.tar.gz) = 2ebd7a335bc12246b166dd298c6c7ac3
-SHA256 (cabal/split-0.1.2.tar.gz) = 53d6640fd898a3c5f565fc1c6ebe8c96fb2bf9949a77640177522bb6119ecd69
-SIZE (cabal/split-0.1.2.tar.gz) = 11506
+SHA256 (cabal/split-0.1.3.tar.gz) = 9aed95b6d6efa97a1f833d6dd2edc9bdfd86e2f50b9194241856961682ea83c4
+SIZE (cabal/split-0.1.3.tar.gz) = 12323
diff --git a/devel/hs-split/pkg-plist b/devel/hs-split/pkg-plist
deleted file mode 100644
index 1dff92a69498..000000000000
--- a/devel/hs-split/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Split.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Split/Internals.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Split
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
index 26ebcafcc38b..e07dc4ab5f66 100644
--- a/devel/hs-terminfo/Makefile
+++ b/devel/hs-terminfo/Makefile
@@ -7,10 +7,13 @@
PORTNAME= terminfo
PORTVERSION= 0.3.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell bindings to the terminfo library
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-terminfo/distinfo b/devel/hs-terminfo/distinfo
index 1362fadc46a1..5ec078eb6e97 100644
--- a/devel/hs-terminfo/distinfo
+++ b/devel/hs-terminfo/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/terminfo-0.3.1.3.tar.gz) = 8c0e052340f628b76f5687fa23379628
SHA256 (cabal/terminfo-0.3.1.3.tar.gz) = 10303a46f71973352eed26f1f076447eacba8b23b9ca9ce73b73992b22656503
SIZE (cabal/terminfo-0.3.1.3.tar.gz) = 42968
diff --git a/devel/hs-terminfo/pkg-plist b/devel/hs-terminfo/pkg-plist
deleted file mode 100644
index ba6d03708567..000000000000
--- a/devel/hs-terminfo/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Color.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Cursor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Edit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Effects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo/Keys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console/Terminfo
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index c36a9671b90b..8982904ff98b 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -7,12 +7,15 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.2.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HUnit support for the test-framework package
-USE_HACKAGE= test-framework>=0.2.0
+LICENSE= BSD
+
+USE_CABAL= HUnit>=1.2 test-framework>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-hunit/distinfo b/devel/hs-test-framework-hunit/distinfo
index 67ebb690f3cf..9f20c1cf0299 100644
--- a/devel/hs-test-framework-hunit/distinfo
+++ b/devel/hs-test-framework-hunit/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/test-framework-hunit-0.2.6.tar.gz) = 7c012ca5426d743b3cf35e231d6f6072
SHA256 (cabal/test-framework-hunit-0.2.6.tar.gz) = f910e18e62615f64fac9bf4938a34cc36fad9d86e6ba31edcb79731e0ef46fc7
SIZE (cabal/test-framework-hunit-0.2.6.tar.gz) = 2639
diff --git a/devel/hs-test-framework-hunit/pkg-plist b/devel/hs-test-framework-hunit/pkg-plist
deleted file mode 100644
index e4038008e399..000000000000
--- a/devel/hs-test-framework-hunit/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers/HUnit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 12f1cf59bb88..c12bac2c9c41 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= test-framework-quickcheck2
-PORTVERSION= 0.2.7
+PORTVERSION= 0.2.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= QuickCheck2 support for the test-framework package
-USE_HACKAGE= QuickCheck>=2.1.0.3 test-framework>=0.2.0
+LICENSE= BSD
+
+USE_CABAL= QuickCheck>=2.4 test-framework>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-quickcheck2/distinfo b/devel/hs-test-framework-quickcheck2/distinfo
index 4a65a13e81c2..f3193e761fdf 100644
--- a/devel/hs-test-framework-quickcheck2/distinfo
+++ b/devel/hs-test-framework-quickcheck2/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/test-framework-quickcheck2-0.2.7.tar.gz) = afe8655f52a3831b7ec0109201467caf
-SHA256 (cabal/test-framework-quickcheck2-0.2.7.tar.gz) = 1ea980dc40905f313cc0a9dce192e22a03d33e34579104384067307ea7a07ac9
-SIZE (cabal/test-framework-quickcheck2-0.2.7.tar.gz) = 4566
+SHA256 (cabal/test-framework-quickcheck2-0.2.9.tar.gz) = 1a25e2e3ba175759938cd8093092e195361a602eea44d899c377a013dfa881c0
+SIZE (cabal/test-framework-quickcheck2-0.2.9.tar.gz) = 4794
diff --git a/devel/hs-test-framework-quickcheck2/pkg-plist b/devel/hs-test-framework-quickcheck2/pkg-plist
deleted file mode 100644
index a6907b589d92..000000000000
--- a/devel/hs-test-framework-quickcheck2/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers/QuickCheck2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index e5a4cbb09ef9..c7c2088f7768 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -6,13 +6,16 @@
#
PORTNAME= test-framework
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Framework for running and organising tests
-USE_HACKAGE= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 hostname>=1.0 xml>=1.3.5
+LICENSE= BSD
+
+USE_CABAL= ansi-terminal>=0.4 ansi-wl-pprint>=0.5.1 hostname>=1 \
+ regex-posix>=0.72 xml>=1.3.5
CONFIGURE_ARGS+= --flags="-Tests"
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index 78947de26910..aa5e0851bda6 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/test-framework-0.3.2.tar.gz) = 9db832bd496d3f525e2fdf45b63cb0de
-SHA256 (cabal/test-framework-0.3.2.tar.gz) = 89b7c45146a8dbdf1672a41e00866cf1a23ce96f29d2b7ebad9e19793234512f
-SIZE (cabal/test-framework-0.3.2.tar.gz) = 18645
+SHA256 (cabal/test-framework-0.3.3.tar.gz) = d9982c0cb2dfd34099879b78f2ce043aa170253df97b61430683ffdb63670ec2
+SIZE (cabal/test-framework-0.3.3.tar.gz) = 18657
diff --git a/devel/hs-test-framework/pkg-plist b/devel/hs-test-framework/pkg-plist
deleted file mode 100644
index eef16c02045e..000000000000
--- a/devel/hs-test-framework/pkg-plist
+++ /dev/null
@@ -1,41 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Improving.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Options.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers/API.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/Colors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/ProgressBar.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/Run.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/Statistics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/Table.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console/Utilities.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Options.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Processors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Statistics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/TestPattern.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/ThreadPool.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/TimedConsumption.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/XML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/XML/JUnitWriter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Seed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Utilities.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/XML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners/Console
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Runners
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework/Providers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/Framework
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index f1911b92f26a..10db68930247 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -6,13 +6,17 @@
#
PORTNAME= testpack
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell 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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-testpack/distinfo b/devel/hs-testpack/distinfo
index 595d29ac4d2c..46c0ba8b3156 100644
--- a/devel/hs-testpack/distinfo
+++ b/devel/hs-testpack/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/testpack-1.0.2.tar.gz) = 9157c9afd6770c665a8f22bfa1663507
-SHA256 (cabal/testpack-1.0.2.tar.gz) = ff3d24a755aeeb765d5e93aa0189d0d67ac96b2d84e27a29609eb4738a6cdabc
-SIZE (cabal/testpack-1.0.2.tar.gz) = 13828
+SHA256 (cabal/testpack-2.0.1.tar.gz) = 621a6bb0bc5d6be6460c5892338b78f42fdf33c6291ef58e296fefb654e16979
+SIZE (cabal/testpack-2.0.1.tar.gz) = 14574
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
new file mode 100644
index 000000000000..2d60c1dda342
--- /dev/null
+++ b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
@@ -0,0 +1,38 @@
+--- ./src/Test/HUnit/Tools.hs.orig 2010-08-11 21:28:05.000000000 +0200
++++ ./src/Test/HUnit/Tools.hs 2011-03-13 15:12:06.976261554 +0100
+@@ -61,7 +61,7 @@
+ HU.TestLabel lbl $ HU.TestCase $
+ do result <- localquickCheckWithResult config property
+ case result of
+- Success _ -> return ()
++ Success _ _ _ -> return ()
+ _ -> HU.assertFailure (show result)
+
+ -- Modified from HUnit
+@@ -159,7 +159,7 @@
+ -- | 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 tm <- newTerminal
++ do tm <- newStdioTerminal
+ rnd <- case replay args of
+ Nothing -> newStdGen
+ Just (rnd,_) -> return rnd
+@@ -176,7 +176,6 @@
+ , collected = []
+ , expectedFailure = False
+ , randomSeed = rnd
+- , isShrinking = False
+ , numSuccessShrinks = 0
+ , numTryShrinks = 0
+ } (unGen (property p))
+@@ -207,8 +206,7 @@
+ runATest st f =
+ do
+ let size = computeSize st (numSuccessTests st) (numDiscardedTests st)
+- MkRose mres ts <- protectRose (unProp (f rnd1 size))
+- res <- mres
++ MkRose res ts <- protectRose (return $ unProp (f rnd1 size))
+ callbackPostTest st res
+
+ case ok res of
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs
new file mode 100644
index 000000000000..542adf9bd649
--- /dev/null
+++ b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs
@@ -0,0 +1,17 @@
+--- ./src/Test/QuickCheck/Instances.hs.orig 2010-08-11 21:28:05.000000000 +0200
++++ ./src/Test/QuickCheck/Instances.hs 2011-03-13 14:56:30.837261486 +0100
+@@ -36,12 +36,14 @@
+ instance (CoArbitrary k, CoArbitrary v, Eq k, Ord k) => CoArbitrary (Map.Map k v) where
+ coarbitrary = coarbitrary . Map.keys
+
++{-
+ instance Arbitrary Word8 where
+ arbitrary = sized $ \n -> choose (0, min (fromIntegral n) maxBound)
+
+ instance CoArbitrary Word8 where
+ coarbitrary n = variant (if n >= 0 then 2 * x else 2 * x + 1)
+ where x = abs . fromIntegral $ n
++-}
+
+ instance Random Word8 where
+ randomR (a, b) g = (\(x, y) -> (fromInteger x, y)) $
diff --git a/devel/hs-testpack/pkg-plist b/devel/hs-testpack/pkg-plist
deleted file mode 100644
index 3f9a012a0794..000000000000
--- a/devel/hs-testpack/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/HUnit/Tools.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Instances.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck/Tools.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/QuickCheck
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/HUnit
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index 5ce5066d403d..6a1dad49df4f 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= transformers
-PORTVERSION= 0.2.1.0
+PORTVERSION= 0.2.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Concrete Haskell monad transformers
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-transformers/distinfo b/devel/hs-transformers/distinfo
index 399511266ddf..322363eb9f4f 100644
--- a/devel/hs-transformers/distinfo
+++ b/devel/hs-transformers/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/transformers-0.2.1.0.tar.gz) = d787d0cd73c4d759127c6b39bae4deed
-SHA256 (cabal/transformers-0.2.1.0.tar.gz) = 1ff9768e60130810e888452b6052d64998d0651fe2835902f032d8f8182a2c6d
-SIZE (cabal/transformers-0.2.1.0.tar.gz) = 17064
+SHA256 (cabal/transformers-0.2.2.0.tar.gz) = bf2d197dbcad9cf964f537b926719b41510b286134bc6d4e5385832b7cff6ada
+SIZE (cabal/transformers-0.2.2.0.tar.gz) = 17148
diff --git a/devel/hs-transformers/pkg-plist b/devel/hs-transformers/pkg-plist
deleted file mode 100644
index 371eba68e4f5..000000000000
--- a/devel/hs-transformers/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/IO/Class.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Class.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Cont.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Identity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/List.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Maybe.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/RWS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/RWS/Lazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/RWS/Strict.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Reader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/State/Lazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/State/Strict.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Writer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Writer/Lazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Writer/Strict.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Functor/Compose.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Functor/Constant.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Functor/Identity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Functor/Product.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Functor
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/Writer
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/State
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans/RWS
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Trans
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index a4552b3a58ee..47511357878b 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -6,11 +6,13 @@
#
PORTNAME= unamb
-PORTVERSION= 0.2.2
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unambiguous choice library for Haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unamb/distinfo b/devel/hs-unamb/distinfo
index 471b5e2cdf2b..819186abe5fb 100644
--- a/devel/hs-unamb/distinfo
+++ b/devel/hs-unamb/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/unamb-0.2.2.tar.gz) = 8418a80d2ba94da77bbcb0e14cf1d95d
-SHA256 (cabal/unamb-0.2.2.tar.gz) = f2552f212296554b999fb8a7ade9f8957546745e628c9016d304faaf84f72363
-SIZE (cabal/unamb-0.2.2.tar.gz) = 7661
+SHA256 (cabal/unamb-0.2.4.tar.gz) = e45b1f372def4e71a14a60ded5ef0b60798b7279307c21f375c3949e18d3cd86
+SIZE (cabal/unamb-0.2.4.tar.gz) = 8410
diff --git a/devel/hs-unamb/pkg-plist b/devel/hs-unamb/pkg-plist
deleted file mode 100644
index 8a9745550e95..000000000000
--- a/devel/hs-unamb/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Unamb.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 8ee631a65390..4c1bf631f47c 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -6,13 +6,16 @@
#
PORTNAME= uniplate
-PORTVERSION= 1.5.1
+PORTVERSION= 1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Uniform type generic traversals for Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
+USE_CABAL= syb
PORTDATA= *
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${DATADIR}
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index 118da1c8ed94..aefedbb1e451 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/uniplate-1.5.1.tar.gz) = 78c7bdc6021b78f5cb650ccd5ab00973
-SHA256 (cabal/uniplate-1.5.1.tar.gz) = cfeaaaabbbe318992df0c51a0c04729b22dac244f415b80a3b388708ed9cfc33
-SIZE (cabal/uniplate-1.5.1.tar.gz) = 23941
+SHA256 (cabal/uniplate-1.6.tar.gz) = b9ff5fe4c462a2075587c7fac6da9d07e544ee0c9ca781e8831a1a69f5f7d48e
+SIZE (cabal/uniplate-1.6.tar.gz) = 26216
diff --git a/devel/hs-uniplate/pkg-plist b/devel/hs-uniplate/pkg-plist
deleted file mode 100644
index 024867ec4ee3..000000000000
--- a/devel/hs-uniplate/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Biplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Compos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateDirect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateTypeable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/SYB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Str.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Operations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Direct.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Typeable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/DataOnly.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/DataOnlyOperations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateStr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateStrOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index a4bb0f9fe30d..4365cdafa796 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -6,11 +6,13 @@
#
PORTNAME= unix-compat
-PORTVERSION= 0.1.2.1
+PORTVERSION= 0.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Portable POSIX-compatibility layer for Haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index acc2131febe8..7f2aaa6e62a7 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/unix-compat-0.1.2.1.tar.gz) = 6ecfc3922fce2e96922af3a636b061f9
-SHA256 (cabal/unix-compat-0.1.2.1.tar.gz) = 553326e140f71f09cedeec5f74666171c2ad2b3d9ba4312da97da02cbf8a2e85
-SIZE (cabal/unix-compat-0.1.2.1.tar.gz) = 6286
+SHA256 (cabal/unix-compat-0.2.1.1.tar.gz) = b05f42ed9d13df1f0d020529a7684875b05dd08d8b8bc3fac698bc8173127085
+SIZE (cabal/unix-compat-0.2.1.1.tar.gz) = 6976
diff --git a/devel/hs-unix-compat/pkg-plist b/devel/hs-unix-compat/pkg-plist
deleted file mode 100644
index 25b55d8f74b9..000000000000
--- a/devel/hs-unix-compat/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/PosixCompat/Extensions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/PosixCompat/Files.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/PosixCompat/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/PosixCompat/User.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsUnixCompat.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/PosixCompat
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 7b7d2a57fa52..10128e984ef4 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -7,10 +7,13 @@
PORTNAME= utf8-string
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for reading/writing UTF8 strings for Haskell programs
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index 4b6626d50c0d..22ed4a5888c6 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/utf8-string-0.3.6.tar.gz) = be8c5ef52a0824babdc89d60c1e9b600
SHA256 (cabal/utf8-string-0.3.6.tar.gz) = c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69
SIZE (cabal/utf8-string-0.3.6.tar.gz) = 8871
diff --git a/devel/hs-utf8-string/pkg-plist b/devel/hs-utf8-string/pkg-plist
deleted file mode 100644
index 546971bab69c..000000000000
--- a/devel/hs-utf8-string/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/Generic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/String.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 15476a70a019..bed9253d2239 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -7,10 +7,13 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.5.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Various small Haskell helper functions for Lists, Maybes, Tuples, Functions
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-utility-ht/distinfo b/devel/hs-utility-ht/distinfo
index c7281ae5f0be..cad709e226d8 100644
--- a/devel/hs-utility-ht/distinfo
+++ b/devel/hs-utility-ht/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/utility-ht-0.0.5.1.tar.gz) = 98dcb042f404378d9071fc6344703386
SHA256 (cabal/utility-ht-0.0.5.1.tar.gz) = f15fd1450b31f002e6d4fe3720cff7c899f23f8a68b890ea3854e68e596c97cb
SIZE (cabal/utility-ht-0.0.5.1.tar.gz) = 16773
diff --git a/devel/hs-utility-ht/pkg-plist b/devel/hs-utility-ht/pkg-plist
deleted file mode 100644
index 6890238dcb92..000000000000
--- a/devel/hs-utility-ht/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bool/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bool/HT/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Eq/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Function/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Function/HT/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/HT/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Key.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Key/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Match/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maybe/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Ord/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Record/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Record/HT/Private.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Strictness/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tuple/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Read/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Show/HT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Show
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Read
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tuple
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Strictness
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Record/HT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Record
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Ord
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maybe
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Match
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/Key
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List/HT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/List
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Function/HT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Function
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Eq
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bool/HT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Bool
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index a22d491ad09a..a1e1f64363ae 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= uuagc
-PORTVERSION= 0.9.29
+PORTVERSION= 0.9.36
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Attribute Grammar System of Universiteit Utrecht
+LICENSE= GPLv2
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= uulib>=0.9.12
+USE_CABAL= uulib>=0.9.12
EXECUTABLE= uuagc
HADDOCK_EXE=
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 266808748742..d4a1c14bfd48 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/uuagc-0.9.29.tar.gz) = a354d3b1e5b29e9cbfe5ace5a7c4703a
-SHA256 (cabal/uuagc-0.9.29.tar.gz) = 325d395abcc1f8224400a3cd765dd187e6be64a782251aa33080aab008b8829e
-SIZE (cabal/uuagc-0.9.29.tar.gz) = 255544
+SHA256 (cabal/uuagc-0.9.36.tar.gz) = 32a88a67f1c67aff3d3c6d20235475ea96416737f49e81ff910ff27e550a540b
+SIZE (cabal/uuagc-0.9.36.tar.gz) = 283592
diff --git a/devel/hs-uuagc/pkg-plist b/devel/hs-uuagc/pkg-plist
deleted file mode 100644
index 2c047f78317f..000000000000
--- a/devel/hs-uuagc/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $FreeBSD$
-bin/uuagc
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/AbsSyn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/Options.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/UUAGC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 1cd177a063cd..d74754d7bfa8 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -6,12 +6,15 @@
#
PORTNAME= uulib
-PORTVERSION= 0.9.12
+PORTVERSION= 0.9.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell Utrecht Tools Library
+LICENSE= LGPL21
+FILE_LICENSE= COPYRIGHT
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 8000d63d2d9e..da47c998aa1a 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/uulib-0.9.12.tar.gz) = 47c00bc23351c17b747005c7502074c6
-SHA256 (cabal/uulib-0.9.12.tar.gz) = e2ea76db10e5ce94cf6282642754d0e65e5abadc620b3827aa2ab497b88e6747
-SIZE (cabal/uulib-0.9.12.tar.gz) = 54122
+SHA256 (cabal/uulib-0.9.13.tar.gz) = c01eef81259794bbdee1dc46ece72b57c417668f6c3ea3396fd2635afaeeae84
+SIZE (cabal/uulib-0.9.13.tar.gz) = 54215
diff --git a/devel/hs-uulib/pkg-plist b/devel/hs-uulib/pkg-plist
deleted file mode 100644
index 487cf42b86c0..000000000000
--- a/devel/hs-uulib/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/PPrint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/CharParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Derived.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Interface.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Machine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/MachineInterface.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Merge.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Offside.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/Perms.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing/StateParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty/Basic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty/Ext.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenToken.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenOrd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/GenTokenSymbol.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Position.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Scanner.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/Token.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/TokenParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner/TokenShow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/BinaryTrees.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/PermTree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Parsing
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-uvector-algorithms/Makefile b/devel/hs-uvector-algorithms/Makefile
deleted file mode 100644
index 8d1696a324bf..000000000000
--- a/devel/hs-uvector-algorithms/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: hs-uvector-algorithms
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= uvector-algorithms
-PORTVERSION= 0.2
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Efficient algorithms for uvector unboxed arrays in Haskell
-
-USE_HACKAGE= uvector>=0.1.0.4
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-uvector-algorithms/distinfo b/devel/hs-uvector-algorithms/distinfo
deleted file mode 100644
index fe526e55b656..000000000000
--- a/devel/hs-uvector-algorithms/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cabal/uvector-algorithms-0.2.tar.gz) = 5d4088a73dd174fc0ef74b43f91443fa
-SHA256 (cabal/uvector-algorithms-0.2.tar.gz) = 01411922955d572c2fb44cd3c465769507bf7dff424c01e0c0f99dac728ef44b
-SIZE (cabal/uvector-algorithms-0.2.tar.gz) = 17537
diff --git a/devel/hs-uvector-algorithms/pkg-descr b/devel/hs-uvector-algorithms/pkg-descr
deleted file mode 100644
index f2baf9cc1bfa..000000000000
--- a/devel/hs-uvector-algorithms/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Efficient algorithms for uvector unboxed arrays for Haskell. Compilation
-with flags -O2, and -fvia-C -optc-O3 is recommended.
-
-WWW: http://code.haskell.org/~dolio/
diff --git a/devel/hs-uvector-algorithms/pkg-plist b/devel/hs-uvector-algorithms/pkg-plist
deleted file mode 100644
index d30b3dac2919..000000000000
--- a/devel/hs-uvector-algorithms/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Common.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Insertion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Intro.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Merge.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Optimal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/Radix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms/TriHeap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Algorithms
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-uvector/Makefile b/devel/hs-uvector/Makefile
deleted file mode 100644
index 415cf96596c7..000000000000
--- a/devel/hs-uvector/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: hs-uvector
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= uvector
-PORTVERSION= 0.1.1.1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast unboxed arrays with a flexible interface for Haskell
-
-PORTDATA= *
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-uvector/distinfo b/devel/hs-uvector/distinfo
deleted file mode 100644
index 5ab4309d7f1c..000000000000
--- a/devel/hs-uvector/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cabal/uvector-0.1.1.1.tar.gz) = 0f682fe5ddfb52193cc3cfe720929f79
-SHA256 (cabal/uvector-0.1.1.1.tar.gz) = 08c42d9a31df299c2aa8e0e21e2c1077fc3bf9e755449b3243225b20b06e4bdf
-SIZE (cabal/uvector-0.1.1.1.tar.gz) = 88033
diff --git a/devel/hs-uvector/pkg-descr b/devel/hs-uvector/pkg-descr
deleted file mode 100644
index 381d052092ff..000000000000
--- a/devel/hs-uvector/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Fast unboxed arrays with a flexible interface for Haskell. The library is
-built of fusible combinators, as described in the paper "Stream Fusion:
-From Lists to Streams to Nothing at All".
-
-For best results, compile with your user programs with -O2 -fvia-C -optc-O3.
-
-WWW: http://code.haskell.org/~dons/code/uvector
diff --git a/devel/hs-uvector/pkg-plist b/devel/hs-uvector/pkg-plist
deleted file mode 100644
index 40f88e7bb405..000000000000
--- a/devel/hs-uvector/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Prim/BUArr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Prim/Debug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Prim/Hyperstrict.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Prim/Text.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Stream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Basics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Enum.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Permute.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Stream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Sums.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict/Text.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/UArr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/memcpy_extra.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Strict
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector/Prim
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array/Vector
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Array
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 0c6fae6db97e..0848ffb4d23f 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= vector-algorithms
-PORTVERSION= 0.3.2
+PORTVERSION= 0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient algorithms for vector arrays
-USE_HACKAGE= primitive>=0.2 vector>=0.5
+LICENSE= BSD
+
+USE_CABAL= primitive>=0.3 vector>=0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index 66ac173fef17..c50ab4ac9732 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/vector-algorithms-0.3.2.tar.gz) = 47b39bda964ac39b380e6d7a73a24302
-SHA256 (cabal/vector-algorithms-0.3.2.tar.gz) = ac9e6c125d8e56f8d5c22bb593d93f23a97993e62ca915dc8019dacda0bcafe3
-SIZE (cabal/vector-algorithms-0.3.2.tar.gz) = 19361
+SHA256 (cabal/vector-algorithms-0.4.tar.gz) = 080a410c608e1c6fbb9b80a4ca330c6d0cafd39dc896cf20af82d437fa122f12
+SIZE (cabal/vector-algorithms-0.4.tar.gz) = 19882
diff --git a/devel/hs-vector-algorithms/pkg-plist b/devel/hs-vector-algorithms/pkg-plist
deleted file mode 100644
index 06bb9603059c..000000000000
--- a/devel/hs-vector-algorithms/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/vector.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Common.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Insertion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Intro.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Merge.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Optimal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Radix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/Search.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms/TriHeap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Algorithms
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 43b3e1416f4d..4cc49f4ef0eb 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -6,15 +6,17 @@
#
PORTNAME= vector
-PORTVERSION= 0.6.0.2
+PORTVERSION= 0.7.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient Arrays
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= primitive>=0.3
+USE_CABAL= primitive>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index 5ea562e8c22f..700cb8ec7ddc 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/vector-0.6.0.2.tar.gz) = 5268059958930935b7aa4e85ba83206a
-SHA256 (cabal/vector-0.6.0.2.tar.gz) = 9f257260ef18218e35ebc2965a01191173e3c8e0057dae946a8d0c8183f4ba16
-SIZE (cabal/vector-0.6.0.2.tar.gz) = 89232
+SHA256 (cabal/vector-0.7.0.1.tar.gz) = b2fbbd62b0a3b9f267c98446805cf796d5213f8a47d3f1747838707347e5f390
+SIZE (cabal/vector-0.7.0.1.tar.gz) = 92726
diff --git a/devel/hs-vector/pkg-plist b/devel/hs-vector/pkg-plist
deleted file mode 100644
index 0350f6bea5e4..000000000000
--- a/devel/hs-vector/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/vector.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion/Stream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion/Stream/Monadic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion/Stream/Size.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Generic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Generic/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Generic/Mutable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Generic/New.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Internal/Check.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Mutable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Primitive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Primitive/Mutable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Storable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Storable/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Storable/Mutable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Unboxed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Unboxed/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Unboxed/Mutable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Unboxed
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Storable
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Primitive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Generic
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion/Stream
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector/Fusion
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Vector
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile
deleted file mode 100644
index 2a0697e8b7a0..000000000000
--- a/devel/lhs2TeX/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: lhs2TeX
-# Date created: April 24, 2007
-# Whom: mainland@apeiron.net
-#
-# $FreeBSD$
-#
-
-PORTNAME= lhs2tex
-PORTVERSION= 1.15
-PORTREVISION= 2
-CATEGORIES= devel haskell
-MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources
-
-BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
- mktexlsr:${PORTSDIR}/print/teTeX-base \
- hs-utf8-string>=0.3:${PORTSDIR}/devel/hs-utf8-string
-
-RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
-
-USE_GMAKE= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --datadir=${PREFIX}/share \
- --docdir=${DOCSDIR} \
- --mandir=${MANPREFIX}/man
-
-DOCSDIR=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS= *
-DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION}
-PORTDATA= *
-
-.include <bsd.port.pre.mk>
-
-INSTALL_TARGET= install
-
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+= install-doc
-.endif
-
-.if !defined(NOPORTDATA)
-INSTALL_TARGET+= install-data
-.endif
-
-MAN1= lhs2TeX.1
-
-.include <bsd.port.post.mk>
diff --git a/devel/lhs2TeX/distinfo b/devel/lhs2TeX/distinfo
deleted file mode 100644
index 0910f9c2ae69..000000000000
--- a/devel/lhs2TeX/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
-SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
-SIZE (lhs2tex-1.15.tar.gz) = 580361
diff --git a/devel/lhs2TeX/files/patch-Makefile b/devel/lhs2TeX/files/patch-Makefile
deleted file mode 100644
index 08746efe6d38..000000000000
--- a/devel/lhs2TeX/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig 2008-10-24 10:50:41.000000000 +0200
-+++ Makefile 2009-03-04 11:19:34.000000000 +0100
-@@ -135,14 +135,9 @@
- print : Lhs2TeX.dvi
- $(DVIPS) -D600 -f Lhs2TeX.dvi | lpr -Pa -Zl
-
--install : bin doc
-+install : bin
- $(MKINSTDIR) $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 lhs2TeX $(DESTDIR)$(bindir)
-- $(MKINSTDIR) $(DESTDIR)$(stydir)
-- $(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
-- $(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
-- $(MKINSTDIR) $(DESTDIR)$(docdir)
-- $(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
- $(MKINSTDIR) $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 lhs2TeX.1 $(DESTDIR)$(mandir)/man1
- ifeq ($(INSTALL_POLYTABLE),yes)
-@@ -158,6 +153,15 @@
- echo "Please update the TeX filename database."
- endif
-
-+install-doc : doc
-+ $(MKINSTDIR) $(DESTDIR)$(docdir)
-+ $(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
-+
-+install-data : bin
-+ $(MKINSTDIR) $(DESTDIR)$(stydir)
-+ $(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
-+ $(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
-+
- srcdist : INSTALL doc
- if test -d $(DISTDIR); then $(RM) -rf $(DISTDIR); fi
- $(MKINSTDIR) $(DISTDIR)
diff --git a/devel/lhs2TeX/files/patch-configure b/devel/lhs2TeX/files/patch-configure
deleted file mode 100644
index f4c2b4ae0a39..000000000000
--- a/devel/lhs2TeX/files/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
-+++ ./configure 2010-01-07 19:34:38.000000000 +0100
-@@ -2745,54 +2745,6 @@
- POLYTABLE_INSTALL=yes
- fi
-
--if test "z$POLYTABLE_INSTALL" = "zyes"; then
--
--{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
--$as_echo_n "checking for the polytable package... " >&6; }
--if test -x "$KPSEWHICH"; then
-- POLYTABLE="`$KPSEWHICH polytable.sty`"
--fi
--if test -f "$POLYTABLE"; then
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
--$as_echo "$POLYTABLE" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
--$as_echo_n "checking for version of polytable... " >&6; }
-- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
--$as_echo "$POLYTABLE_VERSION" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- # does polytable need to be installed?
-- { $as_echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
--$as_echo_n "checking whether polytable needs to be installed... " >&6; }
-- POLYTABLE_INSTALL=no
-- if test -n $POLYTABLE; then
-- if ( IFS=".";
-- a="$POLYTABLE_VERSION"; b="0.8.2";
-- while test -n "$a$b"
-- do
-- set -- $a; h1="$1"; shift 2>/dev/null; a="$*"
-- set -- $b; h2="$1"; shift 2>/dev/null; b="$*"
-- test -n "$h1" || h1=0; test -n "$h2" || h2=0
-- test ${h1} -eq ${h2} || break
-- done
-- test ${h1} -lt ${h2}
-- )
--then
-- POLYTABLE_INSTALL=yes
--
--fi
--
-- else
-- POLYTABLE_INSTALL=yes
-- fi
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
--$as_echo "$POLYTABLE_INSTALL" >&6; }
--fi
--
- # Extract the first word of "mktexlsr", so it can be a program name with args.
- set dummy mktexlsr; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2834,8 +2786,6 @@
-
-
-
--# docdir and expansion
--docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-
- stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-
diff --git a/devel/lhs2TeX/pkg-descr b/devel/lhs2TeX/pkg-descr
deleted file mode 100644
index 9e915cafea0b..000000000000
--- a/devel/lhs2TeX/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-lhs2TeX is a preprocessor to generate LaTeX code from literate Haskell
-sources. It is released under the GPL.
-
-WWW: http://people.cs.uu.nl/andres/
diff --git a/devel/lhs2TeX/pkg-plist b/devel/lhs2TeX/pkg-plist
deleted file mode 100644
index 17c5274b397d..000000000000
--- a/devel/lhs2TeX/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/lhs2TeX
-share/texmf-local/tex/latex/polytable/lazylist.sty
-share/texmf-local/tex/latex/polytable/polytable.sty
-@dirrm share/texmf-local/tex/latex/polytable
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
diff --git a/devel/pure-gen/Makefile b/devel/pure-gen/Makefile
index 9809a1f20cc2..698a40b3f437 100644
--- a/devel/pure-gen/Makefile
+++ b/devel/pure-gen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pure-gen
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://pure-lang.googlecode.com/files/
@@ -14,7 +15,7 @@ MAINTAINER= lichray@gmail.com
COMMENT= A C interface generator for the Pure language
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- ${LOCALBASE}/lib/language-c-0.3.2/:${PORTSDIR}/devel/hs-language-c
+ hs-language-c>=0.3.2:${PORTSDIR}/devel/hs-language-c
LIB_DEPENDS= pure.7:${PORTSDIR}/lang/pure
MAN1= pure-gen.1