Upgrade ghc to 6.8.3.

5 files changed, 36 insertions, 5 deletions

diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 91a502218238..48245338f059 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.15.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
 PKGNAMEPREFIX=	hs-
@@ -21,7 +22,7 @@ LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
 .include <bsd.port.pre.mk>
 
-GHC_VERSION=	6.8.2
+GHC_VERSION=	6.8.3
 
 # 'owned' by lang/ghc:
 CABALDIR=       ${PREFIX}/${SUBDIR}
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 3fcbf9b54e3d..ace2a14713c0 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -26,7 +27,7 @@ NO_PKG_REGISTER=
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 
-GHC_VERSION=	 6.8.2
+GHC_VERSION=	 6.8.3
 HADDOCK_VERSION=	${PORTVERSION}
 
 CABAL_CMD=	runghc Setup.lhs
@@ -47,7 +48,7 @@ do-configure:
 	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build
+	cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1"
 .if !defined(SLAVE)
 	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
 .endif
diff --git a/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs b/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs
new file mode 100644
index 000000000000..dad648dbb311
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs
@@ -0,0 +1,27 @@
+--- src/Haddock/GHC/Typecheck.hs.orig	2008-05-01 15:13:13.000000000 +0200
++++ src/Haddock/GHC/Typecheck.hs	2008-06-22 16:52:52.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ import Data.List
+ 
++import FastString
+ 
+ type CheckedMod = (Module, FilePath, FullyCheckedMod)
+ 
+@@ -69,7 +70,7 @@
+ mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
+   ghcModule         = mod,
+   ghcFilename       = file,
+-  ghcMbDocOpts      = mbOpts,
++  ghcMbDocOpts      = fmap unpackFS mbOpts,
+   ghcHaddockModInfo = info,
+   ghcMbDoc          = mbDoc,
+   ghcGroup          = group,
+@@ -79,6 +80,6 @@
+   ghcInstances      = modInfoInstances modInfo
+ }
+   where
+-    HsModule _ _ _ _ _ mbOpts _ _      = unLoc parsed
++    HsModule _ _ _ _ mbOpts _ _      = unLoc parsed
+     (group, _, mbExports, mbDoc, info) = renamed
+     (parsed, renamed, _, modInfo)      = checkedMod
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 66e19294c0a7..456b62d69797 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uuagc
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,7 +19,7 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 		hs-uulib>=0.9.5:${PORTSDIR}/devel/hs-uulib
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 
-GHC_VERSION=	6.8.2
+GHC_VERSION=	6.8.3
 
 GHC_CMD=	${LOCALBASE}/bin/ghc
 SETUP_CMD=	./setup
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index b548029fae42..f9cdad3b9881 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uulib
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,7 +17,7 @@ COMMENT=	Haskell Utrecht Tools Library
 
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
-GHC_VERSION=	6.8.2
+GHC_VERSION=	6.8.3
 UULIB_VERSION=	${PORTVERSION}
 
 GHC_CMD=	${LOCALBASE}/bin/ghc