4 files changed, 55 insertions, 163 deletions

diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index 9c0377c1ac8f..8c9c56073d01 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haxml
-PORTVERSION=	1.13
-PORTREVISION=	2
+PORTVERSION=	1.13.2
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
@@ -19,28 +18,28 @@ COMMENT=	A collection of utilities for using Haskell and XML together
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX}/bin
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}"
+PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}" \
+		HAXML_VERSION=${PORTVERSION}
+PORTDOCS=	*
+
+do-configure:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs configure ${CONFIGURE_ARGS}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
+do-build:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs build
 
-post-configure:
-	@${REINPLACE_CMD} -e '/hugs/d' ${WRKSRC}/obj/compilers
-	@${REINPLACE_CMD} -e '/nhc98/d' ${WRKSRC}/obj/compilers
+do-install:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs install
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/obj/ghc/HaXml.pkgconf \
-		${PREFIX}/lib/ghc-${GHC_VERSION}/imports/HaXml/
-	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+	@${INSTALL_DATA} ${WRKSRC}/.installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf
+	@${RM} -f ${LOCALBASE}/lib/ghc-${GHC_VERSION}/package.conf.old
+	@${TOUCH} ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/include/.keep_me
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} && ${RM} -rf docs/HaXml/CVS)
 	@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
 .endif
 
diff --git a/textproc/hs-haxml/distinfo b/textproc/hs-haxml/distinfo
index 6af38c0887bc..086943cd0b5d 100644
--- a/textproc/hs-haxml/distinfo
+++ b/textproc/hs-haxml/distinfo
@@ -1,3 +1,3 @@
-MD5 (HaXml-1.13.tar.gz) = 9801b55ea599ed426d8034b156afa304
-SHA256 (HaXml-1.13.tar.gz) = 28af11504085e7a03a66f9e29feb2c141b19d9a067d74d5b41b509938a255f57
-SIZE (HaXml-1.13.tar.gz) = 435809
+MD5 (HaXml-1.13.2.tar.gz) = 528bb3dfedf75b722e9b234c5ad6a316
+SHA256 (HaXml-1.13.2.tar.gz) = a4473977f76a3c2514c1456fb2d4eceb4b73a64104d9a0635f10b33c98a58aa1
+SIZE (HaXml-1.13.2.tar.gz) = 472348
diff --git a/textproc/hs-haxml/files/patch-1.13-percent b/textproc/hs-haxml/files/patch-1.13-percent
deleted file mode 100644
index 75858eaa11e9..000000000000
--- a/textproc/hs-haxml/files/patch-1.13-percent
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Text/XML/HaXml/Lex.hs.orig	2005-04-19 13:22:15.000000000 +0100
-+++ src/Text/XML/HaXml/Lex.hs	2006-02-21 15:46:57.000000000 +0000
-@@ -194,12 +194,12 @@
-     | close `prefixes` (s:ss)  = emit (TokFreeText (reverse acc)) pos:
-                                  emit tok p:
-                                  skip (length close-1) (addcol 1 p) ss k
--    | s=='&'||s=='%' = (if not (null acc)
--                           then (emit (TokFreeText (reverse acc)) pos:)
--                           else id)
--                       (emit (if s=='&' then TokAmp else TokPercent) p:
--                        textUntil ";" TokSemi "" p (addcol 1 p) ss
--                         (\p' i-> textOrRefUntil close tok "" p p' i k))
-+    | s=='&'     = (if not (null acc)
-+                       then (emit (TokFreeText (reverse acc)) pos:)
-+                       else id)
-+                   (emit TokAmp p:
-+                    textUntil ";" TokSemi "" p (addcol 1 p) ss
-+                        (\p' i-> textOrRefUntil close tok "" p p' i k))
-     | isSpace s  = textOrRefUntil close tok (s:acc) pos (white s p) ss k
-     | otherwise  = textOrRefUntil close tok (s:acc) pos (addcol 1 p) ss k
- 
diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist
index 7825bdfbf516..6c95515a2c4e 100644
--- a/textproc/hs-haxml/pkg-plist
+++ b/textproc/hs-haxml/pkg-plist
@@ -3,129 +3,43 @@ bin/DtdToHaskell
 bin/MkOneOf
 bin/Validate
 bin/Xtract
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Combinators.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Escape.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Haskell2Xml.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Generate.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Parse.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Pretty.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Lex.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/OneOfN.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Parse.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Verbatim.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Lex.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Parse.hi
-lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml.hi
-lib/ghc-%%GHC_VERSION%%/HSHaXml.o
-lib/ghc-%%GHC_VERSION%%/libHSHaXml.a
-%%PORTDOCS%%%%DOCSDIR%%/Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.PrettyPrint.HughesPJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.Convert.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.Instance.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.TypeDef.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Escape.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Haskell2Xml.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Generate.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Pretty.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Lex.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.OneOfN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Pretty.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Types.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Validate.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Verbatim.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Wrappers.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xml2Haskell.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Lex.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tA.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tB.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tC.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tD.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tE.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tF.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tG.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tH.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tI.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tK.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tL.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tM.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tO.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tP.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tQ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tR.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tS.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tT.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tU.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tV.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tW.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tX.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tY.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tZ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vA.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vB.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vC.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vD.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vE.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vF.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vG.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vH.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vI.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vK.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vL.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vM.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vO.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vP.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vQ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vR.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vS.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vT.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vU.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vV.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vW.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vX.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vY.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vZ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Haskell2Xml.html
-%%PORTDOCS%%%%DOCSDIR%%/Xml2Haskell.html
-%%PORTDOCS%%%%DOCSDIR%%/Xtract.html
-%%PORTDOCS%%%%DOCSDIR%%/brubeck.gif
-%%PORTDOCS%%%%DOCSDIR%%/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/icfp99.dvi
-%%PORTDOCS%%%%DOCSDIR%%/icfp99.html
-%%PORTDOCS%%%%DOCSDIR%%/icfp99.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/HaXml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %D/bin/ghc-pkg register %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
+lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/HaXml.pkgconf
+lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/include/.keep_me
+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
+@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%%/include
+@dirrm lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%
+@exec %D/bin/ghc-pkg register %D/lib/HaXml-%%HAXML_VERSION%%/ghc-%%GHC_VERSION%%/HaXml.pkgconf
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister HaXml
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old