3 files changed, 70 insertions, 53 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index beb6f0e527cd..9e900e1fbe4b 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -5,26 +5,37 @@
 # $FreeBSD$
 
 PORTNAME=	haxml
-PORTVERSION=	1.13.3
+PORTVERSION=	1.19.4
 CATEGORIES=	textproc haskell
-MASTER_SITES=	http://www.haskell.org/HaXml/ \
-		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
+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:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+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
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS= --ghc --prefix=${PREFIX}
 
-GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}" \
-		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=	*
 
+.if !defined(NOPORTDOCS)
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
+.endif
+
 do-configure:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs configure ${CONFIGURE_ARGS}
 
@@ -36,10 +47,9 @@ do-install:
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dist/installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf
-	@${RM} -f ${LOCALBASE}/lib/ghc-${GHC_VERSION}/package.conf.old
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
+	@(cd ${WRKSRC} && ${CP} -R docs/ ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 59035ec5d796..1b510cc4cfd8 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,3 +1,3 @@
-MD5 (HaXml-1.13.3.tar.gz) = 63c773f75d3f067824e42fcaf89af024
-SHA256 (HaXml-1.13.3.tar.gz) = 60872bc3684f6884e4b8fdfca95adf455072e8dc1f74105a33a6a69781e7a921
-SIZE (HaXml-1.13.3.tar.gz) = 472660
+MD5 (HaXml-1.19.4.tar.gz) = c14471487f2ab6229cacd4987d9d1c4b
+SHA256 (HaXml-1.19.4.tar.gz) = 843be4312cab15908d03be0cc6a05a7a702734ef93dae8b4d2b0b2871b2688b6
+SIZE (HaXml-1.19.4.tar.gz) = 613642
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index c7d8734799ba..26e05b6d2260 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -1,46 +1,53 @@
 bin/Canonicalise
+bin/CanonicaliseLazy
 bin/DtdToHaskell
 bin/MkOneOf
 bin/Validate
 bin/Xtract
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/HaXml.pkgconf
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijerWallace.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Haskell2Xml.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xml2Haskell.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/HSHaXml-%%HAXML_VERSION%%.o
-lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%HAXML_VERSION%%.a
-share/doc/HaXml-%%HAXML_VERSION%%/COPYRIGHT
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text/XML
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/Text
-@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%
-@dirrm lib/HaXml-%%HAXML_VERSION%%
-@dirrm share/doc/HaXml-%%HAXML_VERSION%%
-@exec %D/bin/ghc-pkg register %D/lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/HaXml.pkgconf
+bin/XtractLazy
+%%SUBDIR%%/HaXml.pkgconf
+%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
+%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
+%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
+%%SUBDIR%%/Text/XML/HaXml/Html/Generate.hi
+%%SUBDIR%%/Text/XML/HaXml/Html/Parse.hi
+%%SUBDIR%%/Text/XML/HaXml/Html/ParseLazy.hi
+%%SUBDIR%%/Text/XML/HaXml/Html/Pretty.hi
+%%SUBDIR%%/Text/XML/HaXml/Xtract/Combinators.hi
+%%SUBDIR%%/Text/XML/HaXml/Xtract/Lex.hi
+%%SUBDIR%%/Text/XML/HaXml/Xtract/Parse.hi
+%%SUBDIR%%/Text/XML/HaXml/ByteStringPP.hi
+%%SUBDIR%%/Text/XML/HaXml/Combinators.hi
+%%SUBDIR%%/Text/XML/HaXml/Escape.hi
+%%SUBDIR%%/Text/XML/HaXml/Lex.hi
+%%SUBDIR%%/Text/XML/HaXml/OneOfN.hi
+%%SUBDIR%%/Text/XML/HaXml/Parse.hi
+%%SUBDIR%%/Text/XML/HaXml/ParseLazy.hi
+%%SUBDIR%%/Text/XML/HaXml/Posn.hi
+%%SUBDIR%%/Text/XML/HaXml/Pretty.hi
+%%SUBDIR%%/Text/XML/HaXml/SAX.hi
+%%SUBDIR%%/Text/XML/HaXml/ShowXmlLazy.hi
+%%SUBDIR%%/Text/XML/HaXml/TypeMapping.hi
+%%SUBDIR%%/Text/XML/HaXml/Types.hi
+%%SUBDIR%%/Text/XML/HaXml/Util.hi
+%%SUBDIR%%/Text/XML/HaXml/Validate.hi
+%%SUBDIR%%/Text/XML/HaXml/Verbatim.hi
+%%SUBDIR%%/Text/XML/HaXml/Wrappers.hi
+%%SUBDIR%%/Text/XML/HaXml/XmlContent.hi
+%%SUBDIR%%/Text/XML/HaXml.hi
+%%SUBDIR%%/HSHaXml-%%PORTVERSION%%.o
+%%SUBDIR%%/libHSHaXml-%%PORTVERSION%%.a
+@dirrm %%SUBDIR%%/Text/XML/HaXml/DtdToHaskell
+@dirrm %%SUBDIR%%/Text/XML/HaXml/Html
+@dirrm %%SUBDIR%%/Text/XML/HaXml/Xtract
+@dirrm %%SUBDIR%%/Text/XML/HaXml
+@dirrmtry %%SUBDIR%%/Text/XML
+@dirrmtry %%SUBDIR%%/Text
+@dirrm %%HAXMLDIR%%/%%GHCDIR%%
+@dirrm %%HAXMLDIR%%
+%%RMLIC%%%%DOCSDIR%%/COPYRIGHT
+%%RMLIC%%@dirrm %%DOCSDIR%%
+@exec ghc-pkg register %D/%%SUBDIR%%/HaXml.pkgconf
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister HaXml
+@unexec ghc-pkg unregister HaXml
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old