2 files changed, 59 insertions, 34 deletions

diff --git a/devel/hs-binary/Makefile b/devel/hs-binary/Makefile
index b3ab4a926f01..fb6993993b6f 100644
--- a/devel/hs-binary/Makefile
+++ b/devel/hs-binary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	binary
 PORTVERSION=	0.5.0.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,38 +19,60 @@ COMMENT=	Efficient binary serialisation for Haskell
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 
-GHC_VERSION=	6.8.3
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
+GHC_VERSION=	6.10.4
 
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
-		PORTNAME=${PORTNAME}			\
-		PORTVERSION=${PORTVERSION}		\
-		SUBDIR=${CABALDIR}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+BINARY_VERSION=	${PORTVERSION}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+BINARY_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		BINARY_VERSION=${BINARY_VERSION} \
+		BINARY_LIBDIR_REL=${BINARY_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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .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 ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${BINARY_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/devel/hs-binary/pkg-plist b/devel/hs-binary/pkg-plist
index f8567b76455e..63c22b11f80d 100644
--- a/devel/hs-binary/pkg-plist
+++ b/devel/hs-binary/pkg-plist
@@ -1,16 +1,18 @@
 @comment $FreeBSD$
-%%SUBDIR%%/Data/Binary.hi
-%%SUBDIR%%/Data/Binary/Builder.hi
-%%SUBDIR%%/Data/Binary/Get.hi
-%%SUBDIR%%/Data/Binary/Put.hi
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-@dirrmtry %%SUBDIR%%/Data/Binary
-@dirrmtry %%SUBDIR%%/Data
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister %%PORTNAME%%
-@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.hi
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbinary-%%BINARY_VERSION%%.o
+%%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbinary-%%BINARY_VERSION%%.a
+%%BINARY_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary
+@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%BINARY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%BINARY_LIBDIR_REL%%
+@exec /bin/sh %D/%%BINARY_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister binary
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old