- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump

  port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
  with GHC 6.10.4

PR:		ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
   		ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
   		ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
   		ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
   		ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
   		ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
   		ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
   		ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
   		ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
   		ports/137107, ports/137108, ports/137109, ports/137110, ports/137111

Submitted by:	Jacula Modyun (jacula (at) gmail (dot) com),
             	Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by:	wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by:	tabthorpe (mentor), respective maintainers

1 files changed, 42 insertions, 20 deletions

diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 11ac8b19b71d..840dcfee7823 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	utf8-string
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,37 +18,59 @@ COMMENT=	Support for reading/writing UTF8 strings for Haskell programs
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+UTF8STR_VERSION=	${PORTVERSION}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+UTF8STR_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		UTF8STR_VERSION=${UTF8STR_VERSION} \
+		UTF8STR_LIBDIR_REL=${UTF8STR_LIBDIR_REL}
+
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
 
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install \
-	  && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UTF8STR_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>