Turn PERL5_PACKLIST into a relative path instead of an absolute path.

These paths are now relative to PERL5_PACKLIST_DIR, which currently
defaults to ${PERL5_SITEARCH}.  There is no change to the binary
packages.

80 files changed, 160 insertions, 160 deletions

diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index 9df4e4be9a4..80ef7ecd615 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/24 05:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/13 18:01:40 jlam Exp $
 
 DISTNAME=	eperl-2.2.14
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.engelschall.com/sw/eperl/
 COMMENT=	Interpreter/preprocessor for Perl embedded in text documents
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
+PERL5_PACKLIST=	auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=		YES
 PERL5_REQD+=		5.8.0
diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile
index 3a5b4d4e895..bf7f5c5b83d 100644
--- a/textproc/p5-Convert-ASCII-Armour/Makefile
+++ b/textproc/p5-Convert-ASCII-Armour/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:40 jlam Exp $
 #
 
 DISTNAME=		Convert-ASCII-Armour-1.4
@@ -19,7 +19,7 @@ DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/ASCII/Armour/.packlist
+PERL5_PACKLIST=		auto/Convert/ASCII/Armour/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile
index 7ac138e1d12..92f7227accd 100644
--- a/textproc/p5-Convert-ASN1/Makefile
+++ b/textproc/p5-Convert-ASN1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/13 18:01:40 jlam Exp $
 #
 
 DISTNAME=		Convert-ASN1-0.18
@@ -15,7 +15,7 @@ COMMENT=		Perl5 module to encode/decode ASN.1 data
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/ASN1/.packlist
+PERL5_PACKLIST=		auto/Convert/ASN1/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index fd859f1e2fb..f5a99dce40e 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/13 18:01:40 jlam Exp $
 #
 
 DISTNAME=	Convert-BER-1.31
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl class to encode/decode objects using Basic Encoding Rules
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/BER/.packlist
+PERL5_PACKLIST=		auto/Convert/BER/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-PEM/Makefile b/textproc/p5-Convert-PEM/Makefile
index 06a02b0187e..068b23a0aff 100644
--- a/textproc/p5-Convert-PEM/Makefile
+++ b/textproc/p5-Convert-PEM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:40 jlam Exp $
 #
 
 DISTNAME=		Convert-PEM-0.06
@@ -21,7 +21,7 @@ DEPENDS+=		p5-Crypt-DES_EDE3-[0-9]*:../../security/p5-Crypt-DES_EDE3
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Convert/PEM/.packlist
+PERL5_PACKLIST=		auto/Convert/PEM/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Cz-Cstools/Makefile b/textproc/p5-Cz-Cstools/Makefile
index 29310bc010b..dd83bfbabcc 100644
--- a/textproc/p5-Cz-Cstools/Makefile
+++ b/textproc/p5-Cz-Cstools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/13 18:01:40 jlam Exp $
 #
 
 DISTNAME=	Cstools-3.42
@@ -15,7 +15,7 @@ COMMENT=	Tools for dealing with Czech and Slovak texts in Perl
 DEPENDS+=	p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=	p5-DBD-XBase>=0.232:../../databases/p5-DBD-XBase
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Cz/.packlist
+PERL5_PACKLIST=	auto/Cz/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index a5878725f4c..879654cd08e 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:40 jlam Exp $
 
 DISTNAME=	Data-FormValidator-3.63
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-MIME-Types>=1.005:../../mail/p5-MIME-Types
 DEPENDS+=	p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
 DEPENDS+=	p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/FormValidator/.packlist
+PERL5_PACKLIST=		auto/Data/FormValidator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index a22af12d735..5ac5b6c6577 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/13 18:01:40 jlam Exp $
 
 DISTNAME=	Filter-1.30
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 classes representing a number of source filters
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Filter/.packlist
+PERL5_PACKLIST=		auto/Filter/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Lingua-EN-Inflect/Makefile b/textproc/p5-Lingua-EN-Inflect/Makefile
index 3097f5cc4f8..873354e395d 100644
--- a/textproc/p5-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/19 17:27:18 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Lingua-EN-Inflect-1.88
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Perl module for inflection of english words and a/an selection
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Lingua/EN/Inflect/.packlist
+PERL5_PACKLIST=	auto/Lingua/EN/Inflect/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
index 0bd1ed8d6ee..622b318e3b2 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/19 17:29:30 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=		Lingua-EN-Numbers-Ordinate-1.02
@@ -13,7 +13,7 @@ COMMENT=		Go from cardinal number (3) to ordinal ("3rd")
 #DEPENDS+=		p5-Array-Compare-[0-9]*:../../devel/p5-Array-Compare
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Lingua/EN/Numbers/Ordinate/.packlist
+PERL5_PACKLIST=		auto/Lingua/EN/Numbers/Ordinate/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index 8fad8d65707..b034bfd396c 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/19 16:16:23 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Lingua-EN-Sentence-0.25
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=	# empty
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Lingua/EN/Sentence/.packlist
+PERL5_PACKLIST=	auto/Lingua/EN/Sentence/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index 7f1f8bd2e82..701a86d4990 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/19 17:31:02 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=		Lingua-Preferred-0.2.4
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Choose a preferred language from a selection
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Lingua/Preferred/.packlist
+PERL5_PACKLIST=		auto/Lingua/Preferred/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 23771ec8852..14ef1f9cc0e 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	PDF-API2-0.2.0.2_dev
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module for next generation api for pdf
 
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PDF/API2/.packlist
+PERL5_PACKLIST=	auto/PDF/API2/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index d44b475d22c..49145b318d9 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	PDF-Create-0.01
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	
 COMMENT=	Perl5 module for creating pdf documents
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/Create/.packlist
+PERL5_PACKLIST=		auto/PDF/Create/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index fd85f8056bb..fe39abd03e7 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	PDF-111
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.geocities.com/CapeCanaveral/Hangar/4794/
 COMMENT=	Perl5 module for pdf document manipulation
 
 WRKSRC=			${WRKDIR}/PDF
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/PDF/.packlist
+PERL5_PACKLIST=		auto/PDF/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-Coverage/Makefile b/textproc/p5-Pod-Coverage/Makefile
index 257fb8b37f0..38c39015eb5 100644
--- a/textproc/p5-Pod-Coverage/Makefile
+++ b/textproc/p5-Pod-Coverage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Pod-Coverage-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Devel-Symdump-[0-9]*:../../devel/p5-Devel-Symdump
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/Coverage/.packlist
+PERL5_PACKLIST=		auto/Pod/Coverage/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-Escapes/Makefile b/textproc/p5-Pod-Escapes/Makefile
index 07daa8a418c..16295f4d7e5 100644
--- a/textproc/p5-Pod-Escapes/Makefile
+++ b/textproc/p5-Pod-Escapes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Pod-Escapes-1.04
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Perl module for decoding Pod E<...> sequences
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/Escapes/.packlist
+PERL5_PACKLIST=		auto/Pod/Escapes/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index 56a96156037..a3382028f09 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=       Pod-POM-0.14
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kfs.org/~abw/
 COMMENT=	P5 module to format POD into an object format, hence POM
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/POM/.packlist
+PERL5_PACKLIST=		auto/Pod/POM/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-Simple/Makefile b/textproc/p5-Pod-Simple/Makefile
index 202aa62656e..0d5e14f5778 100644
--- a/textproc/p5-Pod-Simple/Makefile
+++ b/textproc/p5-Pod-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Pod-Simple-3.02
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Pod-Escapes-[0-9]*:../../textproc/p5-Pod-Escapes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/Simple/.packlist
+PERL5_PACKLIST=		auto/Pod/Simple/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Regexp-Common/Makefile b/textproc/p5-Regexp-Common/Makefile
index b641f925b52..25139458f31 100644
--- a/textproc/p5-Regexp-Common/Makefile
+++ b/textproc/p5-Regexp-Common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=		Regexp-Common-2.119
@@ -13,7 +13,7 @@ COMMENT=		Provide commonly requested regular expressions
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Regexp/Common/.packlist
+PERL5_PACKLIST=		auto/Regexp/Common/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-String-Approx/Makefile b/textproc/p5-String-Approx/Makefile
index 5ea199c4a5f..082f7456ce9 100644
--- a/textproc/p5-String-Approx/Makefile
+++ b/textproc/p5-String-Approx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=		String-Approx-3.23
@@ -11,7 +11,7 @@ MAINTAINER=		tv@duh.org
 HOMEPAGE=		http://search.cpan.org/dist/String-Approx/
 COMMENT=		Approximate (fuzzy) string matching library for Perl
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/Approx/.packlist
+PERL5_PACKLIST=		auto/String/Approx/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-String-CRC32/Makefile b/textproc/p5-String-CRC32/Makefile
index 1d07d16015f..d00a1c9698d 100644
--- a/textproc/p5-String-CRC32/Makefile
+++ b/textproc/p5-String-CRC32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	String-CRC32-1.2
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=String::CRC32
 COMMENT=	Perl module to generate cksums from strings and from files
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/CRC32/.packlist
+PERL5_PACKLIST=		auto/String/CRC32/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 87f2358c474..283f7b5c605 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	String-ShellQuote-1.00
 PKGNAME=	p5-String-ShellQuote-1.00
@@ -10,7 +10,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=String::ShellQuote
 COMMENT=	Quote strings for passing through the shell
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/String/ShellQuote/.packlist
+PERL5_PACKLIST=		auto/String/ShellQuote/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 8ad7b4c2e90..45b3e560543 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=       Text-Autoformat-1.04
 PKGNAME=        p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.monash.edu.au/~damian/
 COMMENT=	Perl module for text wrapping and reformatting
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Autoformat/.packlist
+PERL5_PACKLIST=		auto/Text/Autoformat/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index 67412f47633..125e3b31377 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	Text-Balanced-1.94
@@ -14,7 +14,7 @@ COMMENT=	Extract delimited text sequences from strings
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Balanced/.packlist
+PERL5_PACKLIST=		auto/Text/Balanced/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 969cee6efbc..5614238d2b3 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=	Text-BibTeX-0.33
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/~gward/btOOL/
 COMMENT=	Perl library for reading, parsing, and processing BibTeX files
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/BibTeX/.packlist
+PERL5_PACKLIST=		auto/Text/BibTeX/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-CSV-Hash/Makefile b/textproc/p5-Text-CSV-Hash/Makefile
index 5ac63708f14..c3e141b961b 100644
--- a/textproc/p5-Text-CSV-Hash/Makefile
+++ b/textproc/p5-Text-CSV-Hash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=		Text-CSV-Hash-0.18
 PKGNAME=		p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.mono.org/abs/tools/Text-CSV-Hash/
 COMMENT=		Perl5 module for hash based CSV usage
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/CSV/Hash/.packlist
+PERL5_PACKLIST=		auto/Text/CSV/Hash/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 2b7950d27a6..5de3cfd7fea 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 18:01:41 jlam Exp $
 #
 
 DISTNAME=	Text-CSV_XS-0.23
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 # HOMEPAGE=	http://
 COMMENT=	Routines for composition and decomposition of comma-separated values
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/CSV_XS/.packlist
+PERL5_PACKLIST=		auto/Text/CSV_XS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-ChaSen/Makefile b/textproc/p5-Text-ChaSen/Makefile
index 018aeaa9ddd..3ab7fc21715 100644
--- a/textproc/p5-Text-ChaSen/Makefile
+++ b/textproc/p5-Text-ChaSen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:41 jlam Exp $
 
 DISTNAME=		Text-ChaSen-1.03
 PKGNAME=		p5-${DISTNAME}
@@ -14,7 +14,7 @@ MAINTAINER=		kei@NetBSD.org
 HOMEPAGE=		http://www.daionet.gr.jp/~knok/chasen/
 COMMENT=		Perl5 module to use ChaSen
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/ChaSen/.packlist
+PERL5_PACKLIST=		auto/Text/ChaSen/.packlist
 
 .include "../../textproc/chasen/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-DelimMatch/Makefile b/textproc/p5-Text-DelimMatch/Makefile
index 0de7d098acc..abf872360fb 100644
--- a/textproc/p5-Text-DelimMatch/Makefile
+++ b/textproc/p5-Text-DelimMatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=	DelimMatch-1.06a
@@ -13,7 +13,7 @@ HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/DelimMatch/
 COMMENT=	Find regexp delimited strings with proper nesting
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/a$//}
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/DelimMatch/.packlist
+PERL5_PACKLIST=		auto/Text/DelimMatch/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index ab4507dd0f7..3230a458619 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	Text-Diff-0.35
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	High-level text diffing module for Perl
 
 DEPENDS+=	p5-Algorithm-Diff>=1.15:../../devel/p5-Algorithm-Diff
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Diff/.packlist
+PERL5_PACKLIST=		auto/Text/Diff/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index 10c96140e9c..8a9ce549169 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=       Text-Format0.52
@@ -12,7 +12,7 @@ MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/search?module=Text::Format
 COMMENT=	Provide perl5 formatting functions on plain text
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Format/.packlist
+PERL5_PACKLIST=		auto/Text/Format/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Glob/Makefile b/textproc/p5-Text-Glob/Makefile
index f3d0928a8e0..e0097f44f3e 100644
--- a/textproc/p5-Text-Glob/Makefile
+++ b/textproc/p5-Text-Glob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/06/24 17:33:36 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	Text-Glob-0.06
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Match globbing patterns against text
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Glob/.packlist
+PERL5_PACKLIST=		auto/Text/Glob/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Kakasi/Makefile b/textproc/p5-Text-Kakasi/Makefile
index 065011994f8..79c9dcc317d 100644
--- a/textproc/p5-Text-Kakasi/Makefile
+++ b/textproc/p5-Text-Kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=		Text-Kakasi-1.05
 PKGNAME=		p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=		kei@NetBSD.org
 HOMEPAGE=		http://www.daionet.gr.jp/~knok/kakasi/
 COMMENT=		Perl5 module to use Kakasi
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Kakasi/.packlist
+PERL5_PACKLIST=		auto/Text/Kakasi/.packlist
 
 .include "../../textproc/kakasi/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-Text-Quoted/Makefile b/textproc/p5-Text-Quoted/Makefile
index 9d7cad9de7f..bb865a5aa0d 100644
--- a/textproc/p5-Text-Quoted/Makefile
+++ b/textproc/p5-Text-Quoted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=	Text-Quoted-1.8
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Text-Autoformat>=1.04:../../textproc/p5-Text-Autoformat
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/Quoted/.packlist
+PERL5_PACKLIST=	auto/Text/Quoted/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index ba028a91b44..a1a36c01d05 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=       Text-Reform-1.11
@@ -15,7 +15,7 @@ COMMENT=	Manual text wrapping and reformatting
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Reform/.packlist
+PERL5_PACKLIST=		auto/Text/Reform/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index b83e6ac4ab7..c4965dcfb43 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=		Text-Shellwords-1.07
@@ -12,7 +12,7 @@ COMMENT=		Wrapper around shellwords.pl package
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=         ${PERL5_SITEARCH}/auto/Text/Shellwords/.packlist
+PERL5_PACKLIST=         auto/Text/Shellwords/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Substitute/Makefile b/textproc/p5-Text-Substitute/Makefile
index 519bd4c7e4a..8aa3fb1d12a 100644
--- a/textproc/p5-Text-Substitute/Makefile
+++ b/textproc/p5-Text-Substitute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=		Text-Substitute-0.15
 PKGNAME=		p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.mono.org/abs/tools/Text-Substitute/
 COMMENT=		Perl5 module for text substitution from hashes
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Substitute/.packlist
+PERL5_PACKLIST=		auto/Text/Substitute/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Tabs+Wrap/Makefile b/textproc/p5-Text-Tabs+Wrap/Makefile
index 1792f1b597d..72c7dd47329 100644
--- a/textproc/p5-Text-Tabs+Wrap/Makefile
+++ b/textproc/p5-Text-Tabs+Wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	Text-Tabs+Wrap-2001.0929
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~muir/${DISTNAME}
 COMMENT=	Line wrapping to form simple paragraphs
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Text/.packlist
+PERL5_PACKLIST=	auto/Text/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index d253f20027d..82a1f481f6a 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:38 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=       Text-Template-1.43
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.plover.com/~mjd/perl/Template/
 COMMENT=	Perl5 library for generating form letters
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Template/.packlist
+PERL5_PACKLIST=		auto/Text/Template/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 4150eaf7aef..7b5119edd65 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=       Text-Wrapper-1.000
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module that provides simple word wrapping
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Text/Wrapper/.packlist
+PERL5_PACKLIST=		auto/Text/Wrapper/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Checker/Makefile b/textproc/p5-XML-Checker/Makefile
index 3f50885e60a..5e257824346 100644
--- a/textproc/p5-XML-Checker/Makefile
+++ b/textproc/p5-XML-Checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Checker-0.13
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Checker/.packlist
+PERL5_PACKLIST=		auto/XML/Checker/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index a95d41ecc28..ddae8c0f330 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=	XML-DOM-1.43
@@ -19,7 +19,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML-DOM/.packlist
+PERL5_PACKLIST=		auto/XML-DOM/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 68fa6e48e08..9b5bd4016a0 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Encoding-1.01
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Perl module for parsing XML encoding maps
 
 DEPENDS+=	p5-XML-Parser>=2.18:../../textproc/p5-XML-Parser
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Encoding/.packlist
+PERL5_PACKLIST=	auto/XML/Encoding/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index 09faa3460cf..3bc961008e9 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Filter-BufferText-1.01
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Perl5 module XML parser filter to put all characters() in one event
 DEPENDS+=	p5-XML-SAX>=0.04:../../textproc/p5-XML-SAX
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Filter/BufferText/.packlist
+PERL5_PACKLIST=	auto/XML/Filter/BufferText/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index 87ef34823fa..09c265cf3d5 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Filter-DetectWS-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 DEPENDS+=	p5-XML-Filter-SAXT>=0.01:../../textproc/p5-XML-Filter-SAXT
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Filter/DetectWS/.packlist
+PERL5_PACKLIST=	auto/XML/Filter/DetectWS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index 7899040f287..f2ff92b947d 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Filter-Reindent-0.03
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 DEPENDS+=	p5-XML-Filter-DetectWS>=0.01:../../textproc/p5-XML-Filter-DetectWS
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Filter/Reindent/.packlist
+PERL5_PACKLIST=	auto/XML/Filter/Reindent/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 16ad17c8449..0584ad48f36 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:42 jlam Exp $
 
 DISTNAME=	XML-Filter-SAXT-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 DEPENDS+=	p5-XML-SAX>=0.12:../../textproc/p5-XML-SAX
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Filter/SAXT/.packlist
+PERL5_PACKLIST=	auto/XML/Filter/SAXT/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index cdf052d9d66..3755d735226 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:42 jlam Exp $
 #
 
 DISTNAME=	XML-Grove-0.46alpha
@@ -14,7 +14,7 @@ COMMENT=	Perl 5 module providing simple objects for parsed XML documents
 
 DEPENDS+=	p5-libxml>=0.0.7:../../textproc/p5-libxml
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Grove/.packlist
+PERL5_PACKLIST=		auto/XML/Grove/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index 5bd7e595675..5b854c934e6 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Handler-YAWriter-0.23
@@ -14,7 +14,7 @@ COMMENT=	Another Perl module for writing XML documents
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Handler/YAWriter/.packlist
+PERL5_PACKLIST=		auto/XML/Handler/YAWriter/.packlist
 REPLACE_PERL=		xmlpretty
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-LibXML-Common/Makefile b/textproc/p5-XML-LibXML-Common/Makefile
index 561fc311309..9747ab66cd8 100644
--- a/textproc/p5-XML-LibXML-Common/Makefile
+++ b/textproc/p5-XML-LibXML-Common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-LibXML-Common-0.13
@@ -14,7 +14,7 @@ COMMENT=	Routines and constants common for XML::LibXML and XML::GDOME
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/LibXML/Common/.packlist
+PERL5_PACKLIST=		auto/XML/LibXML/Common/.packlist
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-LibXML-Iterator/Makefile b/textproc/p5-XML-LibXML-Iterator/Makefile
index 713cd1f9dd1..de2da7d07fd 100644
--- a/textproc/p5-XML-LibXML-Iterator/Makefile
+++ b/textproc/p5-XML-LibXML-Iterator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-LibXML-Iterator-1.00
@@ -14,7 +14,7 @@ COMMENT=	Iterator for XML::LibXML parsed documents
 DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 DEPENDS+=	p5-XML-NodeFilter-[0-9]*:../../textproc/p5-XML-NodeFilter
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/LibXML/Iterator/.packlist
+PERL5_PACKLIST=	auto/XML/LibXML/Iterator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-LibXML-XPathContext/Makefile b/textproc/p5-XML-LibXML-XPathContext/Makefile
index 2d375c75e38..b084f4ce10c 100644
--- a/textproc/p5-XML-LibXML-XPathContext/Makefile
+++ b/textproc/p5-XML-LibXML-XPathContext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-LibXML-XPathContext-0.06
@@ -13,7 +13,7 @@ COMMENT=	Perl interface to libxml2's xmlXPathContext
 
 DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/LibXML/XPathContext/.packlist
+PERL5_PACKLIST=	auto/XML/LibXML/XPathContext/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 77930cf287a..fbef47561a3 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-LibXML-1.58
@@ -15,7 +15,7 @@ DEPENDS+=	p5-XML-SAX>=0.03:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-Checker-[0-9]*:../../textproc/p5-XML-Checker
 DEPENDS+=	p5-XML-LibXML-Common-[0-9]*:../../textproc/p5-XML-LibXML-Common
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/LibXML/.packlist
+PERL5_PACKLIST=		auto/XML/LibXML/.packlist
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index b3e55e13e71..b1233d210ff 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-LibXSLT-1.53
@@ -14,7 +14,7 @@ COMMENT=	Perl interface to the libxslt library
 
 DEPENDS+=	p5-XML-LibXML>=1.49:../../textproc/p5-XML-LibXML
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/LibXSLT/.packlist
+PERL5_PACKLIST=	auto/XML/LibXSLT/.packlist
 
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-NamespaceSupport/Makefile b/textproc/p5-XML-NamespaceSupport/Makefile
index 2f23b99eb0b..847b12d5bf3 100644
--- a/textproc/p5-XML-NamespaceSupport/Makefile
+++ b/textproc/p5-XML-NamespaceSupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-NamespaceSupport-1.08
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Perl module to the SAX2 NamespaceSupport class
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/NamespaceSupport/.packlist
+PERL5_PACKLIST=		auto/XML/NamespaceSupport/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 24ff01a22d7..c03de6f2ced 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Node-0.10
@@ -15,7 +15,7 @@ COMMENT=	Node-based XML parsing: an simplified interface to XML::Parser
 
 DEPENDS+=	p5-XML-Parser-2.*:../p5-XML-Parser
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Node/.packlist
+PERL5_PACKLIST=		auto/XML/Node/.packlist
 
 post-install:
 	${INSTALL_DATA} \
diff --git a/textproc/p5-XML-NodeFilter/Makefile b/textproc/p5-XML-NodeFilter/Makefile
index 501a708fc58..aaf753abc6f 100644
--- a/textproc/p5-XML-NodeFilter/Makefile
+++ b/textproc/p5-XML-NodeFilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-NodeFilter-0.01
@@ -13,7 +13,7 @@ COMMENT=	Object that know how to "filter out" nodes
 
 DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/NodeFilter/.packlist
+PERL5_PACKLIST=	auto/XML/NodeFilter/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 7027f9503cb..dc70647914f 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:39 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Parser-2.34
@@ -14,7 +14,7 @@ COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Parser/.packlist
+PERL5_PACKLIST=		auto/XML/Parser/.packlist
 MAKE_PARAMS+=		EXPATLIBPATH=${BUILDLINK_PREFIX.expat}/lib
 MAKE_PARAMS+=		EXPATINCPATH=${BUILDLINK_PREFIX.expat}/include
 
diff --git a/textproc/p5-XML-RAI/Makefile b/textproc/p5-XML-RAI/Makefile
index 83bf7d4e8d3..13af42a0b11 100644
--- a/textproc/p5-XML-RAI/Makefile
+++ b/textproc/p5-XML-RAI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-RAI-0.51
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RAI/.packlist
+PERL5_PACKLIST=		auto/XML/RAI/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-RSS-Parser/Makefile b/textproc/p5-XML-RSS-Parser/Makefile
index 03a3662c9ff..c2c84dff490 100644
--- a/textproc/p5-XML-RSS-Parser/Makefile
+++ b/textproc/p5-XML-RSS-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-RSS-Parser-2.15
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Class-XPath>=1.4:../../devel/p5-Class-XPath
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RSS/Parser/.packlist
+PERL5_PACKLIST=		auto/XML/RSS/Parser/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index 86732f66b36..1e072c3b4d0 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-RSS-0.97
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	XML-RSS helps to create and update RSS files
 
 DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RSS/.packlist
+PERL5_PACKLIST=		auto/XML/RSS/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 6c1b3199507..12ea32f4b86 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-RegExp-0.03
@@ -15,7 +15,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/RegExp/.packlist
+PERL5_PACKLIST=		auto/XML/RegExp/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 2fa3d3fd36b..f205cc85c6a 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-SAX-Expat-0.35
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-XML-NamespaceSupport-[0-9]*:../../textproc/p5-XML-NamespaceSupport
 DEPENDS+=	p5-XML-SAX-[0-9]*:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/SAX/Expat/.packlist
+PERL5_PACKLIST=		auto/XML/SAX/Expat/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index 4dfd36810bb..f3a8658ddaa 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-SAX-Writer-0.44
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/SAX/Writer/.packlist
+PERL5_PACKLIST=		auto/XML/SAX/Writer/.packlist
 MAKE_ENV+=		PERL5LIB="${PREFIX}/${PERL5_SUB_INSTALLSITELIB}"
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 8098ab74fa5..bcf9dc4805f 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-SAX-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/SAX/.packlist
+PERL5_PACKLIST=		auto/XML/SAX/.packlist
 MAKE_ENV+=		PERL5LIB="${PREFIX}/${PERL5_SUB_INSTALLSITELIB}"
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index e2383b104e0..0814a675a6e 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:43 jlam Exp $
 
 DISTNAME=	XML-Sablotron-0.98
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ EXPATINCPATH=	${BUILDLINK_PREFIX.expat}/include
 SABLOTLIBPATH=	${BUILDLINK_PREFIX.sablotron}/lib
 SABLOTINCPATH=	${BUILDLINK_PREFIX.sablotron}/include
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Sablotron/.packlist
+PERL5_PACKLIST=		auto/XML/Sablotron/.packlist
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/sablotron/buildlink3.mk"
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 981ace6de7d..882e044ac48 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Simple-2.14
@@ -19,7 +19,7 @@ DEPENDS+=       p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Simple/.packlist
+PERL5_PACKLIST=		auto/XML/Simple/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index cc9db720388..98dfdd097ba 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Stream-1.15
@@ -14,7 +14,7 @@ COMMENT=	XML::Stream provides you with access to XML Stream
 DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Stream/.packlist
+PERL5_PACKLIST=	auto/XML/Stream/.packlist
 
 .include "../../lang/perl5/module.mk"
 
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index d876265c052..19a367b8390 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/23 22:21:46 seb Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:43 jlam Exp $
 #
 
 DISTNAME=	XML-Twig-3.17
@@ -33,7 +33,7 @@ DEPENDS+=	p5-File-Temp>=0.12:../../devel/p5-File-Temp
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Twig/.packlist
+PERL5_PACKLIST=		auto/XML/Twig/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-UM/Makefile b/textproc/p5-XML-UM/Makefile
index 8e55242e871..398f06c19ea 100644
--- a/textproc/p5-XML-UM/Makefile
+++ b/textproc/p5-XML-UM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/13 18:01:44 jlam Exp $
 
 DISTNAME=	XML-UM-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 DEPENDS+=	p5-XML-Encoding>=1.01:../../textproc/p5-XML-Encoding
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/UM/.packlist
+PERL5_PACKLIST=	auto/XML/UM/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Writer-String/Makefile b/textproc/p5-XML-Writer-String/Makefile
index edac78bf1b5..1f0865a6284 100644
--- a/textproc/p5-XML-Writer-String/Makefile
+++ b/textproc/p5-XML-Writer-String/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/13 18:01:44 jlam Exp $
 #
 
 DISTNAME=	XML-Writer-String-0.1
@@ -13,7 +13,7 @@ COMMENT=	Perl module for writing XML documents based on XML::Writer
 
 DEPENDS+=	p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Writer/String/.packlist
+PERL5_PACKLIST=		auto/XML/Writer/String/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index 4c17e2bd7fb..986a30a692f 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:44 jlam Exp $
 #
 
 DISTNAME=	XML-Writer-0.530
@@ -13,7 +13,7 @@ COMMENT=	Perl module for writing XML documents
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/Writer/.packlist
+PERL5_PACKLIST=		auto/XML/Writer/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 31ffdf3c160..60fe4edd679 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 18:01:44 jlam Exp $
 
 DISTNAME=	XML-XPath-1.13
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-XML-Parser>=2.23:../../textproc/p5-XML-Parser
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XPath/.packlist
+PERL5_PACKLIST=		auto/XML/XPath/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index fae20a04f74..d1a77432571 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/13 18:01:44 jlam Exp $
 #
 
 DISTNAME=	XML-XQL-0.68
@@ -19,7 +19,7 @@ DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
 CONFLICTS+=	p5-libxml-enno-[0-9]*
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XQL/.packlist
+PERL5_PACKLIST=		auto/XML/XQL/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index c28561bdfb8..75337446188 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/24 12:22:39 seb Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/13 18:01:44 jlam Exp $
 
 DISTNAME=	XML-XSLT-0.48
 PKGNAME=	p5-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	p5-XML-Parser>=2.23:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
 USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XML/XSLT/.packlist
+PERL5_PACKLIST=		auto/XML/XSLT/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index e791771ce27..c0adc01cadc 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:40 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/13 18:01:44 jlam Exp $
 #
 
 DISTNAME=	XML-XUpdate-LibXML-0.2.3
@@ -13,7 +13,7 @@ COMMENT=	Simple implementation of XUpdate format based on and XML::LibXML
 
 DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/XUpdate/LibXML/.packlist
+PERL5_PACKLIST=	auto/XML/XUpdate/LibXML/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 5681dd8d370..023151f6b73 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/13 18:01:44 jlam Exp $
 #
 
 DISTNAME=	XML-Xerces-2.3.0-4
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake
 PERL5_REQD+=	5.6.0
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
+PERL5_PACKLIST=	auto/XML/Xerces/.packlist
 
 MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
 
diff --git a/textproc/p5-YAML/Makefile b/textproc/p5-YAML/Makefile
index e1fd265f439..7db489d0d25 100644
--- a/textproc/p5-YAML/Makefile
+++ b/textproc/p5-YAML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/09 22:40:27 epg Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/13 18:01:44 jlam Exp $
 
 DISTNAME=	YAML-0.38
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	YAML implementation for Perl
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/YAML/.packlist
+PERL5_PACKLIST=		auto/YAML/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index c8346f5bcbf..c53a16c6c2c 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/13 18:01:44 jlam Exp $
 
 DISTNAME=	libxml-perl-0.08
 PKGNAME=	p5-libxml-0.08
@@ -14,7 +14,7 @@ DEPENDS+=	p5-XML-Parser>=2.29:../../textproc/p5-XML-Parser
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/libxml-perl/.packlist
+PERL5_PACKLIST=		auto/libxml-perl/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"