From badfe980f5c186dd299630fc2106e0dc3ee2f7e1 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 20 Dec 2003 19:51:26 +0000
Subject: [PATCH] overhaul the plists of all p5-XML-* ports and their
 dependencies

---
 textproc/p5-LibXML-Common/pkg/PLIST        | 10 +++-
 textproc/p5-Libxml/pkg/PLIST               | 45 +++++++++-------
 textproc/p5-XML-DOM/pkg/PLIST              |  4 +-
 textproc/p5-XML-LibXSLT/pkg/PLIST          |  3 +-
 textproc/p5-XML-NamespaceSupport/pkg/PLIST |  9 +++-
 textproc/p5-XML-Parser/pkg/PLIST           | 62 ++++++++++++----------
 textproc/p5-XML-RSS/pkg/PLIST              |  6 +--
 textproc/p5-XML-RegExp/pkg/PLIST           | 11 +++-
 textproc/p5-XML-SAX/pkg/PLIST              |  7 ++-
 textproc/p5-XML-Sablotron/pkg/PLIST        |  8 ++-
 textproc/p5-XML-Simple/pkg/PLIST           |  4 +-
 textproc/p5-XML-Writer/pkg/PLIST           | 11 +++-
 textproc/p5-XML-XPath/pkg/PLIST            |  5 +-
 textproc/p5-XML-XSLT/pkg/PLIST             |  6 ++-
 www/p5-HTML-Parser/pkg/PLIST               |  7 ++-
 www/p5-HTML-Tagset/pkg/PLIST               | 11 +++-
 www/p5-HTTP-GHTTP/pkg/PLIST                |  8 ++-
 www/p5-URI/pkg/PLIST                       | 10 +++-
 www/p5-libwww/pkg/PLIST                    |  7 +--
 19 files changed, 159 insertions(+), 75 deletions(-)

diff --git a/textproc/p5-LibXML-Common/pkg/PLIST b/textproc/p5-LibXML-Common/pkg/PLIST
index 7c2b59d87e9..13abdcae66f 100644
--- a/textproc/p5-LibXML-Common/pkg/PLIST
+++ b/textproc/p5-LibXML-Common/pkg/PLIST
@@ -1,6 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/11/14 20:14:41 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:26 naddy Exp $
 ${P5ARCH}/XML/LibXML/Common.pm
+@comment ${P5ARCH}/auto/XML/LibXML/Common/.packlist
 ${P5ARCH}/auto/XML/LibXML/Common/Common.bs
 ${P5ARCH}/auto/XML/LibXML/Common/Common.so
 man/man3p/XML::LibXML::Common.3p
+@dirrm man/man3p
+@dirrm ${P5ARCH}/auto/XML/LibXML/Common
+@dirrm ${P5ARCH}/auto/XML/LibXML
+@dirrm ${P5ARCH}/auto/XML
+@dirrm ${P5ARCH}/auto
 @dirrm ${P5ARCH}/XML/LibXML
+@dirrm ${P5ARCH}/XML
+@dirrm ${P5ARCH}
diff --git a/textproc/p5-Libxml/pkg/PLIST b/textproc/p5-Libxml/pkg/PLIST
index 6a7040c592b..87a8b4f04f5 100644
--- a/textproc/p5-Libxml/pkg/PLIST
+++ b/textproc/p5-Libxml/pkg/PLIST
@@ -1,20 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/16 19:25:06 espie Exp $
-libdata/perl5/site_perl/Data/Grove.pm
-libdata/perl5/site_perl/Data/Grove/Parent.pm
-libdata/perl5/site_perl/Data/Grove/Visitor.pm
-libdata/perl5/site_perl/XML/ESISParser.pm
-libdata/perl5/site_perl/XML/Handler/CanonXMLWriter.pm
-libdata/perl5/site_perl/XML/Handler/Sample.pm
-libdata/perl5/site_perl/XML/Handler/Subs.pm
-libdata/perl5/site_perl/XML/Handler/XMLWriter.pm
-libdata/perl5/site_perl/XML/Parser/PerlSAX.pm
-libdata/perl5/site_perl/XML/PatAct/ActionTempl.pm
-libdata/perl5/site_perl/XML/PatAct/Amsterdam.pm
-libdata/perl5/site_perl/XML/PatAct/MatchName.pm
-libdata/perl5/site_perl/XML/PatAct/PatternTempl.pm
-libdata/perl5/site_perl/XML/PatAct/ToObjects.pm
-libdata/perl5/site_perl/XML/Perl2SAX.pm
-libdata/perl5/site_perl/XML/SAX2Perl.pm
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:26 naddy Exp $
+${P5SITE}/Data/Grove.pm
+${P5SITE}/Data/Grove/Parent.pm
+${P5SITE}/Data/Grove/Visitor.pm
+${P5SITE}/XML/ESISParser.pm
+${P5SITE}/XML/Handler/CanonXMLWriter.pm
+${P5SITE}/XML/Handler/Sample.pm
+${P5SITE}/XML/Handler/Subs.pm
+${P5SITE}/XML/Handler/XMLWriter.pm
+${P5SITE}/XML/Parser/PerlSAX.pm
+${P5SITE}/XML/PatAct/ActionTempl.pm
+${P5SITE}/XML/PatAct/Amsterdam.pm
+${P5SITE}/XML/PatAct/MatchName.pm
+${P5SITE}/XML/PatAct/PatternTempl.pm
+${P5SITE}/XML/PatAct/ToObjects.pm
+${P5SITE}/XML/Perl2SAX.pm
+${P5SITE}/XML/SAX2Perl.pm
+@comment ${P5ARCH}/auto/libxml-perl/.packlist
 man/man3p/Data::Grove.3p
 man/man3p/Data::Grove::Parent.3p
 man/man3p/Data::Grove::Visitor.3p
@@ -31,6 +32,10 @@ man/man3p/XML::PatAct::PatternTempl.3p
 man/man3p/XML::PatAct::ToObjects.3p
 man/man3p/XML::Perl2SAX.3p
 man/man3p/XML::SAX2Perl.3p
-@dirrm libdata/perl5/site_perl/XML/PatAct
-@dirrm libdata/perl5/site_perl/XML/Handler
-@dirrm libdata/perl5/site_perl/Data/Grove
+@comment @dirrm ${P5ARCH}/auto/libxml-perl
+@dirrm ${P5SITE}/XML/PatAct
+@dirrm ${P5SITE}/XML/Parser
+@dirrm ${P5SITE}/XML/Handler
+@dirrm ${P5SITE}/XML
+@dirrm ${P5SITE}/Data/Grove
+@dirrm ${P5SITE}/Data
diff --git a/textproc/p5-XML-DOM/pkg/PLIST b/textproc/p5-XML-DOM/pkg/PLIST
index 39050dff04f..595a51add8e 100644
--- a/textproc/p5-XML-DOM/pkg/PLIST
+++ b/textproc/p5-XML-DOM/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/07/15 08:36:57 shell Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/12/20 19:51:26 naddy Exp $
 ${P5SITE}/XML/DOM.pm
 ${P5SITE}/XML/DOM/AttDef.pod
 ${P5SITE}/XML/DOM/AttlistDecl.pod
@@ -27,6 +27,7 @@ ${P5SITE}/XML/DOM/ProcessingInstruction.pod
 ${P5SITE}/XML/DOM/Text.pod
 ${P5SITE}/XML/DOM/XMLDecl.pod
 ${P5SITE}/XML/Handler/BuildDOM.pm
+@comment ${P5ARCH}/auto/XML-DOM/.packlist
 man/man3p/XML::DOM.3p
 man/man3p/XML::DOM::AttDef.3p
 man/man3p/XML::DOM::AttlistDecl.3p
@@ -52,4 +53,5 @@ man/man3p/XML::DOM::ProcessingInstruction.3p
 man/man3p/XML::DOM::Text.3p
 man/man3p/XML::DOM::XMLDecl.3p
 man/man3p/XML::Handler::BuildDOM.3p
+@comment @dirrm ${P5ARCH}/auto/XML-DOM
 @dirrm ${P5SITE}/XML/DOM
diff --git a/textproc/p5-XML-LibXSLT/pkg/PLIST b/textproc/p5-XML-LibXSLT/pkg/PLIST
index efc2e971bc3..5c1b77810a3 100644
--- a/textproc/p5-XML-LibXSLT/pkg/PLIST
+++ b/textproc/p5-XML-LibXSLT/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2002/05/27 05:11:52 shell Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/12/20 19:51:27 naddy Exp $
 ${P5ARCH}/XML/LibXSLT.pm
 ${P5ARCH}/XML/benchmark.pl
+@comment ${P5ARCH}/auto/XML/LibXSLT/.packlist
 ${P5ARCH}/auto/XML/LibXSLT/LibXSLT.bs
 ${P5ARCH}/auto/XML/LibXSLT/LibXSLT.so
 man/man3p/XML::LibXSLT.3p
diff --git a/textproc/p5-XML-NamespaceSupport/pkg/PLIST b/textproc/p5-XML-NamespaceSupport/pkg/PLIST
index 5997fac8cf4..28f60b7ee2b 100644
--- a/textproc/p5-XML-NamespaceSupport/pkg/PLIST
+++ b/textproc/p5-XML-NamespaceSupport/pkg/PLIST
@@ -1,3 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/06/04 00:42:47 shell Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:27 naddy Exp $
 ${P5SITE}/XML/NamespaceSupport.pm
+@comment ${P5ARCH}/auto/XML/NamespaceSupport/.packlist
 man/man3p/XML::NamespaceSupport.3p
+@dirrm man/man3p
+@comment @dirrm ${P5ARCH}/auto/XML/NamespaceSupport
+@comment @dirrm ${P5ARCH}/auto/XML
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
+@dirrm ${P5SITE}/XML
diff --git a/textproc/p5-XML-Parser/pkg/PLIST b/textproc/p5-XML-Parser/pkg/PLIST
index 6646dc191f4..0e38c58ed18 100644
--- a/textproc/p5-XML-Parser/pkg/PLIST
+++ b/textproc/p5-XML-Parser/pkg/PLIST
@@ -1,30 +1,36 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/16 19:25:06 espie Exp $
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/Japanese_Encodings.msg
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/README
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/big5.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/euc-kr.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-2.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-3.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-4.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-5.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-7.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-8.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/iso-8859-9.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/windows-1250.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-euc-jp-unicode.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-sjis-cp932.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-sjis-jdk117.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-sjis-jisx0221.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings/x-sjis-unicode.enc
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Expat.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/LWPExternEnt.pl
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/XML/Parser/Expat/Expat.bs
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/XML/Parser/Expat/Expat.so
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:27 naddy Exp $
+${P5ARCH}/XML/Parser.pm
+${P5ARCH}/XML/Parser/Encodings/Japanese_Encodings.msg
+${P5ARCH}/XML/Parser/Encodings/README
+${P5ARCH}/XML/Parser/Encodings/big5.enc
+${P5ARCH}/XML/Parser/Encodings/euc-kr.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-2.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-3.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-4.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-5.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-7.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-8.enc
+${P5ARCH}/XML/Parser/Encodings/iso-8859-9.enc
+${P5ARCH}/XML/Parser/Encodings/windows-1250.enc
+${P5ARCH}/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+${P5ARCH}/XML/Parser/Encodings/x-euc-jp-unicode.enc
+${P5ARCH}/XML/Parser/Encodings/x-sjis-cp932.enc
+${P5ARCH}/XML/Parser/Encodings/x-sjis-jdk117.enc
+${P5ARCH}/XML/Parser/Encodings/x-sjis-jisx0221.enc
+${P5ARCH}/XML/Parser/Encodings/x-sjis-unicode.enc
+${P5ARCH}/XML/Parser/Expat.pm
+${P5ARCH}/XML/Parser/LWPExternEnt.pl
+@comment ${P5ARCH}/auto/XML/Parser/.packlist
+${P5ARCH}/auto/XML/Parser/Expat/Expat.bs
+${P5ARCH}/auto/XML/Parser/Expat/Expat.so
 man/man3p/XML::Parser.3p
 man/man3p/XML::Parser::Expat.3p
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/XML/Parser/Expat
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/XML/Parser
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser/Encodings
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/XML/Parser
+@dirrm man/man3p
+@dirrm ${P5ARCH}/auto/XML/Parser/Expat
+@dirrm ${P5ARCH}/auto/XML/Parser
+@dirrm ${P5ARCH}/auto/XML
+@dirrm ${P5ARCH}/auto
+@dirrm ${P5ARCH}/XML/Parser/Encodings
+@dirrm ${P5ARCH}/XML/Parser
+@dirrm ${P5ARCH}/XML
+@dirrm ${P5ARCH}
diff --git a/textproc/p5-XML-RSS/pkg/PLIST b/textproc/p5-XML-RSS/pkg/PLIST
index 9d08ae01a2a..c8a3a887050 100644
--- a/textproc/p5-XML-RSS/pkg/PLIST
+++ b/textproc/p5-XML-RSS/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2003/12/14 21:25:10 jose Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/12/20 19:51:27 naddy Exp $
 ${P5SITE}/XML/RSS.pm
 @comment ${P5ARCH}/auto/XML/RSS/.packlist
 man/man3p/XML::RSS.3
@@ -27,9 +27,5 @@ share/examples/p5-XML-RSS/update_rss.pl
 @dirrm share/examples/p5-XML-RSS/0.91
 @dirrm share/examples/p5-XML-RSS/0.9
 @dirrm share/examples/p5-XML-RSS
-@dirrm man/man3p
 @comment @dirrm ${P5ARCH}/auto/XML/RSS
-@comment @dirrm ${P5ARCH}/auto/XML
-@comment @dirrm ${P5ARCH}/auto
-@comment @dirrm ${P5ARCH}
 @dirrm ${P5SITE}/XML
diff --git a/textproc/p5-XML-RegExp/pkg/PLIST b/textproc/p5-XML-RegExp/pkg/PLIST
index d6b9d2bed74..4f4177b2c96 100644
--- a/textproc/p5-XML-RegExp/pkg/PLIST
+++ b/textproc/p5-XML-RegExp/pkg/PLIST
@@ -1,3 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/16 19:25:06 espie Exp $
-libdata/perl5/site_perl/XML/RegExp.pm
+@comment $OpenBSD: PLIST,v 1.3 2003/12/20 19:51:27 naddy Exp $
+${P5SITE}/XML/RegExp.pm
+@comment ${P5ARCH}/auto/XML/RegExp/.packlist
 man/man3p/XML::RegExp.3p
+@dirrm man/man3p
+@comment @dirrm ${P5ARCH}/auto/XML/RegExp
+@comment @dirrm ${P5ARCH}/auto/XML
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
+@dirrm ${P5SITE}/XML
diff --git a/textproc/p5-XML-SAX/pkg/PLIST b/textproc/p5-XML-SAX/pkg/PLIST
index 146a2f6f0a6..4178d9df50b 100644
--- a/textproc/p5-XML-SAX/pkg/PLIST
+++ b/textproc/p5-XML-SAX/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/09/16 07:13:07 shell Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/12/20 19:51:27 naddy Exp $
 ${P5SITE}/XML/SAX.pm
 ${P5SITE}/XML/SAX/Base.pm
 ${P5SITE}/XML/SAX/DocumentLocator.pm
@@ -23,6 +23,7 @@ ${P5SITE}/XML/SAX/PurePerl/Reader/UnicodeExt.pm
 ${P5SITE}/XML/SAX/PurePerl/UnicodeExt.pm
 ${P5SITE}/XML/SAX/PurePerl/XMLDecl.pm
 ${P5SITE}/XML/SAX/placeholder.pl
+@comment ${P5ARCH}/auto/XML/SAX/.packlist
 man/man3p/XML::SAX.3p
 man/man3p/XML::SAX::Base.3p
 man/man3p/XML::SAX::DocumentLocator.3p
@@ -31,6 +32,10 @@ man/man3p/XML::SAX::Intro.3p
 man/man3p/XML::SAX::ParserFactory.3p
 man/man3p/XML::SAX::PurePerl.3p
 man/man3p/XML::SAX::PurePerl::Reader.3p
+@comment @dirrm ${P5ARCH}/auto/XML/SAX
+@comment @dirrm ${P5ARCH}/auto/XML
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
 @dirrm ${P5SITE}/XML/SAX/PurePerl/Reader
 @dirrm ${P5SITE}/XML/SAX/PurePerl
 @dirrm ${P5SITE}/XML/SAX
diff --git a/textproc/p5-XML-Sablotron/pkg/PLIST b/textproc/p5-XML-Sablotron/pkg/PLIST
index bbe81c05759..86112d7c7bf 100644
--- a/textproc/p5-XML-Sablotron/pkg/PLIST
+++ b/textproc/p5-XML-Sablotron/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2003/06/29 23:15:23 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.7 2003/12/20 19:51:27 naddy Exp $
 ${P5ARCH}/XML/Sablotron.pm
 ${P5ARCH}/XML/Sablotron/DOM.pm
 ${P5ARCH}/XML/Sablotron/DOM/DOMHandler.pm
@@ -7,6 +7,7 @@ ${P5ARCH}/XML/Sablotron/SAXBuilder.pm
 ${P5ARCH}/XML/Sablotron/SXP.pm
 ${P5ARCH}/XML/Sablotron/Situation.pm
 ${P5ARCH}/XML/Sablotron/Situation/DOMHandlerDispatcher.pm
+@comment ${P5ARCH}/auto/XML/Sablotron/.packlist
 ${P5ARCH}/auto/XML/Sablotron/Sablotron.bs
 ${P5ARCH}/auto/XML/Sablotron/Sablotron.so
 man/man3p/XML::Sablotron.3p
@@ -14,7 +15,12 @@ man/man3p/XML::Sablotron::DOM.3p
 man/man3p/XML::Sablotron::DOM::DOMHandler.3p
 man/man3p/XML::Sablotron::SAXBuilder.3p
 man/man3p/XML::Sablotron::Situation::DOMHandlerDispatcher.3p
+@dirrm man/man3p
 @dirrm ${P5ARCH}/auto/XML/Sablotron
+@dirrm ${P5ARCH}/auto/XML
+@dirrm ${P5ARCH}/auto
 @dirrm ${P5ARCH}/XML/Sablotron/Situation
 @dirrm ${P5ARCH}/XML/Sablotron/DOM
 @dirrm ${P5ARCH}/XML/Sablotron
+@dirrm ${P5ARCH}/XML
+@dirrm ${P5ARCH}
diff --git a/textproc/p5-XML-Simple/pkg/PLIST b/textproc/p5-XML-Simple/pkg/PLIST
index 77b89067c78..1a4408368c2 100644
--- a/textproc/p5-XML-Simple/pkg/PLIST
+++ b/textproc/p5-XML-Simple/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/07/04 06:06:57 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:27 naddy Exp $
 ${P5SITE}/XML/Simple.pm
 ${P5SITE}/XML/Simple/FAQ.pod
+@comment ${P5ARCH}/auto/XML/Simple/.packlist
 man/man3p/XML::Simple.3p
 man/man3p/XML::Simple::FAQ.3p
+@comment @dirrm ${P5ARCH}/auto/XML/Simple
 @dirrm ${P5SITE}/XML/Simple
diff --git a/textproc/p5-XML-Writer/pkg/PLIST b/textproc/p5-XML-Writer/pkg/PLIST
index 10aaca8617e..7dc08606501 100644
--- a/textproc/p5-XML-Writer/pkg/PLIST
+++ b/textproc/p5-XML-Writer/pkg/PLIST
@@ -1,3 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.4 2002/04/16 19:25:06 espie Exp $
-libdata/perl5/site_perl/XML/Writer.pm
+@comment $OpenBSD: PLIST,v 1.5 2003/12/20 19:51:27 naddy Exp $
+${P5SITE}/XML/Writer.pm
+@comment ${P5ARCH}/auto/XML/Writer/.packlist
 man/man3p/XML::Writer.3p
+@dirrm man/man3p
+@comment @dirrm ${P5ARCH}/auto/XML/Writer
+@comment @dirrm ${P5ARCH}/auto/XML
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
+@dirrm ${P5SITE}/XML
diff --git a/textproc/p5-XML-XPath/pkg/PLIST b/textproc/p5-XML-XPath/pkg/PLIST
index 5a711ccc2b9..00ec141f339 100644
--- a/textproc/p5-XML-XPath/pkg/PLIST
+++ b/textproc/p5-XML-XPath/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/07/11 17:37:33 shell Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:27 naddy Exp $
 bin/xpath
 ${P5SITE}/XML/XPath.pm
 ${P5SITE}/XML/XPath/Boolean.pm
@@ -22,6 +22,7 @@ ${P5SITE}/XML/XPath/Root.pm
 ${P5SITE}/XML/XPath/Step.pm
 ${P5SITE}/XML/XPath/Variable.pm
 ${P5SITE}/XML/XPath/XMLParser.pm
+@comment ${P5ARCH}/auto/XML/XPath/.packlist
 man/man3p/XML::XPath.3p
 man/man3p/XML::XPath::Boolean.3p
 man/man3p/XML::XPath::Builder.3p
@@ -40,5 +41,7 @@ man/man3p/XML::XPath::XMLParser.3p
 share/examples/p5-XML-XPath/test.xml
 share/examples/p5-XML-XPath/xpath
 @dirrm share/examples/p5-XML-XPath
+@comment @dirrm ${P5ARCH}/auto/XML/XPath
 @dirrm ${P5SITE}/XML/XPath/Node
 @dirrm ${P5SITE}/XML/XPath
+@dirrm ${P5SITE}/XML
diff --git a/textproc/p5-XML-XSLT/pkg/PLIST b/textproc/p5-XML-XSLT/pkg/PLIST
index 9b466c086fd..69778e6e7f6 100644
--- a/textproc/p5-XML-XSLT/pkg/PLIST
+++ b/textproc/p5-XML-XSLT/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/16 19:25:06 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2003/12/20 19:51:27 naddy Exp $
 bin/xslt-parser
-libdata/perl5/site_perl/XML/XSLT.pm
+${P5SITE}/XML/XSLT.pm
+@comment ${P5ARCH}/auto/XML/XSLT/.packlist
 man/man1/xslt-parser.1
 man/man3p/XML::XSLT.3p
+@comment @dirrm ${P5ARCH}/auto/XML/XSLT
diff --git a/www/p5-HTML-Parser/pkg/PLIST b/www/p5-HTML-Parser/pkg/PLIST
index e1af267dac5..5d634a507e9 100644
--- a/www/p5-HTML-Parser/pkg/PLIST
+++ b/www/p5-HTML-Parser/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2002/05/16 04:03:31 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.7 2003/12/20 19:51:26 naddy Exp $
 ${P5ARCH}/HTML/Entities.pm
 ${P5ARCH}/HTML/Filter.pm
 ${P5ARCH}/HTML/HeadParser.pm
@@ -6,6 +6,7 @@ ${P5ARCH}/HTML/LinkExtor.pm
 ${P5ARCH}/HTML/Parser.pm
 ${P5ARCH}/HTML/PullParser.pm
 ${P5ARCH}/HTML/TokeParser.pm
+@comment ${P5ARCH}/auto/HTML/Parser/.packlist
 ${P5ARCH}/auto/HTML/Parser/Parser.bs
 ${P5ARCH}/auto/HTML/Parser/Parser.so
 man/man3p/HTML::Entities.3p
@@ -16,3 +17,7 @@ man/man3p/HTML::Parser.3p
 man/man3p/HTML::PullParser.3p
 man/man3p/HTML::TokeParser.3p
 @dirrm ${P5ARCH}/auto/HTML/Parser
+@dirrm ${P5ARCH}/auto/HTML
+@dirrm ${P5ARCH}/auto
+@dirrm ${P5ARCH}/HTML
+@dirrm ${P5ARCH}
diff --git a/www/p5-HTML-Tagset/pkg/PLIST b/www/p5-HTML-Tagset/pkg/PLIST
index d2e8e27df9a..9e96f4c4b34 100644
--- a/www/p5-HTML-Tagset/pkg/PLIST
+++ b/www/p5-HTML-Tagset/pkg/PLIST
@@ -1,3 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/16 19:25:07 espie Exp $
-libdata/perl5/site_perl/HTML/Tagset.pm
+@comment $OpenBSD: PLIST,v 1.4 2003/12/20 19:51:26 naddy Exp $
+${P5SITE}/HTML/Tagset.pm
+@comment ${P5ARCH}/auto/HTML/Tagset/.packlist
 man/man3p/HTML::Tagset.3p
+@dirrm man/man3p
+@comment @dirrm ${P5ARCH}/auto/HTML/Tagset
+@comment @dirrm ${P5ARCH}/auto/HTML
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
+@dirrm ${P5SITE}/HTML
diff --git a/www/p5-HTTP-GHTTP/pkg/PLIST b/www/p5-HTTP-GHTTP/pkg/PLIST
index afb5501def7..471a16a542e 100644
--- a/www/p5-HTTP-GHTTP/pkg/PLIST
+++ b/www/p5-HTTP-GHTTP/pkg/PLIST
@@ -1,7 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.4 2002/05/16 04:30:30 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/12/20 19:51:26 naddy Exp $
 bin/g-request
 ${P5ARCH}/HTTP/GHTTP.pm
+@comment ${P5ARCH}/auto/HTTP/GHTTP/.packlist
 ${P5ARCH}/auto/HTTP/GHTTP/GHTTP.bs
 ${P5ARCH}/auto/HTTP/GHTTP/GHTTP.so
 man/man3p/HTTP::GHTTP.3p
+@dirrm man/man3p
 @dirrm ${P5ARCH}/auto/HTTP/GHTTP
+@dirrm ${P5ARCH}/auto/HTTP
+@dirrm ${P5ARCH}/auto
+@dirrm ${P5ARCH}/HTTP
+@dirrm ${P5ARCH}
diff --git a/www/p5-URI/pkg/PLIST b/www/p5-URI/pkg/PLIST
index 3a26940df24..36a42124cf4 100644
--- a/www/p5-URI/pkg/PLIST
+++ b/www/p5-URI/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/11/30 22:09:50 margarida Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/12/20 19:51:26 naddy Exp $
 ${P5SITE}/URI.pm
 ${P5SITE}/URI/Escape.pm
+@comment ${P5SITE}/URI/Escape.pm.orig
 ${P5SITE}/URI/Heuristic.pm
 ${P5SITE}/URI/QueryParam.pm
+@comment ${P5SITE}/URI/QueryParam.pm.orig
 ${P5SITE}/URI/URL.pm
 ${P5SITE}/URI/WithBase.pm
 ${P5SITE}/URI/_foreign.pm
@@ -42,6 +44,7 @@ ${P5SITE}/URI/telnet.pm
 ${P5SITE}/URI/urn.pm
 ${P5SITE}/URI/urn/isbn.pm
 ${P5SITE}/URI/urn/oid.pm
+@comment ${P5ARCH}/auto/URI/.packlist
 man/man3p/URI.3p
 man/man3p/URI::Escape.3p
 man/man3p/URI::Heuristic.3p
@@ -51,5 +54,10 @@ man/man3p/URI::WithBase.3p
 man/man3p/URI::data.3p
 man/man3p/URI::file.3p
 man/man3p/URI::ldap.3p
+@dirrm man/man3p
+@comment @dirrm ${P5ARCH}/auto/URI
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
 @dirrm ${P5SITE}/URI/urn
 @dirrm ${P5SITE}/URI/file
+@dirrm ${P5SITE}/URI
diff --git a/www/p5-libwww/pkg/PLIST b/www/p5-libwww/pkg/PLIST
index 118e6b81caa..f2e2ac36058 100644
--- a/www/p5-libwww/pkg/PLIST
+++ b/www/p5-libwww/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2003/11/23 11:35:23 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.13 2003/12/20 19:51:26 naddy Exp $
 bin/GET
 bin/HEAD
 bin/POST
@@ -56,10 +56,9 @@ ${P5SITE}/Net/HTTP/NB.pm
 ${P5SITE}/Net/HTTPS.pm
 ${P5SITE}/WWW/RobotRules.pm
 ${P5SITE}/WWW/RobotRules/AnyDBM_File.pm
+@comment ${P5ARCH}/auto/libwww-perl/.packlist
 ${P5SITE}/lwpcook.pod
 ${P5SITE}/lwptut.pod
-@comment ${P5ARCH}/auto/libwww-perl/.packlist
-@comment ${P5ARCH}/perllocal.pod
 man/man1/GET.1
 man/man1/HEAD.1
 man/man1/POST.1
@@ -103,6 +102,8 @@ man/man3p/lwptut.3p
 @comment @dirrm ${P5ARCH}/auto/libwww-perl
 @dirrm ${P5SITE}/WWW/RobotRules
 @dirrm ${P5SITE}/WWW
+@dirrm ${P5SITE}/Net/HTTP
+@dirrm ${P5SITE}/Net
 @dirrm ${P5SITE}/LWP/Protocol
 @dirrm ${P5SITE}/LWP/Authen
 @dirrm ${P5SITE}/LWP