Upgrade to 1.12

3 files changed, 85 insertions, 5 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 44d7dae8cc34..6e7fb603588f 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haxml
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	1.12
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/ \
@@ -36,7 +35,6 @@ WITH_HUGS=	yes
 .endif
 
 .if defined(PACKAGE_BUILDING)
-WITH_NHC98=	yes
 WITH_GHC=	yes
 WITH_HUGS=	yes
 .endif
@@ -104,6 +102,7 @@ post-install:
 .endif
 .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 9a0dce179415..b0fbc0847f1a 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-MD5 (HaXml-1.11.tar.gz) = 66a3cca7ebb62a50f5f799f3bf633d28
-SIZE (HaXml-1.11.tar.gz) = 368183
+MD5 (HaXml-1.12.tar.gz) = b614a4a6bf8aec3938ae1b006ed30a13
+SIZE (HaXml-1.12.tar.gz) = 433384
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index ec4516aeb6c2..82f4f30f0102 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -72,6 +72,86 @@ bin/Xtract
 %%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Xtract/Parse.hs
 %%HUGS%%lib/hugs/libraries/Text/XML/HaXml.hs
 %%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
@@ -101,6 +181,7 @@ bin/Xtract
 %%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml/Xtract
 %%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml
 %%HUGS%%@dirrm lib/hugs/libraries/Text/XML
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/HaXml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%GHC%%@exec %D/bin/ghc-pkg -a < %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
 %%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old