3 files changed, 126 insertions, 92 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 5e66f22cf059..121f32804263 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	haxml
 PORTVERSION=	1.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
diff --git a/textproc/hs-HaXml/files/patch-src::tools::Xtract b/textproc/hs-HaXml/files/patch-src::tools::Xtract
new file mode 100644
index 000000000000..a84ee6beb403
--- /dev/null
+++ b/textproc/hs-HaXml/files/patch-src::tools::Xtract
@@ -0,0 +1,34 @@
+Index: src/tools/Xtract.hs
+===================================================================
+RCS file: /home/cvs/root/HaXml/src/tools/Xtract.hs,v
+retrieving revision 1.3
+diff -u -r1.3 Xtract.hs
+--- src/tools/Xtract.hs	2 Oct 2002 10:24:06 -0000	1.3
++++ src/tools/Xtract.hs	27 Aug 2003 16:27:55 -0000
+@@ -11,7 +11,7 @@
+ import Text.XML.HaXml.Parse         (xmlParse)
+ import Text.XML.HaXml.Html.Parse    (htmlParse)
+ import Text.XML.HaXml.Xtract.Parse  (parseXtract)
+-import Text.PrettyPrint.HughesPJ    (render, vcat)
++import Text.PrettyPrint.HughesPJ    (render, vcat, hcat, empty)
+ import Text.XML.HaXml.Pretty        (content)
+ import Text.XML.HaXml.Html.Generate (htmlprint)
+ 
+@@ -40,7 +40,7 @@
+                    ( if isHTML x then
+                           hPutStrLn stdout . render . htmlprint .
+                           dfilter htmlSelection . getElem . htmlParse x
+-                     else hPutStrLn stdout . render . vcat . map content .
++                     else hPutStrLn stdout . render . format .
+                           dfilter xmlSelection  . getElem . xmlParse x) c)
+           files
+ 
+@@ -48,3 +48,8 @@
+ isHTML x = ".html" `isSuffixOf` x  ||  ".htm"  `isSuffixOf` x
+ 
+ dfilter f = \x-> f x x
++
++format [] = empty
++format cs@(CString _ _:_) = hcat . map content $ cs
++format cs@(CRef _:_)      = hcat . map content $ cs
++format cs                 = vcat . map content $ cs
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index 59d89f6a8913..36aff216c8d8 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -46,95 +46,95 @@ bin/Xtract
 %%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml.hi
 %%GHC%%lib/ghc-%%GHC_VERSION%%/HSHaXml.o
 %%GHC%%lib/ghc-%%GHC_VERSION%%/libHSHaXml.a
-%%PORTDOCS%%share/doc/haxml/Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.PrettyPrint.HughesPJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Convert.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Instance.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.TypeDef.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Generate.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Pretty.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Lex.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.OneOfN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Pretty.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Types.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Validate.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Verbatim.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Wrappers.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xml2Haskell.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Lex.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tA.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tB.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tC.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tD.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tE.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tF.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tG.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tH.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tI.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tK.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tL.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tM.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tO.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tP.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tQ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tR.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tS.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tT.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tU.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tV.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tW.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tX.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tY.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tZ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vA.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vB.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vC.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vD.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vE.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vF.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vG.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vH.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vI.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vK.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vL.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vM.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vO.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vP.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vQ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vR.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vS.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vT.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vU.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vV.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vW.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vX.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vY.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vZ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index.html
-%%PORTDOCS%%share/doc/haxml/HaXml/haddock.css
-%%PORTDOCS%%share/doc/haxml/HaXml/haskell_icon.gif
-%%PORTDOCS%%share/doc/haxml/HaXml/index.html
-%%PORTDOCS%%share/doc/haxml/Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/Xml2Haskell.html
-%%PORTDOCS%%share/doc/haxml/Xtract.html
-%%PORTDOCS%%share/doc/haxml/brubeck.gif
-%%PORTDOCS%%share/doc/haxml/changelog.html
-%%PORTDOCS%%share/doc/haxml/icfp99.dvi
-%%PORTDOCS%%share/doc/haxml/icfp99.html
-%%PORTDOCS%%share/doc/haxml/icfp99.ps.gz
-%%PORTDOCS%%share/doc/haxml/index.html
+%%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.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
 %%NHC98%%@dirrm include/nhc98/HaXml/Text/ParserCombinators
 %%NHC98%%@dirrm include/nhc98/HaXml/Text/PrettyPrint
 %%NHC98%%@dirrm include/nhc98/HaXml/Text/XML/HaXml/Html
@@ -150,8 +150,8 @@ bin/Xtract
 %%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML
 %%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text
 %%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml
-%%PORTDOCS%%@dirrm share/doc/haxml/HaXml
-%%PORTDOCS%%@dirrm share/doc/haxml
+%%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
 %%GHC%%@unexec %D/bin/ghc-pkg -r HaXml