- Please welcome GHC 7.0.4

GHC in the ports tree has been updated to version 7.0.4 and the port revision
for all the Haskell ports without version changes are bumped.  Other per-port
updates are coming soon.

This update also incorporates some improvements for bsd.cabal.mk that makes
working with Haskell ports even easier.

Thanks ashish@ for the help!

Obtained from:	FreeBSD Haskell

99 files changed, 186 insertions, 126 deletions

diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 63f1b930b9a8..a33ffbc55437 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zip-archive
 PORTVERSION=	0.1.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index f8caa6459136..f4e204f100a0 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	zlib
 PORTVERSION=	0.5.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 441b15ade238..29986a65f1f6 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ALUT
 PORTVERSION=	2.2.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -19,7 +19,6 @@ CABAL_SETUP=	Setup.hs
 USE_CABAL=	OpenAL StateVar
 USE_OPENAL=	al alut
 
-PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 55a7d8d6103e..34cdee537b72 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OpenAL
 PORTVERSION=	1.4.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -19,7 +19,6 @@ CABAL_SETUP=	Setup.hs
 USE_CABAL=	ObjectName StateVar Tensor
 USE_OPENAL=	al
 
-PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 32647603ab6f..ecb63a655035 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	json
 PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 0a870448cfa1..53e2538f4d8b 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	BNFC
 PORTVERSION=	2.4.2.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	kaiw27@gmail.com
@@ -19,7 +20,6 @@ USE_CABAL=	mtl
 
 STANDALONE=	yes
 EXECUTABLE=	bnfc
-PORTDATA=	*
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 5981a2288d81..f91e5f7f06a7 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Boolean
 PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 432c577f05f4..a860764885d9 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MemoTrie
 PORTVERSION=	0.4.10
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index c5c346c8f285..7eb12e0a3681 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MonadCatchIO-mtl
 PORTVERSION=	0.3.0.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 5509b87b2b8c..bbcf20192ab2 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ObjectName
 PORTVERSION=	1.0.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index baaeef3eadbc..3eb281f06ec6 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	StateVar
 PORTVERSION=	1.0.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index afa699fccbb8..76fe24232c8f 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Tensor
 PORTVERSION=	1.0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 4daf84dff1ac..426a834ace6f 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -19,7 +20,6 @@ USE_AUTOTOOLS=	autoconf:env
 STANDALONE=	yes
 EXECUTABLE=	alex
 
-PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 
 .if defined(SLAVE)
diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist
deleted file mode 100644
index b30ec382bc49..000000000000
--- a/devel/hs-alex/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%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 b3c4b4725325..6a1ce2c99014 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ansi-terminal
 PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index e629886d230c..eeb0f61ffb68 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	arrows
 PORTVERSION=	0.4.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-binary/Makefile b/devel/hs-binary/Makefile
index 03dafc9b0f3a..09ea1d656570 100644
--- a/devel/hs-binary/Makefile
+++ b/devel/hs-binary/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binary
 PORTVERSION=	0.5.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index c30c99214bc2..1e1365594e48 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsd-sysctl
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 544c9d6f6636..ecdbfc088f8e 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.16.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -26,7 +27,5 @@ EXECUTABLE=	c2hs
 MAN1=		c2hs.1
 MAN1SRC=	doc/man1
 
-PORTDATA=	*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 75877182861b..a4ad91f162d2 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cabal-install
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 86db74db6ccb..51502f2685ef 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	checkers
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index bab7154cb457..8233c81b868d 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	darcs
 PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 000000000000..8d5bf83a6a70
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,38 @@
+--- ./darcs.cabal.orig	2011-03-13 23:40:47.000000000 +0100
++++ ./darcs.cabal	2011-12-10 15:26:09.000000000 +0100
+@@ -170,7 +170,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -375,7 +375,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -523,7 +523,7 @@
+ 
+   build-depends:   base          < 5,
+                    extensible-exceptions >= 0.1 && < 0.2,
+-                   regex-compat >= 0.71 && < 0.94,
++                   regex-compat >= 0.71,
+                    mtl          >= 1.0 && < 2.1,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+@@ -619,7 +619,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 2e3e4c6d0e79..e4fcf4904cd6 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data-default
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 2e89b7976a36..d18355ee7b4d 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	datetime
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-deepseq/Makefile b/devel/hs-deepseq/Makefile
index e7cbcada42ea..863a9d025f94 100644
--- a/devel/hs-deepseq/Makefile
+++ b/devel/hs-deepseq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deepseq
 PORTVERSION=	1.1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index b9fd798eff92..4ed558dc5189 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	directory-tree
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 14506fabfc5c..19ea8c3126fa 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	dlist
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index ae4aee7307f0..dcd8d007c6ad 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	drift
 PORTVERSION=	2.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://repetae.net/computer/haskell/DrIFT/drop/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 1ba2fe7fe189..451e2bb45d3c 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	filemanip
 PORTVERSION=	0.3.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths-docs/Makefile b/devel/hs-ghc-paths-docs/Makefile
index 6e42c59568dd..6ffa1fa420d4 100644
--- a/devel/hs-ghc-paths-docs/Makefile
+++ b/devel/hs-ghc-paths-docs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ghc-paths
 PORTVERSION=	0.1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 81826046e330..7cd54e6118c8 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ghc-paths
 PORTVERSION=	0.1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index aab5158dd4f7..0e86c34eb3ed 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	git-annex
 PORTVERSION=	3.20110707
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	frase@frase.id.au
diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile
index ab8609f2faa5..8230c4575c45 100644
--- a/devel/hs-haddock-docs/Makefile
+++ b/devel/hs-haddock-docs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 56635f161ab8..b33cb6279025 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -20,8 +20,6 @@ USE_HAPPY=	true
 
 EXECUTABLE=	haddock-${PORTVERSION}
 
-PORTDATA=	*
-
 SUB_FILES=	pkg-deinstall pkg-install
 SUB_LIST=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/${EXECUTABLE}
 
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 487e00358800..be4c46a4c67c 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.18.6
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -23,7 +24,6 @@ EXECUTABLE=	happy
 
 USE_PERL5_BUILD=	5.8+
 
-PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 
 .if defined(SLAVE)
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
deleted file mode 100644
index e4c156399dc0..000000000000
--- a/devel/hs-happy/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $FreeBSD$
-%%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-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 4b4f5bfdbf59..0201f4da5be3 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	haskell-src-exts
 PORTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index a622ba2db012..45ab3a983279 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	haskell-src
 PORTVERSION=	1.0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index abe8c3851057..795b21b2e80c 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hlibev
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 3e110885135f..5483a13a7822 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	idoc
 PORTVERSION=	0.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/idoc/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 2f2ac3ab4d16..5a8c4df3d3f3 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	language-c
 PORTVERSION=	0.3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index d7fcd3c1fa31..25f62783fb44 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mmap
 PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-mtl-docs/Makefile b/devel/hs-mtl-docs/Makefile
index 95b9c91244b2..c4b978e1b322 100644
--- a/devel/hs-mtl-docs/Makefile
+++ b/devel/hs-mtl-docs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtl
 PORTVERSION=	2.0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index 4cbec2ef6b64..83140ced0aa9 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtl
 PORTVERSION=	2.0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index e597b2d4d20f..7eebdc93445f 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mueval
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -20,7 +20,6 @@ USE_CABAL=	hint>=0.3.1 mtl show>=0.3 utf8-string
 
 EXECUTABLE=	mueval mueval-core
 
-PORTDATA=	*
 SHOW_PKGMSG=	yes
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 741e04ed20f2..e3e94edc7013 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	parallel
 PORTVERSION=	3.1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 6e09fd0d6c87..092e9ed17c24 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcre-light
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 06b74fd3d348..0be4e87ff7c4 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reactive
 PORTVERSION=	0.11.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index c4a83751d17d..87146aa56b23 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	readline
 PORTVERSION=	1.0.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 9d2a26c47df9..18feb5df46d4 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stm
 PORTVERSION=	2.2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-transformers-docs/Makefile b/devel/hs-transformers-docs/Makefile
index ca2989647bf4..0e288b42a69f 100644
--- a/devel/hs-transformers-docs/Makefile
+++ b/devel/hs-transformers-docs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transformers
 PORTVERSION=	0.2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index 9dbeb67f9bfb..d420ad327eed 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transformers
 PORTVERSION=	0.2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 9bd52bd49907..a1280bcb837b 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	unamb
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index 2367c379b3e8..a147d62ecd95 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unix-compat
 PORTVERSION=	0.2.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 15b906f2a050..e2f3b47e2353 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	1.3.7
+PORTREVISION=	1
 CATEGORIES=	ftp haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index 54ffc67efe20..eb4b5d505f74 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	HGL
 PORTVERSION=	3.2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 11069d7900b2..9be0facf7571 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	7.0.3
-PORTREVISION=	1
+PORTVERSION=	7.0.4
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://haskell.org/ghc/dist/${PORTVERSION}/:source \
 		${MASTER_SITE_LOCAL:S/$/:boot/} \
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 05f19610f1c3..871db7b439a4 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -47,7 +47,7 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .endif
 
-GHC_VERSION?=	7.0.3
+GHC_VERSION?=	7.0.4
 GHC_VERSION_N=	${GHC_VERSION:S/./0/g}
 
 GHC_CMD?=	${LOCALBASE}/bin/ghc
@@ -57,6 +57,11 @@ SETUP_CMD?=	./setup
 ALEX_CMD?=	${LOCALBASE}/bin/alex
 HAPPY_CMD?=	${LOCALBASE}/bin/happy
 HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
+C2HS_CMD?=	${LOCALBASE}/bin/c2hs
+
+.if !defined(DOCUMENTATION)
+CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
+.endif
 
 GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
 
@@ -99,6 +104,11 @@ BUILD_DEPENDS+=	${HAPPY_CMD}:${PORTSDIR}/devel/hs-happy
 CONFIGURE_ARGS+=	 --with-happy=${HAPPY_CMD}
 .endif
 
+.if defined(USE_C2HS)
+BUILD_DEPENDS+=	${C2HS_CMD}:${PORTSDIR}/devel/hs-c2hs
+CONFIGURE_ARGS+=	--with-c2hs=${C2HS_CMD}
+.endif
+
 .if defined(EXECUTABLE)
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 USE_ICONV=	yes
@@ -318,12 +328,10 @@ do-install:
 
 .if !target(post-install-script)
 post-install-script:
-.if !defined(DOCUMENTATION)
-	@if [ -d ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} ]; then ${FIND} -ds ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
-		-type f -print | ${SED} -E -e 's,^${PREFIX}/?,,' >> ${TMPPLIST}; fi
-	@if [ -d ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} ]; then ${FIND} -ds ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
-		-type d -print | ${SED} -E -e 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi
-.endif
+	@for dir in ${CABAL_DIRS}; do if [ -d $${dir} ]; then ${FIND} -ds $${dir} \
+		-type f -print | ${SED} -E -e 's,^${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \
+		if [ -d $${dir} ]; then ${FIND} -ds $${dir} \
+		-type d -print | ${SED} -E -e 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done
 .if defined(EXECUTABLE)
 .for exe in ${EXECUTABLE}
 	@${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
@@ -339,7 +347,7 @@ add-plist-cabal:
 	@if [ -f ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh ]; then \
 		(${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh'; \
 		 ${ECHO_CMD} '@exec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old'; \
-		 ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister ${PORTNAME}-${PORTVERSION}'; \
+		 ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}'; \
 		 ${ECHO_CMD} '@unexec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old') >> ${TMPPLIST}; fi
 .endif
 .if defined(NOPORTDOCS)
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 6a3c873af43d..aa62aad6b075 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,5 +1,5 @@
-SHA256 (ghc-7.0.3-src.tar.bz2) = 156169c28dab837922260a0fbfcc873c679940d805a736dc78aeb1b60c13ccd9
-SIZE (ghc-7.0.3-src.tar.bz2) = 24201117
+SHA256 (ghc-7.0.4-src.tar.bz2) = 1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed
+SIZE (ghc-7.0.4-src.tar.bz2) = 24205070
 SHA256 (hscolour-1.16.tar.gz) = 206fa8c7e2b69d16d401feec2049bf5b392b1ac4c3628baf8b172b00cc7857f5
 SIZE (hscolour-1.16.tar.gz) = 57057
 SHA256 (ghc-paths-0.1.0.6.tar.gz) = 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243
diff --git a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs
new file mode 100644
index 000000000000..c8a4d6a29e90
--- /dev/null
+++ b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs
@@ -0,0 +1,14 @@
+--- ./libraries/Cabal/Distribution/Simple/Haddock.hs.orig	2011-06-13 19:10:10.000000000 +0200
++++ ./libraries/Cabal/Distribution/Simple/Haddock.hs	2012-01-25 07:33:27.000000000 +0100
+@@ -440,8 +440,9 @@
+   let allPkgs = installedPkgs lbi
+       directDeps = map fst (externalPackageDeps lbi)
+   transitiveDeps <- case dependencyClosure allPkgs directDeps of
+-                    Left x -> return x
+-                    Right _ -> die "Can't find transitive deps for haddock"
++    Left x    -> return x
++    Right inf -> die $ "internal error when calculating transative "
++                    ++ "package dependencies.\nDebug info: " ++ show inf
+   interfaces <- sequence
+     [ case interfaceAndHtmlPath ipkg of
+         Nothing -> return (Left (packageId ipkg))
diff --git a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs
new file mode 100644
index 000000000000..f656c59d64cd
--- /dev/null
+++ b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs
@@ -0,0 +1,25 @@
+--- ./libraries/Cabal/Distribution/Simple/LocalBuildInfo.hs.orig	2011-06-13 19:10:10.000000000 +0200
++++ ./libraries/Cabal/Distribution/Simple/LocalBuildInfo.hs	2012-01-25 07:33:27.000000000 +0100
+@@ -136,13 +136,17 @@
+   }
+   deriving (Read, Show)
+ 
+--- | External package dependencies for the package as a whole, the union of the
+--- individual 'targetPackageDeps'.
++-- | External package dependencies for the package as a whole. This is the
++-- union of the individual 'componentPackageDeps', less any internal deps.
+ externalPackageDeps :: LocalBuildInfo -> [(InstalledPackageId, PackageId)]
+-externalPackageDeps lbi = nub $
++externalPackageDeps lbi = filter (not . internal . snd) $ nub $
+   -- TODO:  what about non-buildable components?
+-     maybe [] componentPackageDeps (libraryConfig lbi)
+-  ++ concatMap (componentPackageDeps . snd) (executableConfigs lbi)
++       maybe [] componentPackageDeps (libraryConfig lbi)
++    ++ concatMap (componentPackageDeps . snd) (executableConfigs lbi)
++  where
++    -- True if this dependency is an internal one (depends on the library
++    -- defined in the same package).
++    internal pkgid = pkgid == packageId (localPkgDescr lbi)
+ 
+ -- | The installed package Id we use for local packages registered in the local
+ -- package db. This is what is used for intra-package deps between components.
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index 297151876afc..2e379e9dae01 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brainfuck
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 58e6704b3289..1875ed6f816b 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	unlambda
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 3344e11a3c6f..1d0db9612569 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	categories
 PORTVERSION=	0.58.0.5
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 4b9db7ee8b13..a51c10ecea20 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	distributive
 PORTVERSION=	0.2.0.1
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 188d9a5a1a9c..ea7648bebd15 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	erf
 PORTVERSION=	2.0.0.0
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 0e10205c9dd6..8c3bd5197edb 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	math-functions
 PORTVERSION=	0.1.1.0
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	wen@FreeBSD.org
@@ -18,7 +19,5 @@ USE_CABAL=	erf>=2 vector>=0.7
 
 CABAL_SETUP=	Setup.hs
 
-PORTDATA=		*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index 6e9ed008e9ea..971da0d2be36 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hostname
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index c85795b40a5b..2009d0fe5bd1 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcap
 PORTVERSION=	0.4.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index e11f07be650c..2d5c3011c059 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	porte
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt haskell
 
 MAINTAINER=	sbahra@repnop.org
diff --git a/print/hs-hscolour-docs/Makefile b/print/hs-hscolour-docs/Makefile
index d928ecceb1d2..dffcaa60e612 100644
--- a/print/hs-hscolour-docs/Makefile
+++ b/print/hs-hscolour-docs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hscolour
 PORTVERSION=	1.19
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print haskell
 
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index 2cd893a6ba8c..7604e072dfa2 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hscolour
 PORTVERSION=	1.19
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print haskell
 
@@ -20,7 +21,5 @@ CABAL_SETUP=	Setup.hs
 
 EXECUTABLE=	HsColour
 
-PORTDATA=		*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index 46ffef253b96..8547b9c5db39 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SHA
 PORTVERSION=	1.5.0.0
+PORTREVISION=	1
 CATEGORIES=	security haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index d26b830d198d..6d351468592f 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	bytestring-csv
 PORTVERSION=	0.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 572b2232d1d6..b7eaa444bac0 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	csv
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 4c68a51f8fdd..0f4d59f28f2f 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	feed
 PORTVERSION=	0.3.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 90bebe41135f..e8af2ff7a7e8 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hs-bibutils
 PORTVERSION=	4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 469527f07293..6a956cd65f5c 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	html
 PORTVERSION=	1.0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 5290549e883a..edcabfe39aba 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lhs2tex
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -25,7 +26,5 @@ EXECUTABLE=	lhs2TeX
 
 MAN1=		lhs2TeX.1
 
-PORTDATA=	*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-lhs2tex/pkg-plist b/textproc/hs-lhs2tex/pkg-plist
index 883595e8b6c6..df96defd557c 100644
--- a/textproc/hs-lhs2tex/pkg-plist
+++ b/textproc/hs-lhs2tex/pkg-plist
@@ -1,6 +1,4 @@
 @comment $FreeBSD$
-%%NOPORTDOCS%%%%DOCSDIR%%/doc/Guide2.pdf
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%/doc
 share/texmf-local/tex/latex/polytable/lazylist.sty
 share/texmf-local/tex/latex/polytable/polytable.sty
 @dirrm share/texmf-local/tex/latex/polytable
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 703d78f57342..3f52154bdb56 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index bfe798cdfa79..689a4fc31a7d 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pandoc-types
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index d045ffa33296..09fa619b848a 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pandoc
 PORTVERSION=	1.8.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -24,8 +25,6 @@ USE_CABAL=	base64-bytestring>=0.1 citeproc-hs>=0.3.1 dlist>=0.4 \
 MAN1=		pandoc.1 markdown2pdf.1
 MAN5=		pandoc_markdown.5
 
-PORTDATA=	*
-
 OPTIONS=	HIGHLIGHTING "Compile in support for syntax highlighting" off \
 		EXECUTABLE   "Build the pandoc executable" on \
 		WRAPPERS     "Build the wrappers (markdown2pdf)" on \
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 090976fbf854..c00ff2339443 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	parsec
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 62bce8992961..2184c57bb870 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-base
 PORTVERSION=	0.93.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 6ab1c8456a1b..ddb656d60d7c 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-pcre-builtin
 PORTVERSION=	0.94.2.1.7.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 52c5ceac26f7..4b6b7e5407f7 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlhtml
 PORTVERSION=	0.1.5.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 2d07ae9f7ba5..6640af089d47 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgi
 PORTVERSION=	3001.1.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www haskell
 
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 2db48389500c..213d98f64fe1 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fastcgi
 PORTVERSION=	3001.0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index ad2570231bec..6cf8224e086d 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hS3
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 42e788069a78..77ed28c69664 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	http-server
 PORTVERSION=	1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -18,7 +18,6 @@ LICENSE=	BSD
 CABAL_SETUP=	Setup.hs
 USE_CABAL=	HTTP>=4000.0.7 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
 
-PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	cd ${WRKSRC}/example && \
 			  ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 27246d4bdf56..099721e09fc3 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oeis
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -17,7 +18,5 @@ LICENSE=	BSD
 CABAL_SETUP=	Setup.hs
 USE_CABAL=	HTTP>=4000.0.2 network>=2
 
-PORTDATA=	*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index 2ab15bf76826..11c748c3cb21 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	scgi
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 87a10f2fecb9..dbc3c9177ac2 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	url
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 0c6f4fee3e0e..22a1c4ada891 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	GLUT
 PORTVERSION=	2.1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 653587d19784..29b2ce57fd38 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	OpenGL
 PORTVERSION=	2.2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index e44511aada08..f73988603e1e 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index d1dd26110ee2..e917b89d57ad 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -22,7 +23,5 @@ MAN1SRC=	man
 
 EXECUTABLE=	xmonad
 
-PORTDATA=		*
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>