1 files changed, 46 insertions, 39 deletions
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