2 files changed, 53 insertions, 106 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 9ef40d11c7c2..2f214e567b62 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -8,72 +8,19 @@ PORTNAME=	haxml
 PORTVERSION=	1.20
 PORTREVISION=	1
 CATEGORIES=	textproc haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
-DISTNAME=	HaXml-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A collection of utilities for using Haskell and XML together
 
-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.10:${PORTSDIR}/math/gmp
-
-GHC_VERSION=	6.10.4
-HAXML_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-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+=		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
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	polyparse>=1.2
 
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+EXECUTABLE=	Canonicalise CanonicaliseLazy \
+		DtdToHaskell MkOneOf Validate \
+		Xtract XtractLazy
 
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HAXML_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
+DISTNAME=	HaXml-${PORTVERSION}
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index 4ec160996a47..93cc4a4c7cc0 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -6,52 +6,52 @@ bin/MkOneOf
 bin/Validate
 bin/Xtract
 bin/XtractLazy
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%HAXML_VERSION%%.o
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
-%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%HAXML_VERSION%%.a
-%%HAXML_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HAXML_LIBDIR_REL%%
-@exec /bin/sh %D/%%HAXML_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister HaXml
+@unexec %D/bin/ghc-pkg unregister HaXml-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old