1 files changed, 49 insertions, 21 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 683609e93b02..965eff907048 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haxml
-PORTVERSION=	1.19.6
+PORTVERSION=	1.19.7
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,38 +18,66 @@ BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc
+LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
+GHC_VERSION=	6.10.4
+HAXML_VERSION=	${PORTVERSION}
 
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		HAXMLDIR=lib/HaXml-${PORTVERSION} \
-		GHCDIR=ghc-${GHC_VERSION} \
-		SUBDIR=lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/HaXml-${PORTVERSION}
-PORTDOCS=	*
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
 
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	RMLIC="@comment "
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+HAXML_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HAXML_VERSION=${HAXML_VERSION} \
+		HAXML_LIBDIR_REL=${HAXML_LIBDIR_REL}
+
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
 .else
-PLIST_SUB+=	RMLIC=""
+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
+.endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+PYSHARE=	${SH} -c '(${FIND} -d $$0 $$2)'
+
+.SILENT:
+
 do-configure:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs build
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
 
-do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs install
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+.endif
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dist/installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf
+do-install:
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HAXML_LIBDIR_REL}/register.sh
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} && ${CP} -R docs/ ${DOCSDIR})
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} " -not -regex HaXml.* "
 .endif
 
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+
 .include <bsd.port.mk>