1 files changed, 32 insertions, 14 deletions

diff --git a/devel/hs-hpl/Makefile b/devel/hs-hpl/Makefile
index 1369b7529f8a..3e1f4803aca5 100644
--- a/devel/hs-hpl/Makefile
+++ b/devel/hs-hpl/Makefile
@@ -6,28 +6,46 @@
 #
 
 PORTNAME=	hpl
-PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTVERSION=	0.4.3.2
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/ports/
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/ports/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
-DISTNAME=	ports-${PORTVERSION}
+DISTNAME=	${HSPORTNAME}-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Haskell Ports Library provides ports in Haskell
 
-BROKEN=		Does not build with latest GHC
-DEPRECATED=	"${BROKEN}"
-EXPIRATION_DATE=2007-09-01
-
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4
+
+.include <bsd.port.pre.mk>
+
+GHC_VERSION=	6.6.1
+HSPORTNAME=	ports
+
+# 'owned' by lang/ghc:
+CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
+CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
+
+PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
+		HSPORTNAME="${HSPORTNAME}" \
+		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
+
+CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
+		--libsubdir='' --datasubdir=''
+
+do-patch:	# current version has broken delimiters in strings here:
+		${REINPLACE_CMD} -e 's/\\\([oNS]\)/\1/' ${WRKSRC}/Control/Concurrent/PortsVersion.hs
 
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
+do-configure:
+	cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+do-build:
+	cd ${WRKSRC} && ${CABALCMD} build \
+	 && ${CABALCMD} --gen-script register
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+do-install:
+	cd ${WRKSRC} && ${CABALCMD} install \
+	 && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${HSPORTNAME}-register.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>